Changeset 13605


Ignore:
Timestamp:
Sep 26, 2019 1:32:03 PM (3 months ago)
Author:
tgutzmann
Message:

#5845 Merge branches/dev-tg-5845 to trunk

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Compiler/ModelicaFlatTree/src/jastadd/ConstantEvaluation/ConstantEvaluation.jrag

    r13541 r13605  
    49894989    public class VariableEvaluator {
    49904990        public static final VariableEvaluator instance = new VariableEvaluator(true);
    4991         private boolean externalEvaluationEnabled;
     4991        private final boolean externalEvaluationEnabled;
    49924992       
    49934993        public VariableEvaluator(boolean externalEvaluationEnabled) {
  • trunk/Compiler/ModelicaFlatTree/src/jastadd/ast/FlatModelica.ast

    r13357 r13605  
    699699 * LibTopPackagePath is the file path of the package file of the library that this external statement originated from.
    700700 */
    701 FExternalStmt : FStatement ::= FExternalLanguage [ReturnVar:CommonAccessExp] <Name> Arg:FExp* <LibTopPackagePath>;
     701FExternalStmt : FStatement ::= FExternalLanguage [ReturnVar:CommonAccessExp] <Name> Arg:FExp* <LibTopPackagePath> FAttribute*;
    702702
    703703/**
  • trunk/Compiler/ModelicaFrontEnd/src/jastadd/flattening/Flattening.jrag

    r13568 r13605  
    776776        stmt.setLibTopPackagePath(scd == null ? "" : scd.myLibRootPath().toAbsolutePath().toString()); // scd is null for builtins
    777777        stmt.setFExternalLanguage(hasFExternalLanguage() ?
    778                 (FExternalLanguage) getFExternalLanguage().fullCopy() :
     778                getFExternalLanguage().treeCopy() :
    779779                new FCExternalLanguage());
    780780        stmt.extractLibrary(this);
     
    830830                new Opt<CommonAccessExp>();
    831831               
    832         FExternalStmt stmt = new FExternalStmt(getFExternalLanguage().treeCopy(), ret, getName(), args, getLibTopPackagePath());
     832        FExternalStmt stmt = new FExternalStmt(getFExternalLanguage().treeCopy(), ret, getName(), args, getLibTopPackagePath(), new List<FAttribute>());
    833833        stmt.extractLibrary(this);
    834834        sl.add(stmt);
     
    33993399    /**
    34003400     * Class used during instantiation of equations and flattening of variables
    3401      * to delecate to different contributors. This class is subtyped for each
    3402      * contributor!
     3401     * to delegate to different contributors. This class is subtyped for each
     3402     * contributor.
    34033403     */
    34043404    public abstract class AttributeContributor {
  • trunk/Compiler/ModelicaFrontEnd/src/jastadd/source/PredefinedTypes.jrag

    r12975 r13605  
    4141     * Some differences apply however. The types of predefined types must
    4242     * be looked up only amongst the built-in types. Also, there are no
    43      * component accesses that needs to be looked up predefined types.
     43     * component accesses that need to be looked up for predefined types.
    4444     * The predefined types are defined in the (list) non terminal attribute
    4545     * PredefinedType.
  • trunk/Compiler/ModelicaFrontEnd/src/jastadd/util/Annotations.jrag

    r13294 r13605  
    9191    public class FClass            implements FAttributeListAnnotationNode.FAttributeList {}
    9292    public class FAttribute        implements FAttributeListAnnotationNode.FAttributeList {}
     93    public class FExternalStmt     implements FAttributeListAnnotationNode.FAttributeList {}
    9394   
    9495    eq FFunctionDecl.annotation(InstContext instContext)     = new FAttributeListAnnotationNode(this, instContext);
     
    9697    eq FAbstractEquation.annotation(InstContext instContext) = new FAttributeListAnnotationNode(this, instContext);
    9798    eq FClass.annotation(InstContext instContext)            = new FAttributeListAnnotationNode(this, instContext);
     99    eq FExternalStmt.annotation(InstContext instContext)     = new FAttributeListAnnotationNode(this, instContext);
    98100
    99101    eq InstExternal.annotation() = annotation(annotationExpEvaluator());
Note: See TracChangeset for help on using the changeset viewer.