zig

commit e966d375fb0c221a83b3262cedf46c895e8ab17d (tree)
parent d959faa4c78ded05ac457e93a16edfd1d7c58c0e
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Mon, 19 Mar 2018 15:12:44 -0400

Merge pull request #844 from ice1000/patch-1

Remove unnecessary rule and re-fix an old bug
Diffstat:
M
doc/langref.html.in
 | 
8
+++-----

1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/doc/langref.html.in b/doc/langref.html.in
@@ -5733,7 +5733,7 @@ VariableDeclaration = ("var" | "const") Symbol option(":" TypeExpr) option("alig
 
 ContainerMember = (ContainerField | FnDef | GlobalVarDecl)
 
-ContainerField = Symbol option(":" PrefixOpExpression option("=" PrefixOpExpression)) ","
+ContainerField = Symbol option(":" PrefixOpExpression) option("=" PrefixOpExpression) ","
 
 UseDecl = "use" Expression ";"
 
@@ -5751,9 +5751,7 @@ Block = option(Symbol ":") "{" many(Statement) "}"
 
 Statement = LocalVarDecl ";" | Defer(Block) | Defer(Expression) ";" | BlockExpression(Block) | Expression ";" | ";"
 
-TypeExpr = ErrorSetExpr
-
-ErrorSetExpr = (PrefixOpExpression "!" PrefixOpExpression) | PrefixOpExpression
+TypeExpr = (PrefixOpExpression "!" PrefixOpExpression) | PrefixOpExpression
 
 BlockOrExpression = Block | Expression
 
@@ -5845,7 +5843,7 @@ CurlySuffixExpression = TypeExpr option(ContainerInitExpression)
 
 MultiplyOperator = "||" | "*" | "/" | "%" | "**" | "*%"
 
-PrefixOpExpression = PrefixOp ErrorSetExpr | SuffixOpExpression
+PrefixOpExpression = PrefixOp TypeExpr | SuffixOpExpression
 
 SuffixOpExpression = ("async" option("(" Expression ")") PrimaryExpression FnCallExpression) | PrimaryExpression option(FnCallExpression | ArrayAccessExpression | FieldAccessExpression | SliceExpression)