Changeset 13903

Timestamp:

2012-11-15T14:34:37+01:00 (11 years ago)

Author:

sjoelund.se

Message:

• Fix lexer to only add optimica keywords if +g=Optimica is used

File:

• trunk/Parser/BaseModelica_Lexer.g (modified) (1 diff)

trunk/Parser/BaseModelica_Lexer.g

@@ -264 +264 @@
 // ---------
 
-OPTIMIZATION : 'optimization';
-CONSTRAINT : 'constraint';
-//INITIALGUESS : 'initialGuess';
-//FREE : 'free';
-//FINALTIME : 'finalTime';
+OPTIMIZATION : 'optimization' { if (!optimica_enabled()) $type = IDENT; };
+CONSTRAINT : 'constraint' { if (!optimica_enabled()) $type = IDENT; };
+//INITIALGUESS : 'initialGuess' { if (!optimica_enabled()) $type = IDENT; };
+//FREE : 'free' { if (!optimica_enabled()) $type = IDENT; };
+//FINALTIME : 'finalTime' { if (!optimica_enabled()) $type = IDENT; };
 
 /*------------------------------------------------------------------