diff -r 0d71456312ab -r 8860f9917bbc stage1_2/iec.y --- a/stage1_2/iec.y Thu Feb 01 09:29:58 2007 +0100 +++ b/stage1_2/iec.y Thu Feb 01 10:59:57 2007 +0100 @@ -3641,7 +3641,6 @@ /********************************************/ /* B 1.6 Sequential Function Chart elements * /********************************************/ -/* TODO ... */ sequential_function_chart: sfc_network @@ -3709,8 +3708,6 @@ {$$ = new action_qualifier_c($1, $3);} ; -//N_token: N {$$ = new N_token_c();}; - qualifier: N {$$ = new qualifier_c(strdup("N"));} /* NOTE: the following two clash with the R and S IL operators. @@ -3734,7 +3731,7 @@ action_time: duration | variable_name -| transition_name +//| transition_name ; indicator_name: variable_name; @@ -3776,11 +3773,9 @@ transition: transition_header transition_condition_il END_TRANSITION - {$$ = new transition_c($1.first, $1.second, $1.third, $1.fourth, $2, -NULL);} + {$$ = new transition_c($1.first, $1.second, $1.third, $1.fourth, $2, NULL);} | transition_header transition_condition_st END_TRANSITION - {$$ = new transition_c($1.first, $1.second, $1.third, $1.fourth, NULL, -$2);} + {$$ = new transition_c($1.first, $1.second, $1.third, $1.fourth, NULL, $2);} ; action_header: