[NF] Change NFComponent to a uniontype.

perost · perost · commit 1a5dd13c250e · 2020-05-19T16:01:05.000+02:00
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFBuiltin.mo b/OMCompiler/Compiler/NFFrontEnd/NFBuiltin.mo
@@ -47,7 +47,7 @@ import SCode;
 import NFBinding;
 import NFClass.Class;
 import NFClassTree.ClassTree;
-import NFComponent.Component;
+import Component = NFComponent;
 import Expression = NFExpression;
 import NFInstNode.InstNode;
 import NFInstNode.InstNodeType;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFBuiltinCall.mo b/OMCompiler/Compiler/NFFrontEnd/NFBuiltinCall.mo
@@ -62,7 +62,7 @@ protected
   import Util;
   import ExpandExp = NFExpandExp;
   import Operator = NFOperator;
-  import NFComponent.Component;
+  import Component = NFComponent;
   import NFPrefixes.ConnectorType;
 
 public
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFBuiltinFuncs.mo b/OMCompiler/Compiler/NFFrontEnd/NFBuiltinFuncs.mo
@@ -40,7 +40,7 @@ import NFFunction.FuncType;
 import NFInstNode.CachedData;
 import NFInstNode.InstNode;
 import NFInstNode.InstNodeType;
-import NFComponent.Component;
+import Component = NFComponent;
 import Type = NFType;
 import Expression = NFExpression;
 import Absyn;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFCall.mo b/OMCompiler/Compiler/NFFrontEnd/NFCall.mo
@@ -56,7 +56,7 @@ import Lookup = NFLookup;
 import MetaModelica.Dangerous.listReverseInPlace;
 import NFBinding.Binding;
 import NFClass.Class;
-import NFComponent.Component;
+import Component = NFComponent;
 import NFFunction.Function;
 import NFFunction.FunctionMatchKind;
 import NFFunction.MatchedFunction;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFCeval.mo b/OMCompiler/Compiler/NFFrontEnd/NFCeval.mo
@@ -34,7 +34,7 @@ encapsulated package NFCeval
 import NFBinding.Binding;
 import ComponentRef = NFComponentRef;
 import Error;
-import NFComponent.Component;
+import Component = NFComponent;
 import Expression = NFExpression;
 import NFInstNode.InstNode;
 import Operator = NFOperator;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFClass.mo b/OMCompiler/Compiler/NFFrontEnd/NFClass.mo
@@ -36,7 +36,7 @@ import NFModifier.Modifier;
 import NFStatement.Statement;
 import SCode.Element;
 import Type = NFType;
-import NFComponent.Component;
+import Component = NFComponent;
 import Dimension = NFDimension;
 import NFClassTree.ClassTree;
 import NFSections.Sections;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFClassTree.mo b/OMCompiler/Compiler/NFFrontEnd/NFClassTree.mo
@@ -44,7 +44,7 @@ protected
   import Error;
   import MetaModelica.Dangerous.*;
   import NFClass.Class;
-  import NFComponent.Component;
+  import Component = NFComponent;
   import Inst = NFInst;
   import List;
   import Lookup = NFLookup;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFComponent.mo b/OMCompiler/Compiler/NFFrontEnd/NFComponent.mo
@@ -29,7 +29,7 @@
  *
  */
 
-encapsulated package NFComponent
+encapsulated uniontype NFComponent
 
 import DAE;
 import NFBinding.Binding;
@@ -49,71 +49,70 @@ import List;
 import Prefixes = NFPrefixes;
 import SCodeUtil;
 import Restriction = NFRestriction;
+import Component = NFComponent;
 
 public
