X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/1656cfade4879af0cb003e3847e58264caa5781f..8fcffcc668f4782447beb64a823cc15961cea9ab:/src/lexer.l

diff --git a/src/lexer.l b/src/lexer.l
index 68bafd0..f3a0f2e 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -24,6 +24,7 @@
 #include <glib.h>
 #include <string.h>
 
+#include "treefuncs.h"
 #include "parse.h"
 #include "main.h"
 #include "util.h"
@@ -50,9 +51,9 @@ static void
 clear_cbuf(void)
 {
 	if(!cbuf) {
-		cbuf = g_string_new("");
+		cbuf = g_string_new(NULL);
 	} else {
-		cbuf = g_string_assign(cbuf,"");
+		cbuf = g_string_assign(cbuf, "");
 	}
 }
 
@@ -92,11 +93,33 @@ add_gtk_doc_func(void)
 %x GTK_DOC
 %x GTK_DOC_LINE
 
+
+
 %%
 
 <*>\n			{ line_no++; REJECT; }
 
-<*>MOTHERFUCKER		{ fprintf(stderr,"You are a bad bad person!\n"); REJECT; }
+<COMMENT>^(I(S.RI).E\(([1-9][0-9]+|[2-9]))/(\))	{
+/* Thy evil easter egg */
+#define QQ(x) long x
+#define KK(x) =atoi(__(&,,x,))
+#define MM(x,a) {QQ(i);for(i=2;i<x;i++){a}}
+#define PP(Q) (P%Q)==0
+#define ___(x,y,z) if(x z y)
+#define __(a,x,y,z) a(yytext[y] x z)
+#define O__O(a,b) fprintf(stderr,"%s is %s!\n",a,b)
+QQ(m)=1;___(__(,==,2,'P'),__(,==,5,'M'),&&
+){QQ(P)KK(8);MM(P,___(PP(i),,)m=0;)}__(,=,
+7,0);___(,,m){O__O(__( &,,8,),__(&,,2,));}
+#undef QQ
+#undef KK
+#undef MM
+#undef PP
+#undef ___
+#undef __
+#undef O__O
+REJECT;
+}
 
 \/\/.*$			{ ; /*comment, ignore*/ }
 <C_CODE>^#[ \t]*include[ \t][<"][^\n">]*[>"] {
@@ -201,6 +224,23 @@ add_gtk_doc_func(void)
 	if(before_comment == C_CODE) add_to_cbuf(yytext);
 		}
 
+^\%(a|all)\{		{
+			BEGIN(C_CODE);
+			parenth_depth = 1;
+			class_after_c = FALSE;
+			code_type = ACODE;
+			clear_cbuf();
+			ccode_line = line_no;
+		}
+^\%(at|alltop)\{		{
+			BEGIN(C_CODE);
+			parenth_depth = 1;
+			class_after_c = FALSE;
+			code_type = ATCODE;
+			clear_cbuf();
+			ccode_line = line_no;
+		}
+
 ^\%(ht|headertop)\{		{
 			BEGIN(C_CODE);
 			parenth_depth = 1;
@@ -327,7 +367,7 @@ class		{
 				char *s;
 				s = g_strdup_printf("'%s' keyword should not "
 						    "be used when generating "
-						    "C++ code",yytext);
+						    "C++ code", yytext);
 				print_error(TRUE, s, line_no);
 				g_free(s);
 			}
@@ -355,16 +395,22 @@ class		{
 <CLASS_CODE_I>public	{yylval.line = line_no; return PUBLIC;}
 <CLASS_CODE_I>private	{yylval.line = line_no; return PRIVATE;}
 <CLASS_CODE_I>protected	{yylval.line = line_no; return PROTECTED;}
+<CLASS_CODE_I>classwide	{yylval.line = line_no; return CLASSWIDE;}
 <CLASS_CODE_I>argument	{yylval.line = line_no; return ARGUMENT;}
 <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_I>onerror	{return ONERROR;}
 <CLASS_CODE_I>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>[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_]*)*	{
+			/* this is for a classname with an empty namespace */
 			yylval.id = g_strdup(yytext);
 			return TYPETOKEN;
 		}
@@ -373,7 +419,7 @@ class		{
 			return TOKEN;
 		}
 
-<CLASS_CODE_I>(\[[0-9]*\])+	{
+<CLASS_CODE_I>(\[[0-9]*\]|\[[A-Za-z_][A-Za-z0-9_]*\])+	{
 			yylval.id = g_strdup(yytext);
 			return ARRAY_DIM;
 		}