Skip to content

Commit

Permalink
Fix for #2448:
Browse files Browse the repository at this point in the history
- Handle redeclares in local short class definitions in the dependency analysis.


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17908 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
perost committed Oct 28, 2013
1 parent efeac38 commit c1d545a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Compiler/FrontEnd/NFSCodeDependency.mo
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ algorithm
SCode.Comment cmt;
list<SCode.Annotation> annl;
Option<SCode.ExternalDecl> ext_decl;
Env ty_env, env;
Env ty_env, env, nore_env;
Item ty_item;
SCode.Attributes attr;
list<Absyn.Path> paths;
Expand Down Expand Up @@ -555,7 +555,8 @@ algorithm
_, _ :: env, _, _)
equation
env = Util.if_(inInModifierScope, inEnv, env);
analyseTypeSpec(ty, env, inInfo);
nore_env = NFSCodeEnv.removeRedeclaresFromLocalScope(env);
analyseTypeSpec(ty, nore_env, inInfo);
(ty_item, _, ty_env) = NFSCodeLookup.lookupTypeSpec(ty, env, inInfo);
(ty_item, ty_env, _) = NFSCodeEnv.resolveRedeclaredItem(ty_item, ty_env);
ty_env = NFSCodeEnv.mergeItemEnv(ty_item, ty_env);
Expand Down

0 comments on commit c1d545a

Please sign in to comment.