X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/b9f22ab5a7f4d4bfe0932debf8864a21b5c852cd..2310330e7d4d724bf6641339836be8523f95c916:/src/lexer.l

diff --git a/src/lexer.l b/src/lexer.l
index ebfc187..aabc7ad 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -24,6 +24,9 @@
 #include <glib.h>
 
 #include "parse.h"
+#include "main.h"
+
+extern gboolean for_cpp;
 
 static int parenth_depth = 0;
 static int before_comment = INITIAL;
@@ -31,6 +34,7 @@ static int class_after_c = FALSE;
 static int header_c = FALSE;
 
 static GString *cbuf = NULL;
+int ccode_line = 1;
 
 int line_no = 1;
 
@@ -66,16 +70,32 @@ add_to_cbuf(char *s)
 
 <*>\n			{ line_no++; REJECT; }
 
+<*>MOTHERFUCKER		{ fprintf(stderr,"You are a bad bad person!\n"); REJECT; }
+
 \/\/.*$			{ ; /*comment, ignore*/ }
-<C_CODE>\/\/.*$		{ ; /*comment, ignore*/ }
+<C_CODE>\/\/.*$		{ add_to_cbuf(yytext); /*comment, ignore*/ }
 <CLASS_CODE>\/\/.*$	{ ; /*comment, ignore*/ }
 <CLASS_CODE_I>\/\/.*$	{ ; /*comment, ignore*/ }
 \/\*		{BEGIN(COMMENT); before_comment = INITIAL; }
-<C_CODE>\/\*	{BEGIN(COMMENT); before_comment = C_CODE; }
+<C_CODE>\/\*	{
+	add_to_cbuf(yytext);
+	BEGIN(COMMENT);
+	before_comment = C_CODE;
+}
 <CLASS_CODE>\/\*	{BEGIN(COMMENT); before_comment = CLASS_CODE; }
 <CLASS_CODE_I>\/\*	{BEGIN(COMMENT); before_comment = CLASS_CODE_I; }
-<COMMENT>\*\/	{BEGIN(before_comment);}
-<COMMENT>.	{ ; /* comment, ignore */ }
+<COMMENT>\*\/	{
+	if(before_comment == C_CODE) add_to_cbuf(yytext);
+	BEGIN(before_comment);
+		}
+<COMMENT>.	{
+	/* comment, ignore */
+	if(before_comment == C_CODE) add_to_cbuf(yytext);
+		}
+<COMMENT>\n	{
+	/* comment, ignore */
+	if(before_comment == C_CODE) add_to_cbuf(yytext);
+		}
 
 ^\%h\{		{
 			BEGIN(C_CODE);
@@ -83,6 +103,7 @@ add_to_cbuf(char *s)
 			class_after_c = FALSE;
 			header_c = TRUE;
 			clear_cbuf();
+			ccode_line = line_no;
 		}
 ^\%\{		{
 			BEGIN(C_CODE);
@@ -90,6 +111,7 @@ add_to_cbuf(char *s)
 			class_after_c = FALSE;
 			header_c = FALSE;
 			clear_cbuf();
+			ccode_line = line_no;
 		}
 <C_CODE>^\%\}	{
 			BEGIN(INITIAL);
@@ -105,22 +127,21 @@ add_to_cbuf(char *s)
 <C_CODE>\'\\\{\'	{ add_to_cbuf(yytext); }
 <C_CODE>\'\}\'		{ add_to_cbuf(yytext); }
 <C_CODE>\'\\\}\'	{ add_to_cbuf(yytext); }
+<C_CODE>\'\"\'		{ add_to_cbuf(yytext); }
+<C_CODE>\'\\\"\'	{ add_to_cbuf(yytext); }
 	
 <C_CODE>\\.	{ add_to_cbuf(yytext); }
 <C_CODE>\"	{
 			BEGIN(C_CODE_STRING);
 			add_to_cbuf(yytext);
 		}
-<C_CODE_STRING>\\.	{
-				add_to_cbuf(yytext);
-			}
+<C_CODE_STRING>\\.	{ add_to_cbuf(yytext); }
 <C_CODE_STRING>\"	{
 				BEGIN(C_CODE);
 				add_to_cbuf(yytext);
 			}
-<C_CODE_STRING>.	{
-				add_to_cbuf(yytext);
-			}
+<C_CODE_STRING>.	{ add_to_cbuf(yytext); }
+<C_CODE_STRING>\n	{ add_to_cbuf(yytext); }
 
 <C_CODE>\{	{
 			parenth_depth++;
@@ -147,6 +168,18 @@ class		{
 			return CLASS;
 		}
 
+<CLASS_CODE,CLASS_CODE_I>class|this	{
+			if(for_cpp) {
+				char *s;
+				s = g_strdup_printf("'%s' keyword should not "
+						    "be used when generating "
+						    "C++ code",yytext);
+				print_error(TRUE,s, line_no);
+				g_free(s);
+			}
+			REJECT;
+		}
+
 <CLASS_CODE>from	{return FROM;}
 
 <CLASS_CODE_I>void	{return VOID;}
@@ -161,18 +194,16 @@ class		{
 <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>\.\.\.	{return THREEDOTS;}
 
 <CLASS_CODE_I>public	{yylval.line = line_no; return PUBLIC;}
 <CLASS_CODE_I>private	{yylval.line = line_no; return PRIVATE;}
 <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>last	{return LAST;}
-<CLASS_CODE_I>first	{return FIRST;}
 <CLASS_CODE_I>override	{yylval.line = line_no; return OVERRIDE;}
-<CLASS_CODE_I>check	{return CHECK;}
-<CLASS_CODE_I>null	{return CNULL;}
-<CLASS_CODE_I>type	{return TYPE;}
 <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);
@@ -195,6 +226,8 @@ class		{
 			BEGIN(C_CODE);
 			parenth_depth=1;
 			class_after_c = TRUE;
+			ccode_line = line_no;
+			yylval.line = line_no;
 			return '{';
 		}
 <CLASS_CODE_I>\}	{
@@ -202,9 +235,11 @@ class		{
 				return '}';
 			}
 
-<CLASS_CODE,CLASS_CODE_I,INITIAL>[\n\t ]	;  /*ignore*/
+<CLASS_CODE,CLASS_CODE_I,INITIAL>[\t ]	;  /*ignore*/
 
 <*>.		{
 			yylval.line = line_no;
 			return yytext[0];
 		}
+
+<*>[\n\r]	;  /*ignore*/