Merge branch 'beta-newgrammar'

Conflicts:
	ChangeLog

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 62c0e24e..7825cc7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 ---------------------------------------------------------------------------
+Version 7.3.2  [devel] 2012-10-??
+- permited action-like statements (stop, call, ...) in action lists
+---------------------------------------------------------------------------
 Version 7.3.1  [devel] 2012-10-19
 - optimized template processing performance, especially for $NOW family
   of properties
diff --git a/grammar/grammar.y b/grammar/grammar.y
index 343daaaa..42da0efc 100644
--- a/grammar/grammar.y
+++ b/grammar/grammar.y
@@ -148,7 +148,6 @@ value:	  STRING			{ $$ = nvlstNewStr($1); }
 script:	  stmt				{ $$ = $1; }
 	| script stmt			{ $$ = scriptAddStmt($1, $2); }
 stmt:	  actlst			{ $$ = $1; }
-	| STOP				{ $$ = cnfstmtNew(S_STOP); }
 	| IF expr THEN block 		{ $$ = cnfstmtNew(S_IF);
 					  $$->d.s_if.expr = $2;
 					  $$->d.s_if.t_then = $4;
@@ -161,14 +160,16 @@ stmt:	  actlst			{ $$ = $1; }
 	| UNSET VAR ';'			{ $$ = cnfstmtNewUnset($2); }
 	| PRIFILT block			{ $$ = cnfstmtNewPRIFILT($1, $2); }
 	| PROPFILT block		{ $$ = cnfstmtNewPROPFILT($1, $2); }
-	| CALL NAME			{ $$ = cnfstmtNewCall($2); }
-	| CONTINUE			{ $$ = cnfstmtNewContinue(); }
 block:    stmt				{ $$ = $1; }
 	| '{' script '}'		{ $$ = $2; }
 actlst:	  s_act				{ $$ = $1; }
 	| actlst '&' s_act 		{ $$ = scriptAddStmt($1, $3); }
+/* s_act are actions and action-like statements */
 s_act:	  BEGIN_ACTION nvlst ENDOBJ	{ $$ = cnfstmtNewAct($2); }
 	| LEGACY_ACTION			{ $$ = cnfstmtNewLegaAct($1); }
+	| STOP				{ $$ = cnfstmtNew(S_STOP); }
+	| CALL NAME			{ $$ = cnfstmtNewCall($2); }
+	| CONTINUE			{ $$ = cnfstmtNewContinue(); }
 expr:	  expr AND expr			{ $$ = cnfexprNew(AND, $1, $3); }
 	| expr OR expr			{ $$ = cnfexprNew(OR, $1, $3); }
 	| NOT expr			{ $$ = cnfexprNew(NOT, NULL, $2); }