Changeset 15386

Timestamp:

2013-02-28T14:45:42+01:00 (11 years ago)

Author:

sjoelund.se

Message:

#2096

Added special lexer rules for &&,

, !, telling the user the proper Modelica keyword to use

File:

• trunk/Parser/BaseModelica_Lexer.g (modified) (2 diffs)

trunk/Parser/BaseModelica_Lexer.g

@@ -185 +185 @@
 
 T_ALGORITHM : 'algorithm';
-T_AND : 'and';
+T_AND : 'and' | '&&' {
+            ModelicaParser_lexerError = ANTLR3_TRUE;
+            c_add_source_message(2, ErrorType_syntax, ErrorLevel_error, "Please use 'and' for logical and since '&&' is not a valid Modelica construct.",
+               NULL, 0, $line, $pos+1, $line, $pos+3,
+               ModelicaParser_readonly, ModelicaParser_filename_C_testsuiteFriendly);
+     };
 T_ANNOTATION : 'annotation';
 BLOCK : 'block';
@@ -219 +224 @@
 LOOP : 'loop';
 MODEL : 'model';
-T_NOT : 'not';
+T_NOT : 'not' | '!' {
+            ModelicaParser_lexerError = ANTLR3_TRUE;
+            c_add_source_message(2, ErrorType_syntax, ErrorLevel_error, "Please use 'not' for logical not since '!' is not a valid Modelica construct.",
+               NULL, 0, $line, $pos+1, $line, $pos+2,
+               ModelicaParser_readonly, ModelicaParser_filename_C_testsuiteFriendly);
+     };
 T_OUTER : 'outer';
 OPERATOR : 'operator'; 
 OVERLOAD : '$overload'; // OpenModelica extension
-T_OR : 'or';
+T_OR : 'or' | '||' {
+            ModelicaParser_lexerError = ANTLR3_TRUE;
+            c_add_source_message(2, ErrorType_syntax, ErrorLevel_error, "Please use 'or' for logical or since '||' is not a valid Modelica construct.",
+               NULL, 0, $line, $pos+1, $line, $pos+3,
+               ModelicaParser_readonly, ModelicaParser_filename_C_testsuiteFriendly);
+     };
 T_OUTPUT : 'output';
 T_PACKAGE : 'package';