- Forbid Real priority in potentialRoot calls.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11972 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 4, 2012 · c01ab90 · c01ab90
1 parent 5268c97
commit c01ab90
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/Compiler/FrontEnd/InstSection.mo b/Compiler/FrontEnd/InstSection.mo
@@ -780,36 +780,24 @@ algorithm
       then
         (cache,env,ih,DAEUtil.emptyDae,csets,ci_state,graph);
 
-    // Connections.potentialRoot(cr,priority =prio ) - priority as named argument
-    case (cache,env,ih,mod,pre,csets,ci_state,SCode.EQ_NORETCALL(info=info,
-              functionName = Absyn.CREF_QUAL("Connections", {}, Absyn.CREF_IDENT("potentialRoot", {})),
-              functionArgs = Absyn.FUNCTIONARGS({Absyn.CREF(cr)}, {Absyn.NAMEDARG("priority", Absyn.REAL(priority))})),initial_,impl,graph)
-      equation 
-        (cache,SOME((DAE.CREF(cr_,t),_,_))) = Static.elabCref(cache,env, cr, false /* ??? */,false,pre,info);
-        (cache,cr_) = PrefixUtil.prefixCref(cache,env,ih,pre, cr_);
-        graph = ConnectionGraph.addPotentialRoot(graph, cr_, priority);
-      then
-        (cache,env,ih,DAEUtil.emptyDae,csets,ci_state,graph);
-
-    // Connections.potentialRoot(cr,priority) - priority as positional argument
+    // Connections.potentialRoot(cr,priority) - priority as Integer positinal argument
     case (cache,env,ih,mod,pre,csets,ci_state,SCode.EQ_NORETCALL(info=info,
               functionName = Absyn.CREF_QUAL("Connections", {}, Absyn.CREF_IDENT("potentialRoot", {})),
-              functionArgs = Absyn.FUNCTIONARGS({Absyn.CREF(cr),Absyn.REAL(priority)}, {})),initial_,impl,graph)
+              functionArgs = Absyn.FUNCTIONARGS({Absyn.CREF(cr),Absyn.INTEGER(ipriority)}, {})),initial_,impl,graph)
       equation 
         (cache,SOME((DAE.CREF(cr_,t),_,_))) = Static.elabCref(cache,env, cr, false /* ??? */,false,pre,info);
         (cache,cr_) = PrefixUtil.prefixCref(cache,env,ih,pre, cr_);
-        graph = ConnectionGraph.addPotentialRoot(graph, cr_, priority);
+        graph = ConnectionGraph.addPotentialRoot(graph, cr_, intReal(ipriority));
       then
         (cache,env,ih,DAEUtil.emptyDae,csets,ci_state,graph);
 
-    // Connections.potentialRoot(cr,priority) - priority as Integer positinal argument
+    // Connections.potentialRoot(cr,priority =prio ) - priority as named argument
     case (cache,env,ih,mod,pre,csets,ci_state,SCode.EQ_NORETCALL(info=info,
               functionName = Absyn.CREF_QUAL("Connections", {}, Absyn.CREF_IDENT("potentialRoot", {})),
-              functionArgs = Absyn.FUNCTIONARGS({Absyn.CREF(cr),Absyn.INTEGER(ipriority)}, {})),initial_,impl,graph)
+              functionArgs = Absyn.FUNCTIONARGS({Absyn.CREF(cr)}, {Absyn.NAMEDARG("priority", Absyn.REAL(priority))})),initial_,impl,graph)
       equation 
-        (cache,SOME((DAE.CREF(cr_,t),_,_))) = Static.elabCref(cache,env, cr, false /* ??? */,false,pre,info);
-        (cache,cr_) = PrefixUtil.prefixCref(cache,env,ih,pre, cr_);
-        graph = ConnectionGraph.addPotentialRoot(graph, cr_, intReal(ipriority));
+        Error.addSourceMessage(Error.ARGUMENT_MUST_BE_INTEGER,
+          {"Second", "Connections.potentialRoot", ""}, info);
       then
         (cache,env,ih,DAEUtil.emptyDae,csets,ci_state,graph);
 

diff --git a/Compiler/FrontEnd/SCodeInst.mo b/Compiler/FrontEnd/SCodeInst.mo
@@ -134,9 +134,9 @@ algorithm
         cls = Typing.typeSections(cls, symtab);
 
         System.stopTimer();
-        print("\nclass " +& name +& "\n");
-        print(InstUtil.printClass(cls));
-        print("\nend " +& name +& "\n");
+        //print("\nclass " +& name +& "\n");
+        //print(InstUtil.printClass(cls));
+        //print("\nend " +& name +& "\n");
 
         //print("SCodeInst took " +& realString(System.getTimerIntervalTime()) +& " seconds.\n");