From 8b766d97fd5b199f4eb6443e9f9dc3052792f5e9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 16 Feb 2001 18:36:17 +0000 Subject: [PATCH] applied patch 103798 (yy... defines moved from expr.h, wxexpr.h to wxexpr.cpp) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/expr.h | 65 --------------------------------------- include/wx/wxexpr.h | 3 -- src/common/wxexpr.cpp | 71 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 68 deletions(-) diff --git a/include/wx/expr.h b/include/wx/expr.h index 52f45b9196..90c233795f 100644 --- a/include/wx/expr.h +++ b/include/wx/expr.h @@ -22,71 +22,6 @@ #define alloca malloc #endif -/* Rename all YACC/LEX stuff or we'll conflict with other - * applications - */ - -#define yyback PROIO_yyback -#define yylook PROIO_yylook -#define yywrap PROIO_yywrap -#define yyoutput PROIO_yyoutput -#define yylex PROIO_yylex -#define yyerror PROIO_yyerror -#define yyleng PROIO_yyleng -#define yytext PROIO_yytext -#define yymorfg PROIO_yymorfg -#define yylineno PROIO_yylineno -#define yytchar PROIO_yytchar -#define yyin PROIO_yyin -#define yyout PROIO_yyout -#define yysvf PROIO_yysvf -#define yyestate PROIO_yyestate -#define yysvec PROIO_yysvec -#define yybgin PROIO_yybgin -#define yyprevious PROIO_yyprevious -#define yylhs PROIO_yylhs -#define yylen PROIO_yylen -#define yydefred PROIO_yydefred -#define yydgoto PROIO_yydgoto -#define yysindex PROIO_yysindex -#define yyrindex PROIO_yyrindex -#define yygindex PROIO_yygindex -#define yytable PROIO_yytable -#define yycheck PROIO_yycheck -#define yyname PROIO_yyname -#define yyrule PROIO_yyrule -#define yydebug PROIO_yydebug -#define yynerrs PROIO_yynerrs -#define yyerrflag PROIO_yyerrflag -#define yychar PROIO_yychar -#define yyvsp PROIO_yyvsp -#define yyssp PROIO_yyssp -#define yyval PROIO_yyval -#define yylval PROIO_yylval -#define yyss PROIO_yyss -#define yyvs PROIO_yyvs -#define yyparse PROIO_yyparse - -/* +++steve162e: more defines necessary */ -#define yy_init_buffer PROIO_yy_init_buffer -#define yy_create_buffer PROIO_yy_create_buffer -#define yy_load_buffer_state PROIO_yy_load_buffer_state -#define yyrestart PROIO_yyrestart -#define yy_switch_to_buffer PROIO_yy_switch_to_buffer -#define yy_delete_buffer PROIO_yy_delete_buffer -/* ---steve162e */ - -/* WG 1/96: still more for flex 2.5 */ -#define yy_scan_buffer PROIO_scan_buffer -#define yy_scan_string PROIO_scan_string -#define yy_scan_bytes PROIO_scan_bytes -#define yy_flex_debug PROIO_flex_debug -#define yy_flush_buffer PROIO_flush_buffer -#if !defined(__VISAGECPP__) -/* multiply defined??? */ -#define yyleng PROIO_yyleng -#define yytext PROIO_yytext -#endif #ifdef __cplusplus extern "C" { diff --git a/include/wx/wxexpr.h b/include/wx/wxexpr.h index 18b53d0679..acad013bcf 100644 --- a/include/wx/wxexpr.h +++ b/include/wx/wxexpr.h @@ -50,9 +50,6 @@ typedef bool (*wxExprErrorHandler) (int errorType, char *msg); WXDLLEXPORT_DATA(extern wxExprErrorHandler) currentwxExprErrorHandler; -extern "C" WXDLLEXPORT_DATA(FILE*) yyin; - -extern "C" WXDLLEXPORT int yyparse(void); typedef enum { wxExprNull, diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp index 2abeffce01..6f67df37a2 100644 --- a/src/common/wxexpr.cpp +++ b/src/common/wxexpr.cpp @@ -33,6 +33,77 @@ extern "C" void LexFromFile(FILE *fd); extern "C" void LexFromString(char *buf); + +/* Rename all YACC/LEX stuff or we'll conflict with other + * applications + */ + +#define yyback PROIO_yyback +#define yylook PROIO_yylook +#define yywrap PROIO_yywrap +#define yyoutput PROIO_yyoutput +#define yylex PROIO_yylex +#define yyerror PROIO_yyerror +#define yyleng PROIO_yyleng +#define yytext PROIO_yytext +#define yymorfg PROIO_yymorfg +#define yylineno PROIO_yylineno +#define yytchar PROIO_yytchar +#define yyin PROIO_yyin +#define yyout PROIO_yyout +#define yysvf PROIO_yysvf +#define yyestate PROIO_yyestate +#define yysvec PROIO_yysvec +#define yybgin PROIO_yybgin +#define yyprevious PROIO_yyprevious +#define yylhs PROIO_yylhs +#define yylen PROIO_yylen +#define yydefred PROIO_yydefred +#define yydgoto PROIO_yydgoto +#define yysindex PROIO_yysindex +#define yyrindex PROIO_yyrindex +#define yygindex PROIO_yygindex +#define yytable PROIO_yytable +#define yycheck PROIO_yycheck +#define yyname PROIO_yyname +#define yyrule PROIO_yyrule +#define yydebug PROIO_yydebug +#define yynerrs PROIO_yynerrs +#define yyerrflag PROIO_yyerrflag +#define yychar PROIO_yychar +#define yyvsp PROIO_yyvsp +#define yyssp PROIO_yyssp +#define yyval PROIO_yyval +#define yylval PROIO_yylval +#define yyss PROIO_yyss +#define yyvs PROIO_yyvs +#define yyparse PROIO_yyparse + +/* +++steve162e: more defines necessary */ +#define yy_init_buffer PROIO_yy_init_buffer +#define yy_create_buffer PROIO_yy_create_buffer +#define yy_load_buffer_state PROIO_yy_load_buffer_state +#define yyrestart PROIO_yyrestart +#define yy_switch_to_buffer PROIO_yy_switch_to_buffer +#define yy_delete_buffer PROIO_yy_delete_buffer +/* ---steve162e */ + +/* WG 1/96: still more for flex 2.5 */ +#define yy_scan_buffer PROIO_scan_buffer +#define yy_scan_string PROIO_scan_string +#define yy_scan_bytes PROIO_scan_bytes +#define yy_flex_debug PROIO_flex_debug +#define yy_flush_buffer PROIO_flush_buffer +#if !defined(__VISAGECPP__) +/* multiply defined??? */ +#define yyleng PROIO_yyleng +#define yytext PROIO_yytext +#endif + +extern "C" WXDLLEXPORT_DATA(FILE*) yyin; +extern "C" WXDLLEXPORT int yyparse(void); + + wxExprDatabase *thewxExprDatabase = NULL; wxExprErrorHandler currentwxExprErrorHandler;