-constant Component.Attributes DEFAULT_ATTR =
-  Component.Attributes.ATTRIBUTES(
-    ConnectorType.NON_CONNECTOR,
-    Parallelism.NON_PARALLEL,
-    Variability.CONTINUOUS,
-    Direction.NONE,
-    InnerOuter.NOT_INNER_OUTER,
-    false,
-    false,
-    Replaceable.NOT_REPLACEABLE()
-  );
-constant Component.Attributes INPUT_ATTR =
-  Component.Attributes.ATTRIBUTES(
-    ConnectorType.NON_CONNECTOR,
-    Parallelism.NON_PARALLEL,
-    Variability.CONTINUOUS,
-    Direction.INPUT,
-    InnerOuter.NOT_INNER_OUTER,
-    false,
-    false,
-    Replaceable.NOT_REPLACEABLE()
-  );
-
-constant Component.Attributes OUTPUT_ATTR =
-  Component.Attributes.ATTRIBUTES(
-    ConnectorType.NON_CONNECTOR,
-    Parallelism.NON_PARALLEL,
-    Variability.CONTINUOUS,
-    Direction.OUTPUT,
-    InnerOuter.NOT_INNER_OUTER,
-    false,
-    false,
-    Replaceable.NOT_REPLACEABLE()
-  );
-
-constant Component.Attributes CONSTANT_ATTR =
-  Component.Attributes.ATTRIBUTES(
-    ConnectorType.NON_CONNECTOR,
-    Parallelism.NON_PARALLEL,
-    Variability.CONSTANT,
-    Direction.NONE,
-    InnerOuter.NOT_INNER_OUTER,
-    false,
-    false,
-    Replaceable.NOT_REPLACEABLE()
-  );
-
-constant Component.Attributes IMPL_DISCRETE_ATTR =
-  Component.Attributes.ATTRIBUTES(
-    ConnectorType.NON_CONNECTOR,
-    Parallelism.NON_PARALLEL,
-    Variability.IMPLICITLY_DISCRETE,
-    Direction.NONE,
-    InnerOuter.NOT_INNER_OUTER,
-    false,
-    false,
-    Replaceable.NOT_REPLACEABLE()
-  );
-
-uniontype Component
-  uniontype Attributes
-    import SCode;
+  constant Attributes DEFAULT_ATTR =
+    Attributes.ATTRIBUTES(
+      ConnectorType.NON_CONNECTOR,
+      Parallelism.NON_PARALLEL,
+      Variability.CONTINUOUS,
+      Direction.NONE,
+      InnerOuter.NOT_INNER_OUTER,
+      false,
+      false,
+      Replaceable.NOT_REPLACEABLE()
+    );
+
+  constant Attributes INPUT_ATTR =
+    Attributes.ATTRIBUTES(
+      ConnectorType.NON_CONNECTOR,
+      Parallelism.NON_PARALLEL,
+      Variability.CONTINUOUS,
+      Direction.INPUT,
+      InnerOuter.NOT_INNER_OUTER,
+      false,
+      false,
+      Replaceable.NOT_REPLACEABLE()
+    );
+
+  constant Attributes OUTPUT_ATTR =
+    Attributes.ATTRIBUTES(
+      ConnectorType.NON_CONNECTOR,
+      Parallelism.NON_PARALLEL,
+      Variability.CONTINUOUS,
+      Direction.OUTPUT,
+      InnerOuter.NOT_INNER_OUTER,
+      false,
+      false,
+      Replaceable.NOT_REPLACEABLE()
+    );
+
+  constant Attributes CONSTANT_ATTR =
+    Attributes.ATTRIBUTES(
+      ConnectorType.NON_CONNECTOR,
+      Parallelism.NON_PARALLEL,
+      Variability.CONSTANT,
+      Direction.NONE,
+      InnerOuter.NOT_INNER_OUTER,
+      false,
+      false,
+      Replaceable.NOT_REPLACEABLE()
+    );
+
+  constant Attributes IMPL_DISCRETE_ATTR =
+    Attributes.ATTRIBUTES(
+      ConnectorType.NON_CONNECTOR,
+      Parallelism.NON_PARALLEL,
+      Variability.IMPLICITLY_DISCRETE,
+      Direction.NONE,
+      InnerOuter.NOT_INNER_OUTER,
+      false,
+      false,
+      Replaceable.NOT_REPLACEABLE()
+    );
 
+  uniontype Attributes
     record ATTRIBUTES
       // adrpo: keep the order in DAE.ATTR
       ConnectorType.Type connectorType;
@@ -1002,7 +1001,6 @@ uniontype Component
       else false;
     end match;
   end isTypeAttribute;
-end Component;
 
 annotation(__OpenModelica_Interface="frontend");
 end NFComponent;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFComponentRef.mo b/OMCompiler/Compiler/NFFrontEnd/NFComponentRef.mo
@@ -31,7 +31,7 @@
 
 encapsulated uniontype NFComponentRef
 protected
