Commit a3c2b43a authored by Daniel Honsel's avatar Daniel Honsel
Browse files

fixed some grammar issues

parent 82d939aa

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/GenerateTTCN3.mwe2

+14 −14
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ Workflow { 
			// name clash validator

			// can currently only be used with the eclipse editor, does not work 

			// in the standalone app 

				composedCheck = "de.ugoe.cs.swe.validation.NameClashValidator"

			// composedCheck = "de.ugoe.cs.swe.validation.NameClashValidator"

			}



			// old scoping and exporting API
@@ -145,7 +145,7 @@ Workflow { 
			// fragment = xbase.XbaseGeneratorFragment auto-inject {}



			// provides a preference page for template proposals

			fragment = templates.CodetemplatesGeneratorFragment auto-inject {}

			// fragment = templates.CodetemplatesGeneratorFragment auto-inject {}



			// provides a compare view

			fragment = compare.CompareFragment auto-inject {}

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/TTCN3.xtext

+35 −6
Original line number Diff line number Diff line
@@ -1081,8 +1081,9 @@ RefValue: 


	// IDENTIFIER omitted

PredefinedValue:

	bstring=BSTRING | boolean=BooleanValue | integer=NUMBER | hstring=HSTRING | ostring=OSTRING | verdictType=VerdictTypeValue |

	float=FloatValue | address=ADDRESSVALUE | omit=OMITKEYWORD | charString=CharStringValue;

	bstring=BSTRING | boolean=BooleanValue | integer=NUMBER | hstring=HSTRING | ostring=OSTRING |

	verdictType=VerdictTypeValue | float=FloatValue | address=ADDRESSVALUE | omit=OMITKEYWORD |

	charString=CharStringValue | macro=PREPROCESSING_MACRO;



BooleanExpression:

	SingleExpression;
@@ -1309,6 +1310,9 @@ FLOATENOTATION returns ecore::EString hidden(): 
FREE_TEXT returns ecore::EString:

	CSTRING;



PREPROCESSING_MACRO returns ecore::EString:

	MACRO_BFILE | MACRO_FILE | MACRO_LINE | MACRO_MODULE | MACRO_SCOPE;



	/* 

 *  Terminal symbols

 */
@@ -1420,7 +1424,7 @@ terminal REM returns ecore::EString: 
terminal SINGLEQUOTE returns ecore::EString:

	"'";



terminal DOUBLEQUTE returns ecore::EString:

terminal DOUBLEQUOTE returns ecore::EString:

	'"';



terminal EXCLAMATIONMARK returns ecore::EString:
@@ -1465,9 +1469,30 @@ terminal SHARP returns ecore::EString: 
terminal AT returns ecore::EString:

	'@';



terminal PERCENT returns ecore::EString:

	'%';



terminal DOLLAR returns ecore::EString:

	'$';



terminal EXPONENTIAL returns ecore::EString:

	'E';



terminal MACRO_FILE returns ecore::EString:

	'__FILE__';



terminal MACRO_LINE returns ecore::EString:

	'__LINE__';



terminal MACRO_BFILE returns ecore::EString:

	'__BFILE__';



terminal MACRO_SCOPE returns ecore::EString:

	'__SCOPE__';



terminal MACRO_MODULE returns ecore::EString:

	'__MODULE__';



terminal ADDRESSVALUE returns ecore::EString:

	'null';
@@ -1870,13 +1895,17 @@ terminal fragment NUM: 
terminal NUMBER:

	NUM+;



terminal CSTRING returns ecore::EString:

	DOUBLEQUTE CHAR* DOUBLEQUTE;

terminal CSTRING:

	DOUBLEQUOTE (STRING_DOUBLEQUOTE | CHAR)* DOUBLEQUOTE;



terminal fragment STRING_DOUBLEQUOTE:

	DOUBLEQUOTE DOUBLEQUOTE;



	// TODO: complete CHAR

terminal fragment CHAR:

	EXTENDED_ALPHA_NUM | LPAREN | RPAREN | LBRACKET | RBRACKET | SQUAREOPEN | SQUARECLOSE | ' ' | QUESTIONMARK | STAR |

	BACKSLASH | SLASH | SEMICOLON | MINUS | PLUS | SHARP | AT | COLON | STRINGOP | '=' | GREATERTHAN | LESSTHAN | '%' | '$';

	BACKSLASH | SLASH | MINUS | PLUS | SHARP | AT | COLON | STRINGOP | '=' | GREATERTHAN | LESSTHAN | PERCENT |

	DOLLAR | SINGLEQUOTE | '|';



terminal HSTRING returns ecore::EString:

	SINGLEQUOTE HEX* SINGLEQUOTE 'H';