aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2017-04-13 00:13:54 -0400
committerAndrew Kelley <superjoe30@gmail.com>2017-04-13 00:13:54 -0400
commit41144a8566a6fbd779403f6b69424bb640c94a7f (patch)
treeb4c5807dddca6d3eb66047aebccf6cc9d3fdd90c /doc
parentf043e0e85cac9330cf809bef177784c3cd133348 (diff)
downloadzig-41144a8566a6fbd779403f6b69424bb640c94a7f.tar.gz
zig-41144a8566a6fbd779403f6b69424bb640c94a7f.zip
ability to inline at function callsite
closes #306
Diffstat (limited to 'doc')
-rw-r--r--doc/langref.md9
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/langref.md b/doc/langref.md
index c53d3f8fc2..f579f8d50c 100644
--- a/doc/langref.md
+++ b/doc/langref.md
@@ -81,9 +81,9 @@ SwitchProng = (list(SwitchItem, ",") | "else") "=>" option("|" option("*") Symbo
SwitchItem = Expression | (Expression "..." Expression)
-WhileExpression(body) = option("inline") "while" "(" Expression option(";" Expression) ")" body
+WhileExpression(body) = "while" "(" Expression option(";" Expression) ")" body
-ForExpression(body) = option("inline") "for" "(" Expression ")" option("|" option("*") Symbol option("," Symbol) "|") body
+ForExpression(body) = "for" "(" Expression ")" option("|" option("*") Symbol option("," Symbol) "|") body
BoolOrExpression = BoolAndExpression "or" BoolOrExpression | BoolAndExpression
@@ -127,7 +127,9 @@ MultiplyOperator = "*" | "/" | "%" | "**" | "*%"
PrefixOpExpression = PrefixOp PrefixOpExpression | SuffixOpExpression
-SuffixOpExpression = PrimaryExpression option(FnCallExpression | ArrayAccessExpression | FieldAccessExpression | SliceExpression)
+SuffixOpExpression = InlineExpression option(FnCallExpression | ArrayAccessExpression | FieldAccessExpression | SliceExpression)
+
+InlineExpression = option("inline") PrimaryExpression
FieldAccessExpression = "." Symbol
@@ -161,6 +163,7 @@ ContainerDecl = option("extern" | "packed") ("struct" | "enum" | "union") "{" ma
## Operator Precedence
```
+inline x
x() x[] x.y
!x -x -%x ~x *x &x ?x %x %%x ??x
x{}