Committing in .

[wxWidgets.git] / src / common / parser.y

diff --git a/src/common/parser.y b/src/common/parser.y
index 591c10c5513c28f21bfad922151db6c56f11644e..c922f8c04a8df2f8f1a419f2e019e6463b56e209 100644 (file)
--- a/src/common/parser.y
+++ b/src/common/parser.y
@@ -1,3 +1,4 @@
+/* Version: $Id$ */

  %{
 #include "wx/setup.h"
 #include <string.h>
  %{
 #include "wx/setup.h"
 #include <string.h>


@@ -78,14 +79,12 @@ command     :       WORD PERIOD
 
 expr   :       WORD OPEN arglist CLOSE 
                        {$$ = proio_cons(wxmake_word($1), $3); free($1);}
 
 expr   :       WORD OPEN arglist CLOSE 
                        {$$ = proio_cons(wxmake_word($1), $3); free($1);}

-       |       OPEN_SQUARE CLOSE_SQUARE
-                        {$$ = proio_cons(NULL, NULL);}

        |       OPEN_SQUARE arglist CLOSE_SQUARE
                        {$$ = $2; }
        ;
 
 arglist        :
        |       OPEN_SQUARE arglist CLOSE_SQUARE
                        {$$ = $2; }
        ;
 
 arglist        :

-                       {$$ = NULL;}
+                       {$$ = proio_cons(NULL, NULL);}

        |       arg
                        {$$ = proio_cons($1, NULL);}
        |
        |       arg
                        {$$ = proio_cons($1, NULL);}
        |


@@ -98,6 +97,7 @@ arg   :       WORD EQUALS arg1
                          free($1); }
        |       arg1
                        {$$ = $1; }
                          free($1); }
        |       arg1
                        {$$ = $1; }

+       ;

 
 arg1   :       WORD
                        {$$ = wxmake_word($1); free($1);}
 
 arg1   :       WORD
                        {$$ = wxmake_word($1); free($1);}


@@ -125,13 +125,13 @@ arg1      :       WORD
  * for example, cross compilation. */
 #if (defined(__WXGTK__) || defined(__WXWINE__) || defined(__WXMOTIF__)) || defined(__WX_SETUP_H__) && !defined(NO_CONFIGURE)
 #include "lexer.c"
  * for example, cross compilation. */
 #if (defined(__WXGTK__) || defined(__WXWINE__) || defined(__WXMOTIF__)) || defined(__WX_SETUP_H__) && !defined(NO_CONFIGURE)
 #include "lexer.c"

-#else
-#if (defined(__MWERKS__))
+#elif defined(__WXMAC__) && defined(__APPLE__)
+#include "lexer.c"
+#elif defined(__MWERKS__)

 #include "../common/cwlex_yy.c"
 #else
 #include "../common/lex_yy.c"
 #endif
 #include "../common/cwlex_yy.c"
 #else
 #include "../common/lex_yy.c"
 #endif

-#endif

 
 /*
 void yyerror(s)
 
 /*
 void yyerror(s)


@@ -156,8 +156,11 @@ void yyerror(char *s)
  * the UNIX flex expects a proper function.
  */
 
  * the UNIX flex expects a proper function.
  */
 

-/* At least on alphaev6-dec-osf4.0e yywrap() must be #define'd */
-#if defined( __ALPHA__ ) && !defined( __VMS__ )
+/* 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.
+ */
+#ifdef __OSF__

 #ifndef yywrap
 #define yywrap() 1
 #endif
 #ifndef yywrap
 #define yywrap() 1
 #endif