Changeset 14108


Ignore:
Timestamp:
Nov 18, 2019 1:03:59 PM (3 weeks ago)
Author:
molsson
Message:

Merged revision(s) 13982-13984 from branches/dev-mo-2530:
#5843 Added isAttribute method to source components.
........
#5843 Added InstClassDecl.isFullClassDecl().
........
#5843 Added SrcAccess.isFirstAccess().
........

Location:
branches/dev-mo-2530-merge
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-mo-2530-merge

  • branches/dev-mo-2530-merge/Compiler/ModelicaFrontEnd/src/jastadd/flattening/Flattening.jrag

    r13948 r14108  
    21702170    syn boolean InstBuiltInClassDecl.isBuiltIn() = true;
    21712171    syn boolean SrcBuiltInClassDecl.isBuiltIn()  = true;
    2172     inh boolean SrcClassDecl.isBuiltIn();
    2173     eq Root.getChild().isBuiltIn() = false;
    2174     eq Program.getBuiltInType().isBuiltIn() = true;
    2175     eq Program.getBuiltInFunction().isBuiltIn() = true;
    21762172   
    21772173    syn SourceRoot Root.asSourceRoot() {
  • branches/dev-mo-2530-merge/Compiler/ModelicaFrontEnd/src/jastadd/instance/InstTypeAnalysis.jrag

    r13103 r14108  
    465465    syn boolean SrcElement.isFullClassDecl() = false;
    466466    eq SrcFullClassDecl.isFullClassDecl()    = true;
     467   
     468    syn boolean InstClassDecl.isFullClassDecl() = getSrcClassDecl().isFullClassDecl();
    467469
    468470    syn SrcFullClassDecl SrcElement.asFullClassDecl() {
  • branches/dev-mo-2530-merge/Compiler/ModelicaFrontEnd/src/jastadd/source/PredefinedTypes.jrag

    r13605 r14108  
    3030    eq SourceRoot.getProgram().getPredefinedType() = computePredefinedType();
    3131    eq Root.getChild().getPredefinedType() = null;
     32   
     33    inh boolean SrcComponentDecl.isAttribute();
     34    inh boolean SrcComponentClause.isAttribute();
     35    eq SourceRoot.getChild().isAttribute()       = false;
     36    eq Program.getPredefinedType().isAttribute() = true;
    3237
    3338   
  • branches/dev-mo-2530-merge/Compiler/ModelicaFrontEnd/src/jastadd/util/Util.jrag

    r14019 r14108  
    959959    eq InstGlobalAccess.getLastInstAccess()       = getInstAccess().getLastInstAccess();
    960960   
     961   
     962    syn boolean SrcAccess.isFirstAccess() = this == getTopAccess().getFirstAccess();
     963   
    961964    /**
    962965     * Access method for the first SrcAccess of a qualified or
     
    10361039   
    10371040    inh SrcAccess SrcAccess.retrieveTopAccess(SrcAccess pre);
    1038     eq ASTNode.getChild().retrieveTopAccess(SrcAccess pre)      = pre;
     1041    eq BaseNode.getChild().retrieveTopAccess(SrcAccess pre)        = pre;
    10391042    eq SrcDot.getChild().retrieveTopAccess(SrcAccess pre)          = retrieveTopAccess(this);
    10401043    eq SrcGlobalAccess.getChild().retrieveTopAccess(SrcAccess pre) = retrieveTopAccess(this);
Note: See TracChangeset for help on using the changeset viewer.