X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/ada81cd69cc17de9e0f15214782c8067436c5354..d52e64e92557f0b6d7704077ec175c88fa7ca243:/src/lexer.l

diff --git a/src/lexer.l b/src/lexer.l
index e70d3a2..0dc3cda 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -1,5 +1,7 @@
 /* GOB C Preprocessor
- * Copyright (C) 1999 the Free Software Foundation.
+ * Copyright (C) 1999-2000 the Free Software Foundation.
+ * Copyright (C) 2000 Eazel, Inc.
+ * Copyright (C) 2001-2011 George (Jiri) Lebl
  *
  * Author: George Lebl
  *
@@ -21,9 +23,10 @@
 %{
 
 #include "config.h"
-#include <glib.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <glib.h>
 
 #include "treefuncs.h"
 #include "parse.h"
@@ -31,7 +34,13 @@
 #include "util.h"
 
 static int parenth_depth = 0;
-static int before_comment = INITIAL;
+static int before_comment
+/* New flex is on drugs */
+#if defined(FLEX_SCANNER) && ! defined(INITIAL)
+	= 0;
+#else
+	= INITIAL;
+#endif
 static gboolean class_after_c = FALSE;
 static int code_type = CCODE;
 static int before_string;
@@ -86,9 +95,10 @@ add_gtk_doc_func(void)
 	gtk_doc_func = NULL;
 }
 
-/* Ugly warning avoiding */
+/* Ugly warning / error avoidings */
 #ifdef FLEX_SCANNER
 int yylex(void);
+int yywrap(void) { return 1; }
 #endif
 
 %}
@@ -97,6 +107,7 @@ int yylex(void);
 %x C_CODE
 %x CODE_STRING
 %x CLASS_CODE
+%x CLASS_STRING
 %x CLASS_CODE_I
 %x PROPERTY_CODE
 %x PROPERTY_CODE_I
@@ -179,7 +190,7 @@ REJECT;
 	g_free(str);
 }
 
-<C_CODE>^#[ \t]*include[ \t][<"][^\n">]*[>"] {
+<C_CODE>^#[ \t]*include[ \t][<"][^\n\r">]*[>"] {
 	if(look_for_includes==1) {
 		char *p;
 		char *file;
@@ -189,9 +200,11 @@ REJECT;
 		file++;
 		p = strchr(file,'"');
 		if(!p) p = strchr(file,'>');
-		*p = '\0';
-		include_files = g_list_prepend(include_files,g_strdup(file));
-		g_free(str);
+		if (p != NULL) {
+			*p = '\0';
+			include_files = g_list_prepend(include_files,g_strdup(file));
+			g_free(str);
+		}
 	}
 	REJECT;
 }
@@ -334,6 +347,24 @@ REJECT;
 			if(look_for_includes==0)
 				look_for_includes=1;
 		}
+^\%(ct|ctop)\{		{
+			BEGIN(C_CODE);
+			parenth_depth = 1;
+			class_after_c = FALSE;
+			code_type = CTCODE;
+			clear_cbuf();
+			ccode_line = line_no;
+			if(look_for_includes==0)
+				look_for_includes=1;
+		}
+^\%(ad|afterdecls)\{		{
+			BEGIN(C_CODE);
+			parenth_depth = 1;
+			class_after_c = FALSE;
+			code_type = ADCODE;
+			clear_cbuf();
+			ccode_line = line_no;
+		}
 <C_CODE>^\%\}	{
 			BEGIN(INITIAL);
 			yylval.cbuf = cbuf;
@@ -466,6 +497,22 @@ flags		{ return FLAGS; }
 		}
 
 <CLASS_CODE>from	{return FROM;}
+<CLASS_CODE>\"	{
+			BEGIN(CLASS_STRING);
+			before_string = CLASS_CODE;
+			add_to_cbuf(yytext);
+		}
+<CLASS_STRING>\\.	{ add_to_cbuf(yytext); }
+<CLASS_STRING>\"	{
+			BEGIN(before_string);
+			add_to_cbuf(yytext);
+			yylval.id = cbuf->str;
+			g_string_free (cbuf, FALSE);
+			cbuf = NULL;
+			return STRING;
+		}
+<CLASS_STRING>.	{ add_to_cbuf(yytext); }
+<CLASS_STRING>\n	{ add_to_cbuf(yytext); }
 
 <CLASS_CODE_I,PROPERTY_CODE_I>void	{return VOID;}
 <CLASS_CODE_I,PROPERTY_CODE_I>struct	{return STRUCT;}
@@ -541,12 +588,12 @@ flags		{ return FLAGS; }
 				REJECT;
 			}
 		}
-<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I,INITIAL>[A-Za-z_][A-Za-z0-9_]*(:[A-Za-z0-9_]*)+	{
+<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I,INITIAL>[A-Za-z_][A-Za-z0-9_]*(:[A-Za-z_][A-Za-z0-9_]*)+	{
 			/* this one is for a classname with a namespace */
 			yylval.id = g_strdup(yytext);
 			return TYPETOKEN;
 		}
-<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I,INITIAL>:[A-Za-z_][A-Za-z0-9_]*(:[A-Za-z0-9_]*)*	{
+<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I,INITIAL>:[A-Za-z_][A-Za-z0-9_]*(:[A-Za-z_][A-Za-z0-9_]*)*	{
 			/* this is for a classname with an empty namespace */
 			yylval.id = g_strdup(yytext);
 			return TYPETOKEN;
@@ -564,12 +611,16 @@ flags		{ return FLAGS; }
 			yylval.id = g_strdup(yytext);
 			return ARRAY_DIM;
 		}
-
+<CLASS_CODE_I>:[0-9]+ {
+			/* cheat for bitfield */
+			yylval.id = g_strdup(yytext);
+			return ARRAY_DIM;
+		}
 <CLASS_CODE>\{	{
 			BEGIN(CLASS_CODE_I);
 			return '{';
 		}
-<CLASS_CODE_I>\{	{
+<CLASS_CODE_I,PROPERTY_CODE>\{	{
 			BEGIN(C_CODE);
 			parenth_depth=1;
 			class_after_c = TRUE;
@@ -585,22 +636,21 @@ flags		{ return FLAGS; }
 
 <CLASS_CODE,CLASS_CODE_I,INITIAL,PROPERTY_CODE,PROPERTY_CODE_I>[\f\t ]	;  /*ignore*/
 
+<*>[\n\r]	;  /*ignore*/
+
+
 <*>.		{
 			yylval.line = line_no;
 			return yytext[0];
 		}
 
-<*>[\n\r]	;  /*ignore*/
+^[ \t]*prealloc[ \t]+[0-9]+[ \t]*$ {
+			char *p;
+			int t;
+			p = strchr (yytext,'p');
+			g_assert (p); /* we MUST have found it */
+			sscanf (p, "prealloc %d", &t);
+			prealloc=t;
+		}
 
 %%
-
-/* Ugly warning avoiding */
-#ifdef FLEX_SCANNER
-static void warning_avoider(void) G_GNUC_UNUSED;
-static void warning_avoider(void) {
-	yy_flex_realloc(NULL, 0);
-	yyunput(0, NULL);
-	warning_avoider();
-}
-#endif
-