Commit Diff

Commit:
e0b4ca440025383116871fd9f0fd40d162ea39d4
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
add multiple-assert back and while there fix a shift-reduce conflict on '\n' in const rule
Actions:
Patch | Tree
commit - c01463a300aee951bd8364979b23b9e6ea102f94
commit + e0b4ca440025383116871fd9f0fd40d162ea39d4
blob - 1f6f44dd273ab1a61844f7bff72279c7b9e6f5c3
blob + dc1e423e961695b84f3b81bea6c76bc97ad89de7
--- np.y
+++ np.y
@@ -133,7 +133,7 @@ include : INCLUDE STRING {
 	;
 
 const	: CONST consti
-	| CONST '(' optnl mconst optnl ')'
+	| CONST '(' optnl mconst ')'
 	;
 
 mconst	: consti nl | mconst consti nl ;
@@ -218,13 +218,13 @@ block	: /* empty */
 	| block assert '\n'
 	;
 
-assert	: ASSERT check		{ block_push(op_assert($2)); }
-	/* | ASSERT '(' optnl massert ')' */
+assert	: ASSERT asserti
+	| ASSERT '(' optnl massert ')'
 	;
 
-massert	: /* empty */
-	| massert ',' optnl check	{ block_push(op_assert($4)); }
-	| check				{ block_push(op_assert($1)); }
+massert	: asserti nl | massert asserti nl ;
+
+asserti	: check			{ block_push(op_assert($1)); }
 	;
 
 test	: TESTING STRING DIR STRING {