Changeset c5769daa in OpenModelica
- Timestamp:
- 2012-11-20T14:38:52+01:00 (11 years ago)
- Branches:
- Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, master, omlib-staging
- Children:
- fa441d1
- Parents:
- 2b8bc0b5
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Compiler/FrontEnd/Static.mo
r4de0aa5 rc5769daa 7161 7161 7162 7162 // For unrolling errors if an overloaded 'constructor' matches later. 7163 //ErrorExt.setCheckpoint("RecordConstructor");7163 ErrorExt.setCheckpoint("RecordConstructor"); 7164 7164 7165 7165 (cache, … … 7222 7222 expProps = Util.if_(Util.isSuccess(status),SOME((call_exp,prop_1)),NONE()); 7223 7223 7224 //ErrorExt.rollBack("RecordConstructor");7224 ErrorExt.rollBack("RecordConstructor"); 7225 7225 7226 7226 then … … 7249 7249 (cache,expProps) = elabCallArgs3(cache,env,typelist,fn_1,args,nargs,impl,st,pre,info); 7250 7250 7251 //ErrorExt.rollBack("RecordConstructor");7251 ErrorExt.rollBack("RecordConstructor"); 7252 7252 7253 7253 then … … 7257 7257 case (cache,env,fn,args,nargs,impl,_,st,pre,_) /* Metamodelica extension, added by simbj */ 7258 7258 equation 7259 7260 ErrorExt.delCheckpoint("RecordConstructor"); 7261 7259 7262 true = Config.acceptMetaModelicaGrammar(); 7260 // Util.if_(ErrorExt.isTopCheckpoint("RecordConstructor"), ErrorExt.delCheckpoint("RecordConstructor"),{});7261 7263 false = Util.getStatefulBoolean(stopElab); 7262 7264 (cache,t as DAE.T_METARECORD(utPath=utPath,index=index,fields=vars,source={fqPath}),env_1) = Lookup.lookupType(cache, env, fn, NONE()); … … 7270 7272 equation 7271 7273 7272 // ErrorExt.delCheckpoint("RecordConstructor"); 7273 // ErrorExt.setCheckpoint("elabCallArgs2FunctionLookup"); 7274 ErrorExt.setCheckpoint("elabCallArgs2FunctionLookup"); 7274 7275 7275 7276 false = Util.getStatefulBoolean(stopElab); … … 7285 7286 (cache,expProps) = elabCallArgs3(cache,env,typelist,fn,args,nargs,impl,st,pre,info); 7286 7287 7287 //ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup");7288 ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup"); 7288 7289 7289 7290 then … … 7301 7302 Error.addSourceMessage(Error.NO_MATCHING_FUNCTION_FOUND, {fn_str,pre_str,types_str}, info); 7302 7303 7303 //ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup");7304 ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup"); 7304 7305 then 7305 7306 (cache,NONE()); … … 7313 7314 Error.addSourceMessage(Error.LOOKUP_FUNCTION_GOT_CLASS, {fn_str,s}, info); 7314 7315 7315 //ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup");7316 ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup"); 7316 7317 then 7317 7318 (cache,NONE()); … … 7327 7328 Error.addSourceMessage(Error.NO_MATCHING_FUNCTION_FOUND, {fn_str,pre_str,types_str}, info); 7328 7329 7329 //ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup");7330 ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup"); 7330 7331 then 7331 7332 (cache,NONE()); … … 7340 7341 7341 7342 (cache,SOME((daeexp as DAE.CREF(daecref,tp),prop,_))) = elabCref(cache,env, cref, impl,true,pre,info); 7342 //ErrorExt.rollBack("elabCallArgs2FunctionLookup");7343 ErrorExt.rollBack("elabCallArgs2FunctionLookup"); 7343 7344 7344 7345 daeexp = DAE.CREF(DAE.OPTIMICA_ATTR_INST_CREF(daecref,name), tp); … … 7355 7356 Error.addSourceMessage(Error.LOOKUP_ERROR, {fn_str,scope}, info); // No need to add prefix because only depends on scope? 7356 7357 7357 //ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup");7358 ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup"); 7358 7359 then 7359 7360 (cache,NONE()); … … 7367 7368 Error.addSourceMessage(Error.NO_MATCHING_FUNCTION_FOUND_NO_CANDIDATE, {fn_str}, info); 7368 7369 7369 //ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup");7370 ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup"); 7370 7371 then 7371 7372 (cache,NONE()); … … 7373 7374 case (cache,env,fn,args,nargs,impl,_,st,pre,_) 7374 7375 equation 7375 //ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup");7376 ErrorExt.delCheckpoint("elabCallArgs2FunctionLookup"); 7376 7377 true = Flags.isSet(Flags.FAILTRACE); 7377 7378 Debug.fprintln(Flags.FAILTRACE, "- Static.elabCallArgs failed on: " +& Absyn.pathString(fn) +& " in env: " +& Env.printEnvPathStr(env));
Note: See TracChangeset
for help on using the changeset viewer.