Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ziglang/zig
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d959faa4c78d
Choose a base ref
...
head repository: ziglang/zig
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e966d375fb0c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 19, 2018

  1. Remove unnecessary rule and re-fix an old bug 

    The "old bug" is cause my last pr. I'm fixing it now.
    @ice1000
    ice1000 authored Mar 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c4544df View commit details

  2. Merge pull request #844 from ice1000/patch-1 

    Remove unnecessary rule and re-fix an old bug
    @andrewrk
    andrewrk authored Mar 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e966d37 View commit details
Showing with 3 additions and 5 deletions.
  1. +3 −5 doc/langref.html.in
8 changes: 3 additions & 5 deletions doc/langref.html.in
View file
Original file line number Diff line number Diff line change
@@ -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)