-  import NFComponent.Component;
+  import Component = NFComponent;
   import Absyn;
   import DAE;
   import Subscript = NFSubscript;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFConnectEquations.mo b/OMCompiler/Compiler/NFFrontEnd/NFConnectEquations.mo
@@ -66,7 +66,7 @@ import BuiltinCall = NFBuiltinCall;
 import ComplexType = NFComplexType;
 import ExpandExp = NFExpandExp;
 import Prefixes = NFPrefixes;
-import NFComponent.Component;
+import Component = NFComponent;
 import Ceval = NFCeval;
 import MetaModelica.Dangerous.listReverseInPlace;
 import SimplifyExp = NFSimplifyExp;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFConnections.mo b/OMCompiler/Compiler/NFFrontEnd/NFConnections.mo
@@ -43,7 +43,7 @@ protected
   import Expression = NFExpression;
   import Flags;
   import MetaModelica.Dangerous.listReverseInPlace;
-  import NFComponent.Component;
+  import Component = NFComponent;
   import NFInstNode.InstNode;
   import Type = NFType;
 
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFConnector.mo b/OMCompiler/Compiler/NFFrontEnd/NFConnector.mo
@@ -44,7 +44,7 @@ protected
   import NFInstNode.InstNode;
   import ElementSource;
   import Flags;
-  import NFComponent.Component;
+  import Component = NFComponent;
   import NFClassTree.ClassTree;
   import NFClass.Class;
   import Restriction = NFRestriction;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFConvertDAE.mo b/OMCompiler/Compiler/NFFrontEnd/NFConvertDAE.mo
@@ -54,7 +54,7 @@ import Function = NFFunction.Function;
 import MetaModelica.Dangerous.listReverseInPlace;
 import NFClass.Class;
 import NFClassTree.ClassTree;
-import NFComponent.Component;
+import Component = NFComponent;
 import NFModifier.Modifier;
 import NFPrefixes.ConnectorType;
 import NFPrefixes.Direction;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFEquation.mo b/OMCompiler/Compiler/NFFrontEnd/NFEquation.mo
@@ -43,7 +43,6 @@ protected
   import Equation = NFEquation;
   import Error;
   import IOStream;
-  import NFComponent.Component;
   import Util;
 
 public
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFEvalFunction.mo b/OMCompiler/Compiler/NFFrontEnd/NFEvalFunction.mo
@@ -39,7 +39,7 @@ import Sections = NFSections;
 import Statement = NFStatement;
 import ComponentRef = NFComponentRef;
 import NFBinding.Binding;
-import NFComponent.Component;
+import Component = NFComponent;
 import Type = NFType;
 import Dimension = NFDimension;
 import NFClassTree.ClassTree;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFExpandableConnectors.mo b/OMCompiler/Compiler/NFFrontEnd/NFExpandableConnectors.mo
@@ -51,7 +51,7 @@ import Expression = NFExpression;
 import MetaModelica.Dangerous.listReverseInPlace;
 import NFClass.Class;
 import NFClassTree.ClassTree;
-import NFComponent.Component;
+import Component = NFComponent;
 import NFInstNode.InstNode;
 import NFPrefixes.ConnectorType;
 import NFPrefixes.Visibility;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFExpression.mo b/OMCompiler/Compiler/NFFrontEnd/NFExpression.mo
@@ -63,7 +63,6 @@ public
   import ComponentRef = NFComponentRef;
   import Call = NFCall;
   import NFBinding.Binding;
-  import NFComponent.Component;
   import NFClassTree.ClassTree;
   import NFClass.Class;
   import NFComponentRef.Origin;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFFlatModel.mo b/OMCompiler/Compiler/NFFrontEnd/NFFlatModel.mo
@@ -47,7 +47,7 @@ protected
   import NFSubscript.Subscript;
   import NFClass.Class;
   import NFClassTree.ClassTree;
-  import NFComponent.Component;
+  import Component = NFComponent;
   import NFComponentRef.ComponentRef;
   import MetaModelica.Dangerous.listReverseInPlace;
 
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo b/OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo
@@ -59,7 +59,7 @@ import List;
 import Call = NFCall;
 import NFClass.Class;
 import NFClassTree.ClassTree;
-import NFComponent.Component;
+import Component = NFComponent;
 import NFModifier.Modifier;
 import Sections = NFSections;
 import NFOCConnectionGraph;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFFunction.mo b/OMCompiler/Compiler/NFFrontEnd/NFFunction.mo
