X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59f0336397aed79ef7663ca698fa341b94764874..1da51aafba47af813ed5165855c819f490086f85:/src/common/parser.y

diff --git a/src/common/parser.y b/src/common/parser.y
index 669f080527..c922f8c04a 100644
--- a/src/common/parser.y
+++ b/src/common/parser.y
@@ -1,3 +1,4 @@
+/* Version: $Id$ */
  %{
 #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);}
-	|	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);}
 	|
@@ -98,6 +97,7 @@ arg	:	WORD EQUALS arg1
                          free($1); }
 	|	arg1
 			{$$ = $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"
-#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
-#endif
 
 /*
 void yyerror(s)
@@ -156,10 +156,15 @@ 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.
  */
-
+#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__) 
@@ -167,7 +172,7 @@ void yyerror(char *s)
 #ifndef yywrap
 #define yywrap() 1
 #endif
-#elif !defined(__alpha___) && !defined(__alpha) && !defined(__ultrix)
+#elif !defined(__ultrix)
 int yywrap() { return 1; }
 #elif defined(__VMS__)
 int yywrap() { return 1; }
@@ -175,3 +180,5 @@ int yywrap() { return 1; }
 #elif defined(__WX_SETUP_H__)
 int yywrap() { return 1; }
 #endif
+#endif
+