@@ -1737,7 +1737,7 @@ algorithm
17371737 (cache,env,ih,store,dae,csets_1,ci_state,tys,bc,oDA,equalityConstraint,graph) = outputs;
17381738 /*
17391739 Debug.fprintln("cache", "IIII->got from instCache: " +& Absyn.pathString(fullEnvPathPlusClass) +&
1740- "\n\tpre: " +& PrefixUtil.printPrefixStr(pre) +& ". " +& className +&
1740+ "\n\tpre: " +& PrefixUtil.printPrefixStr(pre) +& " class: " +& className +&
17411741 "\n\tmods: " +& Mod.printModStr(mods) +&
17421742 "\n\tenv: " +& Env.printEnvPathStr(inEnv) +&
17431743 "\n\tsingle cref: " +& Exp.printComponentRefOptStr(instSingleCref) +&
@@ -1746,7 +1746,7 @@ algorithm
17461746 */
17471747 then
17481748 (inCache,env,ih,store,dae,csets_1,ci_state,tys,bc,oDA,equalityConstraint,graph);
1749-
1749+
17501750 /* call the function and then add it in the cache */
17511751 case (cache,env,ih,store,mods,pre,csets,ci_state,c as SCode.CLASS(restriction=r, name=className),prot,inst_dims,impl,graph,instSingleCref)
17521752 equation
@@ -1755,7 +1755,7 @@ algorithm
17551755
17561756 envPathOpt = Env.getEnvPath(inEnv);
17571757 fullEnvPathPlusClass = Absyn.selectPathsOpt(envPathOpt, Absyn.IDENT(className));
1758-
1758+
17591759 inputs = (inCache,inEnv,inIH,store,inMod,inPrefix,inSets,inState,inClass,isProtected,inInstDims,implicitInstantiation,inGraph,instSingleCref);
17601760 outputs = (cache,env,ih,store,dae,csets,ci_state,tys,bc,oDA,equalityConstraint,graph);
17611761
@@ -1767,15 +1767,15 @@ algorithm
17671767 SOME(FUNC_partialInstClassIn( // result for partial instantiation
17681768 (inCache,inEnv,inIH,inMod,inPrefix,inSets,inState,inClass,isProtected,inInstDims),
17691769 (cache,env,ih,ci_state)))*/ NONE());
1770- /*
1770+ /*
17711771 Debug.fprintln("cache", "IIII->added to instCache: " +& Absyn.pathString(fullEnvPathPlusClass) +&
1772- "\n\tpre: " +& PrefixUtil.printPrefixStr(pre) +& ". " +& className +&
1772+ "\n\tpre: " +& PrefixUtil.printPrefixStr(pre) +& " class: " +& className +&
17731773 "\n\tmods: " +& Mod.printModStr(mods) +&
17741774 "\n\tenv: " +& Env.printEnvPathStr(inEnv) +&
17751775 "\n\tsingle cref: " +& Exp.printComponentRefOptStr(instSingleCref) +&
17761776 "\n\tdims: [" +& Util.stringDelimitList(Util.listMap1(inst_dims, DAEDump.unparseDimensions, true), ", ") +& "]" +&
17771777 "\n\tdae:\n" +& DAEDump.dump2str(dae));
1778- */
1778+ */
17791779 //checkModelBalancingFilterByRestriction(r, envPathOpt, dae);
17801780 then
17811781 (cache,env,ih,store,dae,csets,ci_state,tys,bc,oDA,equalityConstraint,graph);
@@ -1799,7 +1799,9 @@ protected function prefixEqualUnlessEnum
17991799 input SCode.Class cls;
18001800algorithm
18011801 _ := matchcontinue(pre1, pre2, cls)
1802- case (_, _, SCode.CLASS(restriction = SCode.R_ENUMERATION))
1802+ case (_, _, SCode.CLASS(restriction = SCode.R_ENUMERATION()))
1803+ then ();
1804+ case (_, _, SCode.CLASS(restriction = SCode.R_PREDEFINED_ENUMERATION()))
18031805 then ();
18041806 case (_, _, _)
18051807 equation
@@ -14500,8 +14502,8 @@ algorithm
1450014502 case (SCode.R_RECORD(), _, _) then ();
1450114503 case (SCode.R_PACKAGE(), _, _) then ();
1450214504 case (SCode.R_ENUMERATION(), _, _) then ();
14503- case (SCode.R_PREDEFINED_BOOL (), _, _) then ();
14504- case (SCode.R_PREDEFINED_INT (), _, _) then ();
14505+ case (SCode.R_PREDEFINED_BOOLEAN (), _, _) then ();
14506+ case (SCode.R_PREDEFINED_INTEGER (), _, _) then ();
1450514507 case (SCode.R_PREDEFINED_REAL(), _, _) then ();
1450614508 case (SCode.R_PREDEFINED_STRING(), _, _) then ();
1450714509 // check anything else
0 commit comments