Commit 67b7653e authored by Daniel Honsel's avatar Daniel Honsel
Browse files

improved grammar

parent 86164e4c
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -968,8 +968,11 @@ RestrictedTemplate:
LogStatement:
	LOGKEYWORD LPAREN item+=LogItem (COMMA item+=LogItem)* RPAREN;

// TODO: LogItem is currently treated as template. Try to use FREE_TEXT again and change SimpleSpec somehow.
// This was seems to work and allows parsing constructs like: 
// log ( "*** f_1: INFO: OK - random value = " & bit2str(i1) & " ***" );
LogItem:
	text=FREE_TEXT | template=InLineTemplate;
	/*text=FREE_TEXT |*/ template=InLineTemplate;

Expression:
	SingleExpression | CompoundExpression;
@@ -1905,7 +1908,7 @@ terminal fragment STRING_DOUBLEQUOTE:
terminal fragment CHAR:
	EXTENDED_ALPHA_NUM | LPAREN | RPAREN | LBRACKET | RBRACKET | SQUAREOPEN | SQUARECLOSE | ' ' | QUESTIONMARK | STAR |
	BACKSLASH | SLASH | MINUS | PLUS | SHARP | AT | COLON | STRINGOP | '=' | GREATERTHAN | LESSTHAN | PERCENT |
	DOLLAR | SINGLEQUOTE | '|';
	DOLLAR | SINGLEQUOTE | '|' | SEMICOLON;

terminal HSTRING returns ecore::EString:
	SINGLEQUOTE HEX* SINGLEQUOTE 'H';