@@ -51,8 +51,8 @@ import DAE;
 import Error;
 import InstUtil;
 import NFClass.Class;
-import NFComponent.Component;
-import NFComponent.Component.Attributes;
+import Component = NFComponent;
+import NFComponent.Attributes;
 import Typing = NFTyping;
 import TypeCheck = NFTypeCheck;
 import Util;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFInst.mo b/OMCompiler/Compiler/NFFrontEnd/NFInst.mo
@@ -44,7 +44,7 @@ import DAE;
 
 import Builtin = NFBuiltin;
 import NFBinding.Binding;
-import NFComponent.Component;
+import Component = NFComponent;
 import ComponentRef = NFComponentRef;
 import Dimension = NFDimension;
 import Expression = NFExpression;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFInstNode.mo b/OMCompiler/Compiler/NFFrontEnd/NFInstNode.mo
@@ -31,7 +31,7 @@
 
 encapsulated package NFInstNode
 
-import NFComponent.Component;
+import Component = NFComponent;
 import NFClass.Class;
 import SCode;
 import Absyn;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFLookup.mo b/OMCompiler/Compiler/NFFrontEnd/NFLookup.mo
@@ -52,7 +52,7 @@ import ComponentRef = NFComponentRef;
 protected
 import NFInstNode.NodeTree;
 import NFInstNode.CachedData;
-import NFComponent.Component;
+import Component = NFComponent;
 import Subscript = NFSubscript;
 import ComplexType = NFComplexType;
 import Config;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFLookupState.mo b/OMCompiler/Compiler/NFFrontEnd/NFLookupState.mo
@@ -35,7 +35,6 @@ import Absyn;
 import AbsynUtil;
 import SCode;
 import NFInstNode.InstNode;
-import NFComponent.Component;
 
 protected
 import Dump;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFModifier.mo b/OMCompiler/Compiler/NFFrontEnd/NFModifier.mo
@@ -44,7 +44,6 @@ import Absyn;
 import AbsynUtil;
 import BaseAvlTree;
 import NFBinding.Binding;
-import NFComponent.Component;
 import NFInstNode.InstNode;
 import SCode;
 import Inst = NFInst;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFOperatorOverloading.mo b/OMCompiler/Compiler/NFFrontEnd/NFOperatorOverloading.mo
@@ -41,7 +41,7 @@ protected
   import ComponentRef = NFComponentRef;
   import NFClassTree.ClassTree;
   import NFClass.Class;
-  import NFComponent.Component;
+  import Component = NFComponent;
   import NFBinding.Binding;
   import Expression = NFExpression;
   import Call = NFCall;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFPackage.mo b/OMCompiler/Compiler/NFFrontEnd/NFPackage.mo
@@ -41,7 +41,7 @@ protected
   import Equation = NFEquation;
   import Statement = NFStatement;
   import List;
-  import NFComponent.Component;
+  import Component = NFComponent;
   import NFInstNode.InstNode;
   import Typing = NFTyping;
   import Ceval = NFCeval;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFRecord.mo b/OMCompiler/Compiler/NFFrontEnd/NFRecord.mo
@@ -40,7 +40,7 @@ encapsulated package NFRecord
 
 import NFBinding.Binding;
 import NFClass.Class;
-import NFComponent.Component;
+import Component = NFComponent;
 import Dimension = NFDimension;
 import Expression = NFExpression;
 import NFInstNode.InstNode;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFScalarize.mo b/OMCompiler/Compiler/NFFrontEnd/NFScalarize.mo
@@ -46,7 +46,7 @@ import Dimension = NFDimension;
 import MetaModelica.Dangerous.listReverseInPlace;
 import MetaModelica.Dangerous.arrayCreateNoInit;
 import Variable = NFVariable;
-import NFComponent.Component;
+import Component = NFComponent;
 import NFPrefixes.Visibility;
 import NFPrefixes.Variability;
 import List;
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFTypeCheck.mo b/OMCompiler/Compiler/NFFrontEnd/NFTypeCheck.mo
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFTyping.mo b/OMCompiler/Compiler/NFFrontEnd/NFTyping.mo
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFUnitCheck.mo b/OMCompiler/Compiler/NFFrontEnd/NFUnitCheck.mo
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFVariable.mo b/OMCompiler/Compiler/NFFrontEnd/NFVariable.mo
