Skip to content

Commit

Permalink
NFClass is now a uniontype (#910)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JKRT
JKRT committed May 28, 2020
1 parent c938f04 commit e84fce5
Show file tree
Hide file tree
Showing 33 changed files with 48 additions and 49 deletions.
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFBuiltin.mo
View file
Expand Up @@ -45,7 +45,7 @@ import Absyn;
import AbsynUtil;
import SCode;
import NFBinding;
import NFClass.Class;
import Class = NFClass;
import NFClassTree.ClassTree;
import Component = NFComponent;
import Expression = NFExpression;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFBuiltinCall.mo
View file
Expand Up @@ -47,7 +47,7 @@ protected
import Dimension = NFDimension;
import List;
import MetaModelica.Dangerous.listReverseInPlace;
import NFClass.Class;
import Class = NFClass;
import NFFunction.Function;
import NFFunction.FunctionMatchKind;
import NFFunction.MatchedFunction;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFBuiltinFuncs.mo
View file
Expand Up @@ -31,7 +31,7 @@

encapsulated package NFBuiltinFuncs

import NFClass.Class;
import Class = NFClass;
import NFClassTree.ClassTree;
import NFFunction.Function;
import NFFunction.Slot;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFCall.mo
View file
Expand Up @@ -55,7 +55,7 @@ import List;
import Lookup = NFLookup;
import MetaModelica.Dangerous.listReverseInPlace;
import Binding = NFBinding;
import NFClass.Class;
import Class = NFClass;
import Component = NFComponent;
import NFFunction.Function;
import NFFunction.FunctionMatchKind;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFCeval.mo
View file
Expand Up @@ -60,7 +60,7 @@ import List;
import System;
import ExpressionIterator = NFExpressionIterator;
import MetaModelica.Dangerous.*;
import NFClass.Class;
import Class = NFClass;
import TypeCheck = NFTypeCheck;
import ExpandExp = NFExpandExp;
import ElementSource;
Expand Down
33 changes: 16 additions & 17 deletions OMCompiler/Compiler/NFFrontEnd/NFClass.mo
View file
Expand Up @@ -29,39 +29,39 @@
*
*/

encapsulated package NFClass
encapsulated uniontype NFClass

import NFInstNode.InstNode;
import NFModifier.Modifier;
import NFStatement.Statement;
import SCode.Element;
import Type = NFType;
import Component = NFComponent;
import Dimension = NFDimension;
import Expression = NFExpression;
import NFClassTree.ClassTree;
import NFInstNode.InstNode;
import NFModifier.Modifier;
import NFSections.Sections;
import NFStatement.Statement;
import Restriction = NFRestriction;
import Expression = NFExpression;
import SCode.Element;
import Type = NFType;

protected
import AbsynUtil;
import Binding = NFBinding;
import Class = NFClass;
import ComplexType = NFComplexType;
import System;
import AbsynUtil;
import SCodeUtil;
import IOStream;
import SCodeUtil;
import System;

public

constant Class.Prefixes DEFAULT_PREFIXES = Class.Prefixes.PREFIXES(
constant Prefixes DEFAULT_PREFIXES = Prefixes.PREFIXES(
SCode.Encapsulated.NOT_ENCAPSULATED(),
SCode.Partial.NOT_PARTIAL(),
SCode.Final.NOT_FINAL(),
Absyn.InnerOuter.NOT_INNER_OUTER(),
SCode.Replaceable.NOT_REPLACEABLE()
);

uniontype Class
uniontype Prefixes
record PREFIXES
SCode.Encapsulated encapsulatedPrefix;
Expand All @@ -83,29 +83,29 @@ uniontype Class
record PARTIAL_CLASS
ClassTree elements;
Modifier modifier;
Class.Prefixes prefixes;
Prefixes prefixes;
end PARTIAL_CLASS;

record PARTIAL_BUILTIN
Type ty;
ClassTree elements;
Modifier modifier;
Class.Prefixes prefixes;
Prefixes prefixes;
Restriction restriction;
end PARTIAL_BUILTIN;

record EXPANDED_CLASS
ClassTree elements;
Modifier modifier;
Class.Prefixes prefixes;
Prefixes prefixes;
Restriction restriction;
end EXPANDED_CLASS;

record EXPANDED_DERIVED
InstNode baseClass;
Modifier modifier;
array<Dimension> dims;
Class.Prefixes prefixes;
Prefixes prefixes;
Component.Attributes attributes;
Restriction restriction;
end EXPANDED_DERIVED;
Expand Down Expand Up @@ -775,7 +775,6 @@ uniontype Class
str := IOStream.string(s);
IOStream.delete(s);
end toFlatString;
end Class;

annotation(__OpenModelica_Interface="frontend");
end NFClass;
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFClassTree.mo
View file
Expand Up @@ -43,7 +43,7 @@ protected
import Array;
import Error;
import MetaModelica.Dangerous.*;
import NFClass.Class;
import Class = NFClass;
import Component = NFComponent;
import Inst = NFInst;
import List;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFComponent.mo
View file
Expand Up @@ -33,7 +33,7 @@ encapsulated uniontype NFComponent

import DAE;
import Binding = NFBinding;
import NFClass.Class;
import Class = NFClass;
import NFClassTree.ClassTree;
import Dimension = NFDimension;
import NFInstNode.InstNode;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFComponentRef.mo
View file
Expand Up @@ -41,7 +41,7 @@ protected
import Dimension = NFDimension;
import Expression = NFExpression;
import NFPrefixes.Variability;
import NFClass.Class;
import Class = NFClass;
import List;
import Prefixes = NFPrefixes;

Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFConnectEquations.mo
View file
Expand Up @@ -58,7 +58,7 @@ import Type = NFType;
import Call = NFCall;
import NFBuiltinFuncs;
import NFInstNode.InstNode;
import NFClass.Class;
import Class = NFClass;
import Binding = NFBinding;
import NFFunction.Function;
import Global;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFConnector.mo
View file
Expand Up @@ -46,7 +46,7 @@ protected
import Flags;
import Component = NFComponent;
import NFClassTree.ClassTree;
import NFClass.Class;
import Class = NFClass;
import Restriction = NFRestriction;
import ComplexType = NFComplexType;
import Dimension = NFDimension;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFConvertDAE.mo
View file
Expand Up @@ -52,7 +52,7 @@ import Expression = NFExpression;
import Flags;
import Function = NFFunction.Function;
import MetaModelica.Dangerous.listReverseInPlace;
import NFClass.Class;
import Class = NFClass;
import NFClassTree.ClassTree;
import Component = NFComponent;
import NFModifier.Modifier;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFDimension.mo
View file
Expand Up @@ -38,7 +38,7 @@ protected

public
import Absyn.{Exp, Path, Subscript};
import NFClass.Class;
import Class = NFClass;
import Expression = NFExpression;
import NFInstNode.InstNode;
import Type = NFType;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFEvalConstants.mo
View file
Expand Up @@ -38,7 +38,7 @@ import Expression = NFExpression;
import Type = NFType;
import ComponentRef = NFComponentRef;
import NFFlatten.FunctionTree;
import NFClass.Class;
import Class = NFClass;
import NFInstNode.InstNode;
import NFFunction.Function;
import Sections = NFSections;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFEvalFunction.mo
View file
Expand Up @@ -32,7 +32,7 @@
encapsulated package NFEvalFunction

import Expression = NFExpression;
import NFClass.Class;
import Class = NFClass;
import NFFunction.Function;
import NFInstNode.InstNode;
import Sections = NFSections;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFExpandableConnectors.mo
View file
Expand Up @@ -49,7 +49,7 @@ import Error;
import ErrorTypes;
import Expression = NFExpression;
import MetaModelica.Dangerous.listReverseInPlace;
import NFClass.Class;
import Class = NFClass;
import NFClassTree.ClassTree;
import Component = NFComponent;
import NFInstNode.InstNode;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFExpression.mo
View file
Expand Up @@ -64,7 +64,7 @@ public
import Call = NFCall;
import Binding = NFBinding;
import NFClassTree.ClassTree;
import NFClass.Class;
import Class = NFClass;
import NFComponentRef.Origin;
import NFTyping.ExpOrigin;
import Values;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFFlatModel.mo
View file
Expand Up @@ -45,7 +45,7 @@ protected
import NFInstNode.InstNode;
import IOStream;
import NFSubscript.Subscript;
import NFClass.Class;
import Class = NFClass;
import NFClassTree.ClassTree;
import Component = NFComponent;
import NFComponentRef.ComponentRef;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo
View file
Expand Up @@ -57,7 +57,7 @@ import Flags;
import Inst = NFInst;
import List;
import Call = NFCall;
import NFClass.Class;
import Class = NFClass;
import NFClassTree.ClassTree;
import Component = NFComponent;
import NFModifier.Modifier;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFFunction.mo
View file
Expand Up @@ -50,7 +50,7 @@ import Config;
import DAE;
import Error;
import InstUtil;
import NFClass.Class;
import Class = NFClass;
import Component = NFComponent;
import NFComponent.Attributes;
import Typing = NFTyping;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFImport.mo
View file
Expand Up @@ -36,7 +36,7 @@ protected
import Inst = NFInst;
import Lookup = NFLookup;
import NFClassTree.ClassTree;
import NFClass.Class;
import Class = NFClass;

import Import = NFImport;
import Error;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFInst.mo
View file
Expand Up @@ -48,7 +48,7 @@ import Component = NFComponent;
import ComponentRef = NFComponentRef;
import Dimension = NFDimension;
import Expression = NFExpression;
import NFClass.Class;
import Class = NFClass;
import NFInstNode.InstNode;
import NFInstNode.InstNodeType;
import NFModifier.Modifier;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFInstNode.mo
View file
Expand Up @@ -32,7 +32,7 @@
encapsulated package NFInstNode

import Component = NFComponent;
import NFClass.Class;
import Class = NFClass;
import SCode;
import Absyn;
import AbsynUtil;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFLookup.mo
View file
Expand Up @@ -43,7 +43,7 @@ import ErrorTypes;
import Global;
import NFBuiltin;
import Inst = NFInst;
import NFClass.Class;
import Class = NFClass;
import NFInstNode.InstNode;
import NFLookupState.LookupState;
import Type = NFType;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFLookupState.mo
View file
Expand Up @@ -41,7 +41,7 @@ import Dump;
import Error;
import SCodeUtil;
import System;
import NFClass.Class;
import Class = NFClass;

public
uniontype LookupStateName
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFOCConnectionGraph.mo
View file
Expand Up @@ -82,7 +82,7 @@ protected
import Absyn;
import NFBuiltin;
import Call = NFCall;
import NFClass.Class;
import Class = NFClass;
import Dimension = NFDimension;
import NFFunction.Function;
import NFHashTable;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFOperatorOverloading.mo
View file
Expand Up @@ -40,7 +40,7 @@ protected
import Record = NFRecord;
import ComponentRef = NFComponentRef;
import NFClassTree.ClassTree;
import NFClass.Class;
import Class = NFClass;
import Component = NFComponent;
import Binding = NFBinding;
import Expression = NFExpression;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFPackage.mo
View file
Expand Up @@ -46,7 +46,7 @@ protected
import Typing = NFTyping;
import Ceval = NFCeval;
import NFFunction.Function;
import NFClass.Class;
import Class = NFClass;
import Sections = NFSections;
import ClassTree = NFClassTree;
import NFTyping.ExpOrigin;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFRecord.mo
View file
Expand Up @@ -39,7 +39,7 @@ encapsulated package NFRecord
"

import Binding = NFBinding;
import NFClass.Class;
import Class = NFClass;
import Component = NFComponent;
import Dimension = NFDimension;
import Expression = NFExpression;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFSimplifyModel.mo
View file
Expand Up @@ -38,7 +38,7 @@ import Expression = NFExpression;
import Type = NFType;
import ComponentRef = NFComponentRef;
import NFFlatten.FunctionTree;
import NFClass.Class;
import Class = NFClass;
import NFInstNode.InstNode;
import NFFunction.Function;
import Sections = NFSections;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFType.mo
View file
Expand Up @@ -34,7 +34,7 @@ protected
import Type = NFType;
import List;
import Restriction = NFRestriction;
import NFClass.Class;
import Class = NFClass;
import IOStream;

public
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFTypeCheck.mo
View file
Expand Up @@ -56,7 +56,7 @@ import List;
import Types;
import Operator = NFOperator;
import Type = NFType;
import Class = NFClass.Class;
import Class = NFClass;
import ClassTree = NFClassTree;
import InstUtil = NFInstUtil;
import Prefixes = NFPrefixes;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFTyping.mo
View file
Expand Up @@ -42,7 +42,7 @@ import Binding = NFBinding;
import Component = NFComponent;
import Dimension = NFDimension;
import Equation = NFEquation;
import NFClass.Class;
import Class = NFClass;
import Expression = NFExpression;
import NFInstNode.InstNode;
import NFModifier.Modifier;
Expand Down

0 comments on commit e84fce5

Please sign in to comment.