motiejus/zig

commit 661fc79fba242f2ad72ede06d4e23e635a1b1452 (tree)
parent 73e8e46257ac8f34e941a357a860d19e0d38dbac
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Sun, 10 Feb 2019 12:02:38 -0500

langref: update grammar with c pointers

See #1059

Diffstat:
M
doc/langref.html.in
 | 
7
+++++--
M
src/parser.cpp
 | 
4
++--

2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/doc/langref.html.in b/doc/langref.html.in
@@ -8164,7 +8164,8 @@ ArrayTypeStart <- LBRACKET Expr? RBRACKET
 PtrTypeStart
     <- ASTERISK
      / ASTERISK2
-     / LBRACKET ASTERISK RBRACKET
+     / PTRUNKNOWN
+     / PTRC
 
 # ContainerDecl specific
 ContainerDeclAuto <- ContainerDeclType LBRACE ContainerMembers RBRACE
@@ -8262,7 +8263,7 @@ LARROW2              <- '<<'     ![=]      skip
 LARROW2EQUAL         <- '<<='              skip
 LARROWEQUAL          <- '<='               skip
 LBRACE               <- '{'                skip
-LBRACKET             <- '['                skip
+LBRACKET             <- '['      ![*]      skip
 LPAREN               <- '('                skip
 MINUS                <- '-'      ![%=>]    skip
 MINUSEQUAL           <- '-='               skip
@@ -8279,6 +8280,8 @@ PLUS2                <- '++'               skip
 PLUSEQUAL            <- '+='               skip
 PLUSPERCENT          <- '+%'     ![=]      skip
 PLUSPERCENTEQUAL     <- '+%='              skip
+PTRC                 <- '[*c]'             skip
+PTRUNKNOWN           <- '[*]'              skip
 QUESTIONMARK         <- '?'                skip
 RARROW               <- '>'      ![>=]     skip
 RARROW2              <- '>>'     ![=]      skip
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -2778,8 +2778,8 @@ static AstNode *ast_parse_array_type_start(ParseContext *pc) {
 // PtrTypeStart
 //     <- ASTERISK
 //      / ASTERISK2
-//      / LBRACKET ASTERISK RBRACKET
-//      / LBRACKET ASTERISK C RBRACKET
+//      / PTRUNKNOWN
+//      / PTRC
 static AstNode *ast_parse_ptr_type_start(ParseContext *pc) {
     Token *asterisk = eat_token_if(pc, TokenIdStar);
     if (asterisk != nullptr) {