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

diff --git a/src/lexer.l b/src/lexer.l
index 0c8ef11..3e57e8a 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -1,7 +1,9 @@
-/* GOB C Preprocessor
+%top{
+/*
+ * GOB C Preprocessor
  * Copyright (C) 1999-2000 the Free Software Foundation.
  * Copyright (C) 2000 Eazel, Inc.
- * Copyright (C) 2001-2009 George (Jiri) Lebl
+ * Copyright (C) 2001-2011 George (Jiri) Lebl
  *
  * Author: George Lebl
  *
@@ -20,9 +22,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  * USA.
  */
-%{
+#include <config.h>
+}
 
-#include "config.h"
+%{
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -95,9 +98,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
 
 %}
@@ -189,7 +193,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;
@@ -346,6 +350,16 @@ 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;
@@ -503,6 +517,12 @@ flags		{ return FLAGS; }
 <CLASS_STRING>.	{ add_to_cbuf(yytext); }
 <CLASS_STRING>\n	{ add_to_cbuf(yytext); }
 
+<CLASS_CODE_I>\"	{
+			BEGIN(CLASS_STRING);
+			before_string = CLASS_CODE_I;
+			add_to_cbuf(yytext);
+		}
+
 <CLASS_CODE_I,PROPERTY_CODE_I>void	{return VOID;}
 <CLASS_CODE_I,PROPERTY_CODE_I>struct	{return STRUCT;}
 <CLASS_CODE_I,PROPERTY_CODE_I>union	{return UNION;}
@@ -533,6 +553,7 @@ flags		{ return FLAGS; }
 				return PROPERTY;
 			}
 <PROPERTY_CODE_I>nick	{ yylval.line = line_no; return NICK; }
+<PROPERTY_CODE_I>name	{ yylval.line = line_no; return NAME; }
 <PROPERTY_CODE_I>blurb	{ yylval.line = line_no; return BLURB; }
 <PROPERTY_CODE_I>maximum	{ yylval.line = line_no; return MAXIMUM; }
 <PROPERTY_CODE_I>minimum	{ yylval.line = line_no; return MINIMUM; }
@@ -625,13 +646,14 @@ 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;