stage1_2/iec.y
changeset 10 66f4f7f85d0a
parent 5 8860f9917bbc
child 13 77174ccc5471
--- a/stage1_2/iec.y	Thu Feb 01 12:35:57 2007 +0100
+++ b/stage1_2/iec.y	Thu Feb 01 19:02:24 2007 +0100
@@ -3730,11 +3730,10 @@
 
 action_time:
   duration
-| variable_name
-//| transition_name
-;
-
-indicator_name: variable_name;
+| variable
+;
+
+indicator_name: variable;
 
 transition_name: identifier;
 
@@ -3764,12 +3763,14 @@
 ;
 
 transition_condition_il:
-  ':' simple_instr_list
-	{$$ = new transition_condition_c($2, NULL);} ;
+  ':' eol_list simple_instr_list
+	{$$ = new transition_condition_c($3, NULL);}
+;
 
 transition_condition_st:
   ASSIGN expression ';'
-	{$$ = new transition_condition_c(NULL, $2);};
+	{$$ = new transition_condition_c(NULL, $2);}
+;
 
 transition:
   transition_header transition_condition_il END_TRANSITION