ticket:3488

Added a flag --ignoreCommandLineOptionsAnnotation

Author: adeas31

Compiler/Script/CevalScriptBackend.mo

@@ -2696,26 +2696,31 @@ algorithm
 
     case (cache,env,_,st as GlobalScript.SYMBOLTABLE(),fileNamePrefix,_,_)
       algorithm
-        // read the __OpenModelica_commandLineOptions
-        Absyn.STRING(commandLineOptions) := Interactive.getNamedAnnotation(className, st.ast, Absyn.IDENT("__OpenModelica_commandLineOptions"), SOME(Absyn.STRING("")), Interactive.getAnnotationExp);
-        haveAnnotation := boolNot(stringEq(commandLineOptions, ""));
-        // backup the flags.
-        flags := if haveAnnotation then Flags.backupFlags() else Flags.loadFlags();
-        try
-	        // apply if there are any new flags
-	        if haveAnnotation then
-	          args := System.strtok(commandLineOptions, " ");
-	          _ := Flags.readArgs(args);
-	        end if;
-
-	        (cache, st, indexed_dlow, libs, file_dir, resultValues) :=
-	          SimCodeMain.translateModel(cache,env,className,st,fileNamePrefix,addDummy,inSimSettingsOpt,Absyn.FUNCTIONARGS({},{}));
-	        // reset to the original flags
-	        Flags.saveFlags(flags);
-	      else
-	        Flags.saveFlags(flags);
-	        fail();
-        end try;
+        if Config.ignoreCommandLineOptionsAnnotation() then
+          (cache, st, indexed_dlow, libs, file_dir, resultValues) :=
+            SimCodeMain.translateModel(cache,env,className,st,fileNamePrefix,addDummy,inSimSettingsOpt,Absyn.FUNCTIONARGS({},{}));
+        else
+	        // read the __OpenModelica_commandLineOptions
+	        Absyn.STRING(commandLineOptions) := Interactive.getNamedAnnotation(className, st.ast, Absyn.IDENT("__OpenModelica_commandLineOptions"), SOME(Absyn.STRING("")), Interactive.getAnnotationExp);
+	        haveAnnotation := boolNot(stringEq(commandLineOptions, ""));
+	        // backup the flags.
+	        flags := if haveAnnotation then Flags.backupFlags() else Flags.loadFlags();
+	        try
+		        // apply if there are any new flags
+		        if haveAnnotation then
+		          args := System.strtok(commandLineOptions, " ");
+		          _ := Flags.readArgs(args);
+		        end if;
+
+		        (cache, st, indexed_dlow, libs, file_dir, resultValues) :=
+		          SimCodeMain.translateModel(cache,env,className,st,fileNamePrefix,addDummy,inSimSettingsOpt,Absyn.FUNCTIONARGS({},{}));
+		        // reset to the original flags
+		        Flags.saveFlags(flags);
+		      else
+		        Flags.saveFlags(flags);
+		        fail();
+	        end try;
+	      end if;
       then
         (cache,st,indexed_dlow,libs,file_dir,resultValues);
 

Compiler/Util/Config.mo

@@ -593,5 +593,11 @@ algorithm
   outString := Flags.getConfigString(Flags.DYNAMIC_TEARING);
 end dynamicTearing;
 
+public function ignoreCommandLineOptionsAnnotation
+  output Boolean outBoolean;
+algorithm
+  outBoolean := Flags.getConfigBool(Flags.IGNORE_COMMAND_LINE_OPTIONS_ANNOTATION);
+end ignoreCommandLineOptionsAnnotation;
+
 annotation(__OpenModelica_Interface="util");
 end Config;

Compiler/Util/Flags.mo

@@ -1287,6 +1287,9 @@ constant ConfigFlag SET_TEARING_VARS = CONFIG_FLAG(97, "setTearingVars",
 constant ConfigFlag SET_RESIDUAL_EQNS = CONFIG_FLAG(98, "setResidualEqns",
   NONE(), EXTERNAL(), INT_LIST_FLAG({}), NONE(),
   Util.gettext("Sets the residual equations by its strong component indexes. Use '+d=tearingdump' to find out the relevant indexes for the collective equations.\nUse following format: '--setResidualEqns=(sci,n,r1,...,rn)*', with sci = strong component index, n = number of residual equations, r1,...rn = residual equations.\nE.g.: '--setResidualEqns=4,2,3,5' would select equations 3 and 5 in strong component 4.\nOnly works in combination with 'setTearingVars'."));
+constant ConfigFlag IGNORE_COMMAND_LINE_OPTIONS_ANNOTATION = CONFIG_FLAG(99, "ignoreCommandLineOptionsAnnotation",
+  NONE(), EXTERNAL(), BOOL_FLAG(false), NONE(),
+  Util.gettext("Ignores the command line options specified as annotation in the class."));
 
 protected
 // This is a list of all configuration flags. A flag can not be used unless it's
@@ -1390,7 +1393,8 @@ constant list<ConfigFlag> allConfigFlags = {
   DAE_MODE,
   INLINE_METHOD,
   SET_TEARING_VARS,
-  SET_RESIDUAL_EQNS
+  SET_RESIDUAL_EQNS,
+  IGNORE_COMMAND_LINE_OPTIONS_ANNOTATION
 };
 
 public function new