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

diff --git a/src/lexer.l b/src/lexer.l
index f45fcc5..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"
@@ -33,6 +34,8 @@ static int parenth_depth = 0;
 static int before_comment = INITIAL;
 static gboolean class_after_c = FALSE;
 static int code_type = CCODE;
+static int before_string;
+static int property_paren_depth = 0;
 
 /* GTK+ doc stuff */
 static char *gtk_doc_func = NULL; /* current gtk-doc func */
@@ -46,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)
@@ -90,9 +95,11 @@ int yylex(void);
 
 %x COMMENT
 %x C_CODE
-%x C_CODE_STRING
+%x CODE_STRING
 %x CLASS_CODE
 %x CLASS_CODE_I
+%x PROPERTY_CODE
+%x PROPERTY_CODE_I
 %x GTK_DOC_BEFORE_NAME
 %x GTK_DOC
 %x GTK_DOC_LINE
@@ -101,6 +108,14 @@ int yylex(void);
 
 %%
 
+%{
+/* Avoid warning from flex, cuz flex sucks */
+#ifdef FLEX_SCANNER
+yy_current_state = 0;
+#endif
+%}
+
+
 <*>\n			{ line_no++; REJECT; }
 
 <COMMENT>^(I(S.RI).E\(([1-9][0-9]+|[2-9]))/(\))	{
@@ -126,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;
@@ -207,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);
@@ -215,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);
@@ -296,17 +351,31 @@ REJECT;
 <C_CODE>\'\\\"\'	{ add_to_cbuf(yytext); }
 	
 <C_CODE>\\.	{ add_to_cbuf(yytext); }
+
+
 <C_CODE>\"	{
-			BEGIN(C_CODE_STRING);
+			BEGIN(CODE_STRING);
+			before_string = C_CODE;
 			add_to_cbuf(yytext);
 		}
-<C_CODE_STRING>\\.	{ add_to_cbuf(yytext); }
-<C_CODE_STRING>\"	{
-				BEGIN(C_CODE);
-				add_to_cbuf(yytext);
+<PROPERTY_CODE_I>\"	{
+			BEGIN(CODE_STRING);
+			before_string = PROPERTY_CODE_I;
+			add_to_cbuf(yytext);
+		}
+<CODE_STRING>\\.	{ add_to_cbuf(yytext); }
+<CODE_STRING>\"	{
+			BEGIN(before_string);
+			add_to_cbuf(yytext);
+			if (before_string == PROPERTY_CODE_I) {
+				yylval.id = cbuf->str;
+				g_string_free (cbuf, FALSE);
+				cbuf = NULL;
+				return STRING;
 			}
