Changeset 13605

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:

• . (modified) (1 prop)
• Compiler/ModelicaFlatTree/src/jastadd/ConstantEvaluation/ConstantEvaluation.jrag (modified) (1 diff)
• Compiler/ModelicaFlatTree/src/jastadd/ast/FlatModelica.ast (modified) (1 diff)
• Compiler/ModelicaFrontEnd/src/jastadd/flattening/Flattening.jrag (modified) (3 diffs)
• Compiler/ModelicaFrontEnd/src/jastadd/source/PredefinedTypes.jrag (modified) (1 diff)
• Compiler/ModelicaFrontEnd/src/jastadd/util/Annotations.jrag (modified) (2 diffs)

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

@@ -4989 +4989 @@
     public class VariableEvaluator {
         public static final VariableEvaluator instance = new VariableEvaluator(true);
-        private boolean externalEvaluationEnabled;
+        private final boolean externalEvaluationEnabled;
         
         public VariableEvaluator(boolean externalEvaluationEnabled) {

trunk/Compiler/ModelicaFlatTree/src/jastadd/ast/FlatModelica.ast

@@ -699 +699 @@
  * LibTopPackagePath is the file path of the package file of the library that this external statement originated from.
  */
-FExternalStmt : FStatement ::= FExternalLanguage [ReturnVar:CommonAccessExp] <Name> Arg:FExp* <LibTopPackagePath>;
+FExternalStmt : FStatement ::= FExternalLanguage [ReturnVar:CommonAccessExp] <Name> Arg:FExp* <LibTopPackagePath> FAttribute*;
 
 /**

trunk/Compiler/ModelicaFrontEnd/src/jastadd/flattening/Flattening.jrag

@@ -776 +776 @@
         stmt.setLibTopPackagePath(scd == null ? "" : scd.myLibRootPath().toAbsolutePath().toString()); // scd is null for builtins
         stmt.setFExternalLanguage(hasFExternalLanguage() ? 
-                (FExternalLanguage) getFExternalLanguage().fullCopy() : 
+                getFExternalLanguage().treeCopy() : 
                 new FCExternalLanguage());
         stmt.extractLibrary(this);
@@ -830 +830 @@
                 new Opt<CommonAccessExp>();
                 
-        FExternalStmt stmt = new FExternalStmt(getFExternalLanguage().treeCopy(), ret, getName(), args, getLibTopPackagePath());
+        FExternalStmt stmt = new FExternalStmt(getFExternalLanguage().treeCopy(), ret, getName(), args, getLibTopPackagePath(), new List<FAttribute>());
         stmt.extractLibrary(this);
         sl.add(stmt);
@@ -3399 +3399 @@
     /**
      * Class used during instantiation of equations and flattening of variables
-     * to delecate to different contributors. This class is subtyped for each
-     * contributor!
+     * to delegate to different contributors. This class is subtyped for each
+     * contributor.
      */
     public abstract class AttributeContributor {

trunk/Compiler/ModelicaFrontEnd/src/jastadd/source/PredefinedTypes.jrag

@@ -41 +41 @@
      * Some differences apply however. The types of predefined types must
      * be looked up only amongst the built-in types. Also, there are no 
-     * component accesses that needs to be looked up predefined types.
+     * component accesses that need to be looked up for predefined types.
      * The predefined types are defined in the (list) non terminal attribute
      * PredefinedType.

trunk/Compiler/ModelicaFrontEnd/src/jastadd/util/Annotations.jrag

@@ -91 +91 @@
     public class FClass            implements FAttributeListAnnotationNode.FAttributeList {}
     public class FAttribute        implements FAttributeListAnnotationNode.FAttributeList {}
+    public class FExternalStmt     implements FAttributeListAnnotationNode.FAttributeList {}
     
     eq FFunctionDecl.annotation(InstContext instContext)     = new FAttributeListAnnotationNode(this, instContext);
@@ -96 +97 @@
     eq FAbstractEquation.annotation(InstContext instContext) = new FAttributeListAnnotationNode(this, instContext);
     eq FClass.annotation(InstContext instContext)            = new FAttributeListAnnotationNode(this, instContext);
+    eq FExternalStmt.annotation(InstContext instContext)     = new FAttributeListAnnotationNode(this, instContext);
 
     eq InstExternal.annotation() = annotation(annotationExpEvaluator());