X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7615330240c8682b86f46acbb2b64d9db3e99aef..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/common/parser.y diff --git a/src/common/parser.y b/src/common/parser.y index 243a49feb7..a5dcdf37a7 100644 --- a/src/common/parser.y +++ b/src/common/parser.y @@ -1,9 +1,11 @@ +/* Version: $Id$ */ %{ +#include "wx/setup.h" #include #ifdef _MSC_VER #include #endif -#ifdef __GNUWIN32__ +#if defined(__GNUWIN32__) && !defined(__TWIN32__) #include #endif @@ -27,12 +29,7 @@ void yyerror(char *); /* You may need to put /DLEX_SCANNER in your makefile * if you're using LEX! */ -#ifdef LEX_SCANNER -/* int yyoutput(int); */ void yyoutput(int); -#else -void yyoutput(int); -#endif #if defined(__cplusplus) || defined(__STDC__) #if defined(__cplusplus) && defined(__EXTERN_C__) @@ -73,7 +70,7 @@ commands : /* empty */ ; command : WORD PERIOD - {process_command(proio_cons(make_word($1), NULL)); free($1);} + {process_command(proio_cons(wxmake_word($1), NULL)); free($1);} | expr PERIOD {process_command($1);} | error PERIOD @@ -81,15 +78,13 @@ command : WORD PERIOD ; expr : WORD OPEN arglist CLOSE - {$$ = proio_cons(make_word($1), $3); free($1);} - | OPEN_SQUARE CLOSE_SQUARE - {$$ = proio_cons(NULL, NULL);} + {$$ = proio_cons(wxmake_word($1), $3); free($1);} | OPEN_SQUARE arglist CLOSE_SQUARE {$$ = $2; } ; arglist : - {$$ = NULL;} + {$$ = proio_cons(NULL, NULL);} | arg {$$ = proio_cons($1, NULL);} | @@ -98,24 +93,24 @@ arglist : ; arg : WORD EQUALS arg1 - {$$ = proio_cons(make_word("="), proio_cons(make_word($1), proio_cons($3, NULL))); + {$$ = proio_cons(wxmake_word("="), proio_cons(wxmake_word($1), proio_cons($3, NULL))); free($1); } | arg1 {$$ = $1; } arg1 : WORD - {$$ = make_word($1); free($1);} + {$$ = wxmake_word($1); free($1);} | STRING - {$$ = make_string($1); free($1);} + {$$ = wxmake_string($1); free($1);} | INTEGER - {$$ = make_integer($1); free($1);} + {$$ = wxmake_integer($1); free($1);} | INTEGER PERIOD INTEGER - {$$ = make_real($1, $3); free($1); free($3); } + {$$ = wxmake_real($1, $3); free($1); free($3); } | INTEGER EXP INTEGER - {$$ = make_exp($1, $3); free($1); free($3); } + {$$ = wxmake_exp($1, $3); free($1); free($3); } | INTEGER PERIOD INTEGER EXP INTEGER - {$$ = make_exp2($1, $3, $5); free($1); free($3); + {$$ = wxmake_exp2($1, $3, $5); free($1); free($3); free($5); } | expr @@ -124,8 +119,15 @@ arg1 : WORD %% -#if defined(__WXGTK__) || defined(__WXMOTIF__) +/* We include lexer.c if we are building for gtk, wine or motif + * and also whenever we are using configure (marked by __WX_SETUP_H__) for, + * for example, cross compilation. */ +#if (defined(__WXGTK__) || defined(__WXWINE__) || defined(__WXMOTIF__)) || defined(__WX_SETUP_H__) && !defined(NO_CONFIGURE) +#include "lexer.c" +#elif defined(__WXMAC__) && defined(__APPLE__) #include "lexer.c" +#elif defined(__MWERKS__) +#include "../common/cwlex_yy.c" #else #include "../common/lex_yy.c" #endif @@ -153,16 +155,29 @@ void yyerror(char *s) * the UNIX flex expects a proper function. */ -/* Not sure if __SC__ is the appropriate thing - * to test +/* At least on alphaev6-dec-osf4.0e yywrap() must be #define'd. + * RL: ... but on Debian/Alpha(linux) it must not, so hopefully + * testing for __OSF__ here is what we really want. */ - -#ifndef __SC__ +#ifdef __OSF__ +#ifndef yywrap +#define yywrap() 1 +#endif +#else +/* HH: Added test for __WX_SETUP_H__ for gnuwin builds + * using configure */ +#if !defined(__SC__) && !defined(__GNUWIN32__) #ifdef USE_DEFINE #ifndef yywrap #define yywrap() 1 #endif -#else if !defined(__alpha) && !defined(__ultrix) +#elif !defined(__ultrix) +int yywrap() { return 1; } +#elif defined(__VMS__) +int yywrap() { return 1; } +#endif +#elif defined(__WX_SETUP_H__) int yywrap() { return 1; } #endif #endif +