--- a/stage1_2/iec.y	Wed Nov 14 18:59:47 2007 +0100
+++ b/stage1_2/iec.y	Thu Nov 15 10:21:19 2007 +0100
@@ -3782,33 +3782,33 @@
     FROM steps TO steps 
     {cmd_goto_body_state();} transition_condition 
   END_TRANSITION 
-	{$$ = new transition_c(NULL, NULL, $3, $5, $7, NULL, locloc(@$));}
+	{$$ = new transition_c(NULL, NULL, $3, $5, $7, locloc(@$));}
 //| TRANSITION identifier FROM steps TO steps ... 
 | TRANSITION transition_name 
     FROM steps TO steps 
     {cmd_goto_body_state();} transition_condition 
   END_TRANSITION 
-	{$$ = new transition_c($2, NULL, $4, $6, $8, NULL, locloc(@$));}
+	{$$ = new transition_c($2, NULL, $4, $6, $8, locloc(@$));}
 | TRANSITION '(' {cmd_goto_sfc_priority_state();} PRIORITY {cmd_pop_state();} ASSIGN integer ')' 
     FROM steps TO steps 
     {cmd_goto_body_state();} transition_condition 
   END_TRANSITION
-        {$$ = new transition_c(NULL, $7, $10, $12, $14, NULL, locloc(@$));}
+        {$$ = new transition_c(NULL, $7, $10, $12, $14, locloc(@$));}
 //| TRANSITION identifier '(' PRIORITY ASSIGN integer ')' FROM steps TO steps ...
 | TRANSITION transition_name '(' {cmd_goto_sfc_priority_state();} PRIORITY {cmd_pop_state();} ASSIGN integer ')' 
     FROM steps TO steps 
     {cmd_goto_body_state();} transition_condition 
   END_TRANSITION
-        {$$ = new transition_c($2, $8, $11, $13, $15, NULL, locloc(@$));}
+        {$$ = new transition_c($2, $8, $11, $13, $15, locloc(@$));}
 ;
 
 
 
 transition_condition:
   ':' eol_list simple_instr_list
-	{$$ = $3;}
+	{$$ = new transition_condition_c($3, NULL);}
 | ASSIGN expression ';'
-	{$$ = $2}
+	{$$ = new transition_condition_c(NULL, $2);}
 ;