X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/c190a2ae41238682c1430b8482683b6a7c15c66b..refs/tags/v0.0.3:/src/lexer.l

diff --git a/src/lexer.l b/src/lexer.l
index 92454f2..5f9f742 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -20,9 +20,10 @@
  */
 %{
 
+#include "config.h"
 #include <glib.h>
 
-#include "y.tab.h"
+#include "parse.h"
 
 static int parenth_depth = 0;
 static int before_comment = INITIAL;
@@ -30,6 +31,7 @@ static int class_after_c = FALSE;
 static int header_c = FALSE;
 
 static GString *cbuf = NULL;
+int ccode_line = 1;
 
 int line_no = 1;
 
@@ -75,6 +77,7 @@ add_to_cbuf(char *s)
 <CLASS_CODE_I>\/\*	{BEGIN(COMMENT); before_comment = CLASS_CODE_I; }
 <COMMENT>\*\/	{BEGIN(before_comment);}
 <COMMENT>.	{ ; /* comment, ignore */ }
+<COMMENT>\n	{ ; /* comment, ignore */ }
 
 ^\%h\{		{
 			BEGIN(C_CODE);
@@ -82,6 +85,7 @@ add_to_cbuf(char *s)
 			class_after_c = FALSE;
 			header_c = TRUE;
 			clear_cbuf();
+			ccode_line = line_no;
 		}
 ^\%\{		{
 			BEGIN(C_CODE);
@@ -89,6 +93,7 @@ add_to_cbuf(char *s)
 			class_after_c = FALSE;
 			header_c = FALSE;
 			clear_cbuf();
+			ccode_line = line_no;
 		}
 <C_CODE>^\%\}	{
 			BEGIN(INITIAL);
@@ -166,12 +171,7 @@ class		{
 <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);
@@ -194,6 +194,8 @@ class		{
 			BEGIN(C_CODE);
 			parenth_depth=1;
 			class_after_c = TRUE;
+			ccode_line = line_no;
+			yylval.line = line_no;
 			return '{';
 		}
 <CLASS_CODE_I>\}	{