From: chas w. <ch...@us...> - 2009-08-03 14:30:24
|
Update of /cvsroot/linux-atm/linux-atm/src/qgen In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29610/src/qgen Modified Files: Tag: V2_5_1 ql_y.y Log Message: pull down updates from the HEAD into 2.5.1 Index: ql_y.y =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/ql_y.y,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ql_y.y 9 Oct 2001 22:33:07 -0000 1.2 --- ql_y.y 3 Aug 2009 14:30:14 -0000 1.2.4.1 *************** *** 27,30 **** --- 27,32 ---- static const char *abort_id; /* indicates abort flag */ + void yyerror(const char *s); + int yylex(void); static NAME_LIST *get_name_list(const char *name) *************** *** 60,65 **** --- 62,69 ---- if (*start == ':') { if (!(searching = strcmp(start+1,name))) + { if (found) yyerror("multiple entries"); else found = 1; + } continue; } *************** *** 307,313 **** --- 311,319 ---- $$->flush = !$3; if ($$->pos == -1) + { if ($$->size & 7) yyerror("position required for small fields"); else $$->pos = 0; + } $$->value = $5; $$->structure = NULL; *************** *** 431,436 **** | TOK_ID opt_id list block { ! $$ = alloc_t(TAG); ! $$->abort_id = abort_id; } tags --- 437,442 ---- | TOK_ID opt_id list block { ! $<tag>$ = alloc_t(TAG); ! $<tag>$->abort_id = abort_id; } tags *************** *** 474,479 **** | TOK_ID opt_id list rep_block { ! $$ = alloc_t(TAG); ! $$->abort_id = abort_id; } rep_tags --- 480,485 ---- | TOK_ID opt_id list rep_block { ! $<tag>$ = alloc_t(TAG); ! $<tag>$->abort_id = abort_id; } rep_tags |