Changeset 13486

Timestamp:

Sep 16, 2019 9:09:57 AM (3 months ago)

Author:

randersson

Message:

#5842 Merged trunk into branch

Location:

branches/dev-5842

Files:

• . (modified) (1 prop)
• Compiler/ModelicaFrontEnd/src/jastadd/flattening/Flattening.jrag (modified) (1 diff)
• Compiler/ModelicaFrontEnd/src/jastadd/instance/InstLookupComponents.jrag (modified) (2 diffs)
• Compiler/ModelicaFrontEnd/src/jastadd/instance/Types.jrag (modified) (1 diff)
• Compiler/ModelicaFrontEnd/src/jastadd/util/Util.jrag (modified) (2 diffs)

branches/dev-5842/Compiler/ModelicaFrontEnd/src/jastadd/flattening/Flattening.jrag

@@ -2158 +2158 @@
     syn boolean InstComponentDecl.isBuiltIn() = false;
     eq InstBuiltIn.isBuiltIn()                = true;
+    syn boolean InstBuiltInClassDecl.isBuiltIn()                = true;
+    syn boolean SrcBuiltInClassDecl.isBuiltIn()       = true;
+    syn boolean SrcClassDecl.isBuiltIn() = ((SourceRoot) root()).getProgram().getBuiltInTypes().hasChild(this)
+            || ((SourceRoot) root()).getProgram().getBuiltInFunctions().hasChild(this);
+    
+    public boolean List.hasChild(ASTNode node) {
+        for(ASTNode child : children) {
+            if(child == node) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
 
     public void InstComponentModification.collectAttributes(Flattener f,

branches/dev-5842/Compiler/ModelicaFrontEnd/src/jastadd/instance/InstLookupComponents.jrag

@@ -23 +23 @@
     interface InstCallable  extends    InstLookupResult.Item {}
 
+        /**
+         * Indicates that the target was not found.
+         */
+        public static <T extends Item> InstLookupResult<T> InstLookupResult.notFound() {
+            return (InstLookupResult<T>) NOT_FOUND;
+        }
+
+        /**
+         * Indicates that the target was found.
+         * 
+         * Includes the found class or component.
+         */
+        public static <T extends Item> InstLookupResult<T> InstLookupResult.found(T target) {
+            return new Found(target);
+        }
+
+        /**
+         * Indicates that the target was found, but not accessible due to a constrainedby clause.
+         * 
+         * Includes the declaration with the limiting constrainedby clause.
+         */
+        public static <T extends Item> InstLookupResult<T> InstLookupResult.constrained(T target, InstNode constr) {
+            return new Constrained(target, constr);
+        }
+
+        /**
+         * Indicates that the target was found, but not accessible due to a constrainedby clause.
+         * 
+         * Includes the declaration with the limiting constrainedby clause.
+         */
+        public static <T extends Item> InstLookupResult<T> InstLookupResult.constrained(InstLookupResult<T> res, InstNode constr) {
+            return new Constrained(res.target(), constr);
+        }
+        
+        /**
+         * Indicates that the target was found as an outer, target() returns the corresponding inner.
+         */
+        public static InstLookupResult<InstComponentDecl> InstLookupResult.outer(InstComponentDecl outer) {
+            return new Outer(outer);
+        }
+
+
     /**
      * Result class for lookups in the instance tree.
@@ -33 +75 @@
             public InstLookupResult<InstComponentDecl> memberInstComponent(String name);
             public InstCallable asCallable();
-        }
-        
-        /**
-         * Indicates that the target was not found.
-         */
-        public static <T extends Item> InstLookupResult<T> notFound() {
-            return (InstLookupResult<T>) NOT_FOUND;
-        }
-
-        /**
-         * Indicates that the target was found.
-         * 
-         * Includes the found class or component.
-         */
-        public static <T extends Item> InstLookupResult<T> found(T target) {
-            return new Found(target);
-        }
-
-        /**
-         * Indicates that the target was found, but not accessible due to a constrainedby clause.
-         * 
-         * Includes the declaration with the limiting constrainedby clause.
-         */
-        public static <T extends Item> InstLookupResult<T> constrained(T target, InstNode constr) {
-            return new Constrained(target, constr);
-        }
-
-        /**
-         * Indicates that the target was found, but not accessible due to a constrainedby clause.
-         * 
-         * Includes the declaration with the limiting constrainedby clause.
-         */
-        public static <T extends Item> InstLookupResult<T> constrained(InstLookupResult<T> res, InstNode constr) {
-            return new Constrained(res.target(), constr);
-        }
-        
-        /**
-         * Indicates that the target was found as an outer, target() returns the corresponding inner.
-         */
-        public static InstLookupResult<InstComponentDecl> outer(InstComponentDecl outer) {
-            return new Outer(outer);
-        }
-
+            public InstNode asInstNode();
+        }
+        
         /**
          * Did the lookup succeed?

branches/dev-5842/Compiler/ModelicaFrontEnd/src/jastadd/instance/Types.jrag

@@ -66 +66 @@
     eq InstPrimitive.isPrimitiveType()     = true;
     eq InstClassDecl.isPrimitiveType()     = isPrimitive();
+    
+    syn boolean SrcBaseNode.isPrimitiveType() = false;
+    eq SrcClassDecl.isPrimitiveType() = isPrimitive();
 
     public static String InstNode.subTypeMessage(String name, String message) {

branches/dev-5842/Compiler/ModelicaFrontEnd/src/jastadd/util/Util.jrag

@@ -1620 +1620 @@
     }
     
+    syn InstClassDecl InstNode.asInstClassDecl() {
+        throw new UnsupportedOperationException();
+    }
     syn InstClassDecl InstClassDecl.asInstClassDecl() = this;
     syn InstClassDecl InstPartialFunction.asInstClassDecl()  = unknownInstClassDecl();
@@ -1629 +1632 @@
     syn InstClassDecl InstPartialFunction.actualInstClassDecl() = myInstClass().actualInstClass();
     
-    syn InstNode InstClassDecl.asInstNode() = this;
-    syn InstNode InstPartialFunction.asInstNode()  = this;
+    syn InstNode InstNode.asInstNode() = this;
     
     syn InstCallable InstFunctionCall.myInstCallable() = getName().myInstCallable();