Ignore:
Timestamp:
Jul 9, 2019 3:08:30 PM (5 months ago)
Author:
tgutzmann
Message:

Merge from trunk

Location:
branches/dev-mj-1626
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-mj-1626

  • branches/dev-mj-1626/Compiler/ModelicaFrontEnd/src/jastadd/source/SimpleLookup.jrag

    r12995 r13095  
    299299    */
    300300    inh ResolvedAccess ASTNode.simpleLookupHelper(String name);
    301     eq SrcDot.getSrcAccess(int i).simpleLookupHelper(String name)             = simpleLookupDot(name, i);
     301    eq SrcDot.getSrcNamedAccess(int i).simpleLookupHelper(String name)        = simpleLookupDot(name, i);
    302302    eq SrcGlobalAccess.getSrcAccess().simpleLookupHelper(String name)         = simpleLookupGlobalScope(name);
    303303    eq SrcArrayAccess.getSrcArraySubscripts().simpleLookupHelper(String name) = simpleLookupBypassDot(name);
     
    501501            return simpleLookupHelper(name);
    502502        }
    503         ResolvedAccess access = getSrcAccess(i - 1).resolveAccess();
     503        ResolvedAccess access = getSrcNamedAccess(i - 1).resolveAccess();
    504504        return access.simpleLookupMemberScope(name).fromContext(access.qualifiedName(), access.isProtected());
    505505    }
     
    507507    inh ResolvedAccess SrcAccess.simpleLookupBypassDot(String name);
    508508    eq BaseNode.getChild(int i).simpleLookupBypassDot(String name) = getChild(i).simpleLookupHelper(name);
    509     eq SrcDot.getSrcAccess().simpleLookupBypassDot(String name)    = simpleLookupHelper(name);
     509    eq SrcDot.getSrcNamedAccess().simpleLookupBypassDot(String name)    = simpleLookupHelper(name);
    510510
    511511
Note: See TracChangeset for help on using the changeset viewer.