X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/38fac18bf81df672821ebbac4130ce41f0a6c61f..3e833eea9cb9822f04c639e143212c4b6f7940d4:/src/lexer.l

diff --git a/src/lexer.l b/src/lexer.l
index 0832621..0c8ef11 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-2009 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;
@@ -97,6 +106,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
@@ -189,9 +199,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;
 }
@@ -230,7 +242,7 @@ REJECT;
 			BEGIN(CLASS_CODE_I);
 			add_gtk_doc_func();
 		}
-<GTK_DOC>^[ \t]*\*\ 	{
+<GTK_DOC>^[ \t]*\*[ \t]	{
 			fflush(stdout);
 			add_to_cbuf(" * ");
 			BEGIN(GTK_DOC_LINE);
@@ -260,6 +272,7 @@ REJECT;
 <C_CODE>\/\/.*$		{ add_to_cbuf(yytext); /*comment, ignore*/ }
 <CLASS_CODE>\/\/.*$	{ ; /*comment, ignore*/ }
 <CLASS_CODE_I>\/\/.*$	{ ; /*comment, ignore*/ }
+<PROPERTY_CODE_I>\/\/.*$	{ ; /*comment, ignore*/ }
 \/\*		{BEGIN(COMMENT); before_comment = INITIAL; }
 <C_CODE>\/\*	{
 	add_to_cbuf(yytext);
@@ -268,6 +281,7 @@ REJECT;
 }
 <CLASS_CODE>\/\*	{BEGIN(COMMENT); before_comment = CLASS_CODE; }
 <CLASS_CODE_I>\/\*	{BEGIN(COMMENT); before_comment = CLASS_CODE_I; }
+<PROPERTY_CODE_I>\/\*	{BEGIN(COMMENT); before_comment = PROPERTY_CODE_I; }
 <COMMENT>\*\/	{
 	if(before_comment == C_CODE) add_to_cbuf(yytext);
 	BEGIN(before_comment);
@@ -332,6 +346,14 @@ REJECT;
 			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;
@@ -464,6 +486,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;}
@@ -530,12 +568,21 @@ flags		{ return FLAGS; }
 			yylval.id = g_strdup(yytext);
 			return NUMBER;
 		}
-<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-z0-9_]*)+	{
+			/* This is cpp kind of token thingie */
+			if (for_cpp) {
+				yylval.id = g_strdup(yytext);
+				return TOKEN;
+			} else {
+				REJECT;
+			}
+		}
+<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;
@@ -553,12 +600,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;
@@ -581,15 +632,13 @@ flags		{ return FLAGS; }
 
 <*>[\n\r]	;  /*ignore*/
 
-%%
-
-/* 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
+^[ \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;
+		}
 
+%%