@@ -266,6 +266,7 @@ algorithm
266266 case (true, true)
267267 equation
268268 print("Evaluating: " + printIstmtStr(GlobalScript.ISTMTS({s}, semicolon)) + "\n");
269+ System.fflush();
269270 then
270271 ();
271272
@@ -276,12 +277,14 @@ algorithm
276277 equation
277278 System.realtimeTick(ClockIndexes.RT_CLOCK_SHOW_STATEMENT);
278279 print("Evaluating: > " + printIstmtStr(GlobalScript.ISTMTS({s}, semicolon)) + "\n");
280+ System.fflush();
279281 then
280282 ();
281283
282284 case (false, false)
283285 equation
284286 print("Evaluated: < " + realString(System.realtimeTock(ClockIndexes.RT_CLOCK_SHOW_STATEMENT)) + " / " + printIstmtStr(GlobalScript.ISTMTS({s}, semicolon)) + "\n");
287+ System.fflush();
285288 then
286289 ();
287290
@@ -9340,23 +9343,44 @@ algorithm
93409343 ClassInf.State ci_state;
93419344 SCode.Encapsulated encflag;
93429345 SCode.Restriction restr;
9343- /* First try without instantiating, if class is in parents */
9346+
9347+ // first try without instantiating, if class is in parents
93449348 case ((SCode.CLASS()),cdef,env)
93459349 equation
9350+ ErrorExt.setCheckpoint("getInheritedClassesHelper");
93469351 lst = getBaseClasses(cdef, env);
9352+ ErrorExt.rollBack("getInheritedClassesHelper");
93479353 then
93489354 lst;
9349- /* If that fails, instantiate, which takes more time */
9355+
9356+ // clear any messages that may have been added
9357+ case ((SCode.CLASS()),cdef,env)
9358+ equation
9359+ ErrorExt.rollBack("getInheritedClassesHelper");
9360+ then
9361+ fail();
9362+
9363+ // if that fails, instantiate, which takes more time
93509364 case ((c as SCode.CLASS(name = id,encapsulatedPrefix = encflag,restriction = restr)),cdef,env)
93519365 equation
9366+ ErrorExt.setCheckpoint("getInheritedClassesHelper");
93529367 env2 = FGraph.openScope(env, encflag, id, FGraph.restrictionToScopeType(restr));
93539368 ci_state = ClassInf.start(restr, FGraph.getGraphName(env2));
93549369 (_,env_2,_,_,_) =
93559370 Inst.partialInstClassIn(FCore.emptyCache(),env2,InnerOuter.emptyInstHierarchy,
93569371 DAE.NOMOD(), Prefix.NOPRE(), ci_state, c, SCode.PUBLIC(), {}, 0);
93579372 lst = getBaseClasses(cdef, env_2);
9373+ ErrorExt.rollBack("getInheritedClassesHelper");
93589374 then
93599375 lst;
9376+
9377+ // clear any messages that may have been added
9378+ case ((SCode.CLASS()),cdef,env)
9379+ equation
9380+ ErrorExt.rollBack("getInheritedClassesHelper");
9381+ then
9382+ fail();
9383+
93609384 end matchcontinue;
93619385end getInheritedClassesHelper;
93629386
@@ -15620,7 +15644,7 @@ algorithm
1562015644 end match;
1562115645end deleteProtectedList;
1562215646
15623- protected function getPublicList "
15647+ public function getPublicList "
1562415648 This function takes a ClassPart List and returns an appended list of
1562515649 all public lists.
1562615650"
@@ -15648,7 +15672,7 @@ algorithm
1564815672 end match;
1564915673end getPublicList;
1565015674
15651- protected function getProtectedList "
15675+ public function getProtectedList "
1565215676 This function takes a ClassPart List and returns an appended list of
1565315677 all protected lists."
1565415678 input list<Absyn.ClassPart> inAbsynClassPartLst;
0 commit comments