--- capa/capa51/pProj/capaGrammarDef.y 1999/12/07 19:10:47 1.7 +++ capa/capa51/pProj/capaGrammarDef.y 2000/02/09 22:10:24 1.8 @@ -47,6 +47,7 @@ int yylex(); void yyerror(char*); void free_calc_expr(Symbol*); +void assign_pts (Symbol *, Symbol *, Symbol *); /******************************************************************************/ /* GLOBAL VARIABLES */ /******************************************************************************/ @@ -287,36 +288,36 @@ statement : IDENTIFIER '=' calc_expr ; rqo_def : rqo_speca { rqo_1spec(); } - | rqo_speca "," rqo_def { rqo_2spec(); } + | rqo_speca ',' rqo_def { rqo_2spec(); } ; rqo_speca : an_integer {start_rqo_type(SINGLE);append_rqo($1);} - | an_integer "!" {start_rqo_type(IMMOBILE);append_rqo($1);} - | an_integer "-" an_integer {start_rqo_type(RANGE);append_rqo($1); + | an_integer '!' {start_rqo_type(IMMOBILE);append_rqo($1);} + | an_integer '-' an_integer {start_rqo_type(RANGE);append_rqo($1); append_rqo($3); } - | an_integer "~" rqo_specb {prefix_rqo($1);} - | an_integer "+" rqo_specc {prefix_rqo($1);} + | an_integer '~' rqo_specb {prefix_rqo($1);} + | an_integer '+' rqo_specc {prefix_rqo($1);} ; rqo_specb : an_integer {start_rqo_type(ALL_MIX);append_rqo($1);} - | an_integer "~" rqo_specb {prefix_rqo($1);} - | an_integer "+" an_integer {start_rqo_type(LAST_FIXED);append_rqo($1); + | an_integer '~' rqo_specb {prefix_rqo($1);} + | an_integer '+' an_integer {start_rqo_type(LAST_FIXED);append_rqo($1); append_rqo($3);} ; rqo_specc : an_integer {start_rqo_type(ALL_FIXED);append_rqo($1);} - | an_integer "+" rqo_specd {prefix_rqo($1);} - | an_integer "~" rqo_spece {prefix_rqo($1);} + | an_integer '+' rqo_specd {prefix_rqo($1);} + | an_integer '~' rqo_spece {prefix_rqo($1);} ; rqo_specd : an_integer {start_rqo_type(ALL_FIXED);append_rqo($1);} - | an_integer "+" rqo_specd {prefix_rqo($1);} + | an_integer '+' rqo_specd {prefix_rqo($1);} ; rqo_spece : an_integer {start_rqo_type(FIRST_FIXED);append_rqo($1);} - | an_integer "~" rqo_spece {prefix_rqo($1);} - | an_integer "+" an_integer {start_rqo_type(BOTH_FIXED);append_rqo($1); + | an_integer '~' rqo_spece {prefix_rqo($1);} + | an_integer '+' an_integer {start_rqo_type(BOTH_FIXED);append_rqo($1); append_rqo($3);} ; @@ -927,7 +928,7 @@ Symbol *name,*index;int free_symbols; sprintf(key,"%s[%s]",name->s_name,tmp); a_p = find_arrayid(name->s_name); /* use the array name to search array tree */ - /* */ + /* did not check for error! */ s_p = find_array_by_index(a_p,key); /* use the index portion to search along array linked list */ capa_mfree((char *)tmp); capa_mfree((char *)key); @@ -1798,7 +1799,9 @@ assign_id_list( s ) Symbol *s; } } -void assign_pts ( Symbol* coord1, Symbol* coord2, Symbol* num) { +/* void assign_pts ( Symbol* coord1, Symbol* coord2, Symbol* num) { */ +void assign_pts (coord1, coord2, num)Symbol *coord1;Symbol *coord2;Symbol *num; +{ PointsList_t *pt; if( LastPtsList != NULL ) { LastPtsList->pts_next = gen_ptslist( coord1, coord2, num );