Changeset 983e45b in OpenModelica

Timestamp:

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

Author:

Martin Sjölund <martin.sjolund@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

bccc80f0

Parents:

821b9748

Message:

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

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@13903 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

File:

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

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; };
 
 /*------------------------------------------------------------------