-<C_CODE_STRING>.	{ add_to_cbuf(yytext); }
-<C_CODE_STRING>\n	{ add_to_cbuf(yytext); }
+		}
+<CODE_STRING>.	{ add_to_cbuf(yytext); }
+<CODE_STRING>\n	{ add_to_cbuf(yytext); }
 
 <C_CODE>\{	{
 			parenth_depth++;
@@ -341,25 +410,49 @@ 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;
+			int maj = 0, min = 0, pl = 0;
+			int rmaj = 0, rmin = 0, rpl = 0;
+			int effective_maj = 0;
+			int effective_rmaj = 0;
 			char *p;
 			
-			sscanf(VERSION,"%d.%d.%d",&rmaj,&rmin,&rpl);
-			p = strchr(yytext,'r');
-			g_assert(p); /* we MUST have found it */
-			sscanf(p,"requires %d.%d.%d",&maj,&min,&pl);
+			sscanf (VERSION, "%d.%d.%d", &rmaj, &rmin, &rpl);
+			effective_rmaj = rmaj;
+			if (rmin >= 90)
+				effective_rmaj = rmaj + 1;
+
+			p = strchr (yytext,'r');
+			g_assert (p); /* we MUST have found it */
+			sscanf (p, "requires %d.%d.%d", &maj, &min, &pl);
+			effective_maj = maj;
+			if (min >= 90)
+				effective_maj = maj + 1;
+
 			if(rmaj < maj ||
 			   (rmaj == maj && rmin < min) ||
 			   (rmaj == maj && rmin == min && rpl < pl)) {
+				error_printf (GOB_ERROR, line_no,
+					      "GOB version at least %d.%d.%d required "
+					      "(this is %s)\n"
+					      "To upgrade your gob, see: "
+					      "http://www.5z.com/jirka/gob.html",
+					      maj, min, pl, VERSION);
+			}
+
+			if(effective_rmaj != effective_maj) {
 				error_printf(GOB_ERROR, line_no,
-					     "GOB version %d.%d.%d required "
+					     "GOB major version %d required "
 					     "(this is %s)\n"
 					     "To upgrade your gob, see: "
 					     "http://www.5z.com/jirka/gob.html",
-					     maj, min, pl, VERSION);
+					     effective_maj, VERSION);
 			}
+
 		}
 
 <CLASS_CODE,CLASS_CODE_I>class|this	{
@@ -374,19 +467,19 @@ class		{
 
 <CLASS_CODE>from	{return FROM;}
 
-<CLASS_CODE_I>void	{return VOID;}
-<CLASS_CODE_I>struct	{return STRUCT;}
-<CLASS_CODE_I>union	{return UNION;}
-<CLASS_CODE_I>enum	{return ENUM;}
-<CLASS_CODE_I>signed	{return SIGNED;}
-<CLASS_CODE_I>unsigned	{return UNSIGNED;}
-<CLASS_CODE_I>long	{return LONG;}
-<CLASS_CODE_I>short	{return SHORT;}
-<CLASS_CODE_I>int	{return INT;}
-<CLASS_CODE_I>float	{return FLOAT;}
-<CLASS_CODE_I>double	{return DOUBLE;}
-<CLASS_CODE_I>char	{return CHAR;}
-<CLASS_CODE_I>const	{return CONST;}
+<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;}
+<CLASS_CODE_I,PROPERTY_CODE_I>enum	{return ENUM;}
+<CLASS_CODE_I,PROPERTY_CODE_I>signed	{return SIGNED;}
+<CLASS_CODE_I,PROPERTY_CODE_I>unsigned	{return UNSIGNED;}
+<CLASS_CODE_I,PROPERTY_CODE_I>long	{return LONG;}
+<CLASS_CODE_I,PROPERTY_CODE_I>short	{return SHORT;}
+<CLASS_CODE_I,PROPERTY_CODE_I>int	{return INT;}
+<CLASS_CODE_I,PROPERTY_CODE_I>float	{return FLOAT;}
+<CLASS_CODE_I,PROPERTY_CODE_I>double	{return DOUBLE;}
+<CLASS_CODE_I,PROPERTY_CODE_I>char	{return CHAR;}
+<CLASS_CODE_I,PROPERTY_CODE_I>const	{return CONST;}
 
 <CLASS_CODE_I>\.\.\.	{return THREEDOTS;}
 
@@ -398,24 +491,65 @@ class		{
 <CLASS_CODE_I>virtual	{yylval.line = line_no; return VIRTUAL;}
 <CLASS_CODE_I>signal	{yylval.line = line_no; return SIGNAL;}
 <CLASS_CODE_I>override	{yylval.line = line_no; return OVERRIDE;}
-<CLASS_CODE,CLASS_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_I>property	{
+				yylval.line = line_no;
+				BEGIN(PROPERTY_CODE);
+				return PROPERTY;
+			}
+<PROPERTY_CODE_I>nick	{ yylval.line = line_no; return NICK; }
+<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; }
+<PROPERTY_CODE_I>default_value	{ yylval.line = line_no; return DEFAULT_VALUE; }
+<PROPERTY_CODE_I>flags	{ yylval.line = line_no; return FLAGS; }
+<PROPERTY_CODE_I>type	{ yylval.line = line_no; return TYPE; }
+<PROPERTY_CODE_I>flags_type	{ yylval.line = line_no; return FLAGS_TYPE; }
+<PROPERTY_CODE_I>enum_type	{ yylval.line = line_no; return ENUM_TYPE; }
+<PROPERTY_CODE_I>param_type	{ yylval.line = line_no; return PARAM_TYPE; }
+<PROPERTY_CODE_I>boxed_type	{ yylval.line = line_no; return BOXED_TYPE; }
+<PROPERTY_CODE_I>object_type	{ yylval.line = line_no; return OBJECT_TYPE; }
+<PROPERTY_CODE>[(]	{
+		yylval.line = line_no;
+		property_paren_depth = 1;
+		BEGIN(PROPERTY_CODE_I);
+		return '(';
+			}
+<PROPERTY_CODE_I>[(]	{
+		yylval.line = line_no;
+		property_paren_depth++;
+		return '(';
+			}
+<PROPERTY_CODE_I>[)]	{
+		yylval.line = line_no;
+		property_paren_depth--;
+		if (property_paren_depth == 0) {
+			BEGIN(CLASS_CODE_I);
+		}
+		return ')';
+			}
+
+<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>[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>:[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>[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,INITIAL>\'\\.\'|\'.\'	{
+			yylval.id = g_strdup(yytext);
+			return SINGLE_CHAR;
+		}
 
 <CLASS_CODE_I>(\[[0-9]*\]|\[[A-Za-z_][A-Za-z0-9_]*\])+	{
 			yylval.id = g_strdup(yytext);
@@ -440,7 +574,7 @@ class		{
 				return '}';
 			}
 
-<CLASS_CODE,CLASS_CODE_I,INITIAL>[\t ]	;  /*ignore*/
+<CLASS_CODE,CLASS_CODE_I,INITIAL,PROPERTY_CODE,PROPERTY_CODE_I>[\f\t ]	;  /*ignore*/
 
 <*>.		{
 			yylval.line = line_no;