X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/dd11885aadcfaafae2d6268c381b0aac94cbc149..refs/tags/v1.0.0:/src/lexer.l

diff --git a/src/lexer.l b/src/lexer.l
index 941a460..f3a0f2e 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -367,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);
 			}
@@ -395,6 +395,7 @@ 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;}
@@ -418,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;
 		}