X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/6e77e91bbb048a0ee1a072715c0ce808c169ab38..8cb6370effd9f2dacc6dc9b662a43ea19ee637ac:/src/lexer.l

diff --git a/src/lexer.l b/src/lexer.l
index cabafca..0037b85 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -70,16 +70,29 @@ add_to_cbuf(char *s)
 <*>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>\n	{ ; /* 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);
@@ -111,22 +124,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++;
@@ -208,9 +220,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*/