X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fparser.re;h=5b7e80e83c24d81a36892167a51bbd6094704351;hb=1c837573a87e0d375768e990a28d1b2706dbaf43;hp=7ab169e0f5f7120b9c6fc16838870b1273dd0f3a;hpb=52815a5aac85e8c69ffba76c25a51de3b6ae1365;p=m6w6%2Fext-psi

diff --git a/src/parser.re b/src/parser.re
index 7ab169e..5b7e80e 100644
--- a/src/parser.re
+++ b/src/parser.re
@@ -209,10 +209,10 @@ void PSI_ParserFree(PSI_Parser **P)
 #define ADDCOLS \
 	P->col += P->cur - P->tok
 
-#define NEWLINE \
+#define NEWLINE(label) \
 	P->col = 1; \
 	++P->line; \
-	goto nextline
+	goto label
 
 token_t PSI_ParserScan(PSI_Parser *P)
 {
@@ -236,7 +236,8 @@ token_t PSI_ParserScan(PSI_Parser *P)
 		QUOTED_STRING = "\"" ([^\"])+ "\"";
 		NUMBER = [+-]? [0-9]* "."? [0-9]+ ([eE] [+-]? [0-9]+)?;
 
-		("#"|"//") .* "\n" { NEWLINE; }
+		"/*" { goto comment; }
+		("#"|"//") .* "\n" { NEWLINE(nextline); }
 		"(" {RETURN(PSI_T_LPAREN);}
 		")" {RETURN(PSI_T_RPAREN);}
 		";" {RETURN(PSI_T_EOS);}
@@ -254,7 +255,7 @@ token_t PSI_ParserScan(PSI_Parser *P)
 		"-" {RETURN(PSI_T_MINUS);}
 		"/" {RETURN(PSI_T_SLASH);}
 		"..." {RETURN(PSI_T_ELLIPSIS);}
-		[\r\n] { NEWLINE; }
+		[\r\n] { NEWLINE(nextline); }
 		[\t ]+ { continue; }
 		'TRUE' {RETURN(PSI_T_TRUE);}
 		'FALSE' {RETURN(PSI_T_FALSE);}
@@ -284,6 +285,8 @@ token_t PSI_ParserScan(PSI_Parser *P)
 		'FUNCTION' {RETURN(PSI_T_FUNCTION);}
 		'TYPEDEF' {RETURN(PSI_T_TYPEDEF);}
 		'STRUCT' {RETURN(PSI_T_STRUCT);}
+		'UNION' {RETURN(PSI_T_UNION);}
+		'ENUM' {RETURN(PSI_T_ENUM);}
 		'CONST' {RETURN(PSI_T_CONST);}
 		'LIB' {RETURN(PSI_T_LIB);}
 		'LET' {RETURN(PSI_T_LET);}
@@ -312,6 +315,14 @@ token_t PSI_ParserScan(PSI_Parser *P)
 		QUOTED_STRING {RETURN(PSI_T_QUOTED_STRING);}
 		[^] {break;}
 		*/
+
+	comment:
+		P->tok = P->cur;
+		/*!re2c
+		"\n" { NEWLINE(comment); }
+		"*" "/" { continue; }
+		[^] { goto comment; }
+		*/
 	}
 	return -1;
 }