diff --git a/ChangeLog b/ChangeLog index d5bf54f41..14145818d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-10-15 Robert Larice + * src/xspice/cmpp/ifs_lex.l , + * src/xspice/cmpp/ifs_yacc.y , + * src/xspice/cmpp/ifs_yacc_y.h , + * src/xspice/cmpp/read_ifs.c : + collect prototype for ifs_yyerror() in "ifs_yacc_y.h", and fix return type + 2010-10-15 Robert Larice * src/xspice/cmpp/mod_lex.l , * src/xspice/cmpp/mod_yacc.y , diff --git a/src/xspice/cmpp/ifs_lex.l b/src/xspice/cmpp/ifs_lex.l index a2e2c5252..73956c640 100755 --- a/src/xspice/cmpp/ifs_lex.l +++ b/src/xspice/cmpp/ifs_lex.l @@ -51,7 +51,6 @@ NON-STANDARD FEATURES int yyival; double yydval; -extern void ifs_yyerror (char*); /* * IFS specs are case insensitive: diff --git a/src/xspice/cmpp/ifs_yacc.y b/src/xspice/cmpp/ifs_yacc.y index 914f1faff..c1a9eaad9 100755 --- a/src/xspice/cmpp/ifs_yacc.y +++ b/src/xspice/cmpp/ifs_yacc.y @@ -92,7 +92,6 @@ extern int yylineno; extern int yyival; extern double yydval; extern char *ifs_yytext; -extern void yyerror (char*); extern int ifs_yylex(void); Boolean_t parser_just_names; diff --git a/src/xspice/cmpp/ifs_yacc_y.h b/src/xspice/cmpp/ifs_yacc_y.h index 611e9a786..0a26b278f 100755 --- a/src/xspice/cmpp/ifs_yacc_y.h +++ b/src/xspice/cmpp/ifs_yacc_y.h @@ -79,3 +79,6 @@ typedef struct ctype_list_s { My_Port_Type_t ctype; struct ctype_list_s *next; } Ctype_List_t; + + +extern void ifs_yyerror(char*); diff --git a/src/xspice/cmpp/read_ifs.c b/src/xspice/cmpp/read_ifs.c index f1b36f158..87786f95c 100755 --- a/src/xspice/cmpp/read_ifs.c +++ b/src/xspice/cmpp/read_ifs.c @@ -48,7 +48,7 @@ NON-STANDARD FEATURES #include #include -#include "cmpp.h" +#include "ifs_yacc_y.h" extern char *prog_name; extern int ifs_yyparse (void); @@ -167,12 +167,10 @@ static Status_t read_ifs_table( /*---------------------------------------------------------------------------*/ -int +void ifs_yyerror (char *str) { fprintf (stderr, "%s: Error: \"%s\": line %d (near \'%s\'):\n\t%s.\n", prog_name, current_filename, ifs_yylineno, ifs_yytext, str); - - return 0; }