pragma blocks; fixed line information issue with user defined assertions

2012-01-17 23:58:18 +01:00 · 2012-01-17 23:58:18 +01:00 · 78f4aacde9
commit 78f4aacde9
parent 42dad650e0
17 changed files with 133 additions and 23 deletions
--- a/doc/grammar.txt
+++ b/doc/grammar.txt
@ -35,7 +35,6 @@ primarySuffix ::= '.' optInd symbol [generalizedLit]
                | '(' optInd namedExprList optPar ')'
                | '[' optInd [indexExpr (comma indexExpr)* [comma]] optPar ']'
                | '{' optInd [indexExpr (comma indexExpr)* [comma]] optPar '}'
-                | pragma

 primary ::= primaryPrefix* (symbol [generalizedLit] | 
                            constructor | castExpr | addrExpr)
@ -84,13 +83,15 @@ macroStmt ::= ':' [stmt] ('of' [exprList] ':' stmt
                         |'except' exceptList ':' stmt )*
                         ['else' ':' stmt]

+pragmaBlock ::= pragma [':' stmt]
+
 simpleStmt ::= returnStmt
             | yieldStmt
             | discardStmt
             | raiseStmt
             | breakStmt
             | continueStmt
-             | pragma
+             | pragmaBlock
             | importStmt
             | fromStmt
             | includeStmt