some more src code reformatting

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

diff --git a/src/common/parser.y b/src/common/parser.y
index d02184cfd668bda601ebf4255dfe433311e9c88d..d81dd0ca969245cfcf5aee5a72b5ece33873be68 100644 (file)
--- a/src/common/parser.y
+++ b/src/common/parser.y
@@ -1,4 +1,6 @@
+/* Version: $Id$ */
  %{
+#include "wx/setup.h"
 #include <string.h>
 #ifdef _MSC_VER
 #include <io.h>
@@ -77,14 +79,12 @@ command     :       WORD PERIOD
 
 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        :
-                       {$$ = NULL;}
+                       {$$ = proio_cons(NULL, NULL);}
        |       arg
                        {$$ = proio_cons($1, NULL);}
        |
@@ -119,7 +119,10 @@ arg1       :       WORD
 
 %%
 
-#if (defined(__WXGTK__) || defined(__WXMOTIF__)) && !defined(NO_CONFIGURE)
+/* 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"
 #else
 #if (defined(__MWERKS__))
@@ -152,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
+