authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-03-19 15:12:44-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2018-03-19 15:12:44-04:00
loge966d375fb0c221a83b3262cedf46c895e8ab17d
treee64f9facf7b2a107507e4f252944e524f437e011
parentd959faa4c78ded05ac457e93a16edfd1d7c58c0e
parentc4544df011cf61a61538bdeb18808f67ff71043e
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #844 from ice1000/patch-1

Remove unnecessary rule and re-fix an old bug

1 files changed, 3 insertions(+), 5 deletions(-)

doc/langref.html.in+3-5
......@@ -5733,7 +5733,7 @@ VariableDeclaration = ("var" | "const") Symbol option(":" TypeExpr) option("alig
57335733
57345734ContainerMember = (ContainerField | FnDef | GlobalVarDecl)
57355735
5736ContainerField = Symbol option(":" PrefixOpExpression option("=" PrefixOpExpression)) ","
5736ContainerField = Symbol option(":" PrefixOpExpression) option("=" PrefixOpExpression) ","
57375737
57385738UseDecl = "use" Expression ";"
57395739
......@@ -5751,9 +5751,7 @@ Block = option(Symbol ":") "{" many(Statement) "}"
57515751
57525752Statement = LocalVarDecl ";" | Defer(Block) | Defer(Expression) ";" | BlockExpression(Block) | Expression ";" | ";"
57535753
5754TypeExpr = ErrorSetExpr
5755
5756ErrorSetExpr = (PrefixOpExpression "!" PrefixOpExpression) | PrefixOpExpression
5754TypeExpr = (PrefixOpExpression "!" PrefixOpExpression) | PrefixOpExpression
57575755
57585756BlockOrExpression = Block | Expression
57595757
......@@ -5845,7 +5843,7 @@ CurlySuffixExpression = TypeExpr option(ContainerInitExpression)
58455843
58465844MultiplyOperator = "||" | "*" | "/" | "%" | "**" | "*%"
58475845
5848PrefixOpExpression = PrefixOp ErrorSetExpr | SuffixOpExpression
5846PrefixOpExpression = PrefixOp TypeExpr | SuffixOpExpression
58495847
58505848SuffixOpExpression = ("async" option("(" Expression ")") PrimaryExpression FnCallExpression) | PrimaryExpression option(FnCallExpression | ArrayAccessExpression | FieldAccessExpression | SliceExpression)
58515849