X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/7231d76fbf4ae0b501af648e1216b88714aa7353..489e97ede850a8de01ca3bd653dce9c25dcd54a1:/src/lexer.l

diff --git a/src/lexer.l b/src/lexer.l
index e102286..aa9b6d2 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -23,6 +23,7 @@
 #include "config.h"
 #include <glib.h>
 #include <string.h>
+#include <ctype.h>
 
 #include "treefuncs.h"
 #include "parse.h"
@@ -48,6 +49,8 @@ GList *include_files = NULL;
 static int look_for_includes = 0;
 
 int line_no = 1;
+/* last filename parsed from a #line directive */
+char *hline_filename = NULL;
 
 static void
 clear_cbuf(void)
@@ -138,6 +141,44 @@ REJECT;
 }
 
 \/\/.*$			{ ; /*comment, ignore*/ }
+
+<*>^#[ \t]*line[ \t]+[0-9]+([ \t]\"[^\n\r\f\"]*\")? {
+	char *p;
+	char *number;
+	char *filename;
+	char *str=g_strdup(yytext);
+
+	/* find first digit of line number */
+	p=str;
+	while(*p&&!isdigit(*p)) p++;
+	number=p;
+  
+	/* find end of line number */
+	while(*p&&isdigit(*p)) p++;
+	if(*p) *p++=0;
+
+	/* find beginning of filename */
+	p=strchr(p,'"');
+	if(p) p++;
+	filename=p;
+
+	/* find end of filename */
+	if(p) p=strchr(p,'"');
+	if(p) *p=0;
+
+	/* stash number (minus one because we don't count this line) */  
+	if(number) line_no=atoi(number)-1;
+
+	/* stash filename */
+	if(filename) {
+		if(hline_filename) g_free(hline_filename);
+		hline_filename=g_strdup(filename);
+	}
+  
+	/* clean up */
+	g_free(str);
+}
+
 <C_CODE>^#[ \t]*include[ \t][<"][^\n">]*[>"] {
 	if(look_for_includes==1) {
 		char *p;
@@ -219,6 +260,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);
@@ -227,6 +269,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);
@@ -367,6 +410,10 @@ class		{
 			return CLASS;
 		}
 
+error		{ return ERROR; }
+enum		{ return ENUM; }
+flags		{ return FLAGS; }
+
 ^[ \t]*requires[ \t]+[0-9]+\.[0-9]+\.[0-9]+[\t ]*$	{
 			int maj = 0, min = 0, pl = 0;
 			int rmaj = 0, rmin = 0, rpl = 0;
@@ -403,7 +450,7 @@ class		{
 					     "(this is %s)\n"
 					     "To upgrade your gob, see: "
 					     "http://www.5z.com/jirka/gob.html",
-					     maj, VERSION);
+					     effective_maj, VERSION);
 			}
 
 		}
@@ -481,25 +528,25 @@ class		{
 		return ')';
 			}
 
-<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I>0|[1-9][0-9]*|0x[0-9a-fA-F]+|0[0-7]+|[0-9]*\.[0-9]+|\.[0-9][0-9]*	{
+<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I,INITIAL>0|[1-9][0-9]*|0x[0-9a-fA-F]+|0[0-7]+|[0-9]*\.[0-9]+|\.[0-9][0-9]*	{
 			yylval.id = g_strdup(yytext);
 			return NUMBER;
 		}
-<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I>[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 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>:[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 for a classname with an empty namespace */
 			yylval.id = g_strdup(yytext);
 			return TYPETOKEN;
 		}
-<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I>[A-Za-z_][A-Za-z0-9_]*	{
+<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I,INITIAL>[A-Za-z_][A-Za-z0-9_]*	{
 			yylval.id = g_strdup(yytext);
 			return TOKEN;
 		}
-<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I>\'\\.\'|\'.\'	{
+<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I,INITIAL>\'\\.\'|\'.\'	{
 			yylval.id = g_strdup(yytext);
 			return SINGLE_CHAR;
 		}
@@ -527,7 +574,7 @@ class		{
 				return '}';
 			}
 
-<CLASS_CODE,CLASS_CODE_I,INITIAL,PROPERTY_CODE,PROPERTY_CODE_I>[\t ]	;  /*ignore*/
+<CLASS_CODE,CLASS_CODE_I,INITIAL,PROPERTY_CODE,PROPERTY_CODE_I>[\f\t ]	;  /*ignore*/
 
 <*>.		{
 			yylval.line = line_no;