-Fixed so MISSING_INNER_MESSAGE error is not produced if option "chec…

…kModel" is true. This option should preferably be set when instantiating class for checkModel. git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/MathCoreOSMC@4091 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 18, 2009 · bf8cb72 · bf8cb72
1 parent 76545d0
commit bf8cb72
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/Compiler/Error.mo b/Compiler/Error.mo
@@ -468,7 +468,7 @@ protected constant list<tuple<Integer, MessageType, Severity, String>> errorTabl
           (UNUSED_MODIFIER,TRANSLATION(),WARNING(),  
           "Modifer declared but never used: %s %s"),
           (MISSING_INNER_PREFIX,TRANSLATION(),ERROR(),
-          "No corresponding 'INNER' declaration found for component %s declared as '%s'."),
+          "No corresponding 'inner' declaration found for component %s declared as '%s'."),
           (DERIVATIVE_NON_REAL,TRANSLATION(),ERROR(),  
           "Illegal derivative. der(%s) where %s is of type %s, which is not a subtype of Real"),
           (IMPLICIT_ITERATOR_NOT_FOUND_IN_LOOP_BODY,TRANSLATION(),ERROR(),

diff --git a/Compiler/Inst.mo b/Compiler/Inst.mo
@@ -12798,16 +12798,32 @@ algorithm
     case(DAE.VAR(componentRef=cr, innerOuter = io),innerVars) 
       local Absyn.InnerOuter io;
       equation
-        str2 = SCode.innerouterString(io);
+        str2 = Dump.unparseInnerouterStr(io);
         crs = Util.listMap(innerVars,DAE.varCref);
         {} = Util.listSelect1(crs, cr,isInnerOuterMatch);
         str = Exp.printComponentRefStr(cr);
         Error.addMessage(Error.MISSING_INNER_PREFIX,{str,str2});
-        print(" error: " +& str +& "\n");
-      then fail();
+        failExceptForCheck();
+      then (); 
   end matchcontinue;
 end checkMissingInnerDecl2;
 
+public function failExceptForCheck "function that fails if checkModel option is not set, otherwise it succeeds
+
+It should be used for the cases when normal instantiation should fail but a instantiation for performing
+checkModel call should not fail 
+"
+algorithm
+  _ := matchcontinue()
+    case() equation
+      true = OptManager.getOption("checkModel");
+    then ();
+    case() equation
+      //false = OptManager.getOption("checkModel");
+    then fail();
+  end matchcontinue;
+end failExceptForCheck;
+
 protected function extractCurrentName "Function: extractCurrentName
 Extract SCode.Element name.
 "

diff --git a/Compiler/runtime/optmanager.cpp b/Compiler/runtime/optmanager.cpp
@@ -69,6 +69,7 @@ extern "C"
 		options.insert(std::pair<std::string,bool>("analyticJacobian",false));
 		options.insert(std::pair<std::string,bool>("dummyOption",false));
 		options.insert(std::pair<std::string,bool>("logSelectedStates",false));
+		options.insert(std::pair<std::string,bool>("checkModel",false));
 
 		//options.insert(std::pair<std::string,bool>("dummy",false));