Changeset d0f10d89 in OpenModelica


Ignore:
Timestamp:
2020-01-23T15:20:16+01:00 (4 years ago)
Author:
perost <perost86@…>
Branches:
Added-citation-metadata, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging
Children:
c7f16dff
Parents:
eaa9daba
git-author:
Per Östlund <perost86@…> (01/23/20 14:46:58)
git-committer:
perost <perost86@…> (01/23/20 15:20:16)
Message:

[NF] Improve scoping of redeclares.

Location:
OMCompiler/Compiler/NFFrontEnd
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • OMCompiler/Compiler/NFFrontEnd/NFInst.mo

    rc2927a9 rd0f10d89  
    13211321
    13221322  redeclaredNode := InstNode.replaceClass(new_cls, redeclareNode);
     1323  node_ty := InstNodeType.REDECLARED_CLASS(InstNode.parent(originalNode), InstNode.nodeType(originalNode));
     1324  redeclaredNode := InstNode.setNodeType(node_ty, redeclaredNode);
    13231325end redeclareClass;
    13241326

  • OMCompiler/Compiler/NFFrontEnd/NFInstNode.mo

    r23663803 rd0f10d89  
    9292    InstNode parent "The parent of the replaced component";
    9393  end REDECLARED_COMP;
     94
     95  record REDECLARED_CLASS
     96    InstNode parent;
     97    InstNodeType originalType;
     98  end REDECLARED_CLASS;
    9499end InstNodeType;
    95100
    … …  
    961966          else
    962967            accumScopes;
     968      case InstNodeType.REDECLARED_CLASS()
     969        then scopeList(parent(ty.parent), includeRoot, clsNode :: accumScopes);
    963970      else
    964971        algorithm
    … …  
    10291036          else
    10301037            accumPath;
     1038      case InstNodeType.REDECLARED_CLASS()
     1039        then scopePath2(ty.parent, includeRoot, Absyn.QUALIFIED(className(node), accumPath));
    10311040      else
    10321041        algorithm
Note: See TracChangeset for help on using the changeset viewer.