Skip to content

Commit

Permalink
NFBinding is now a Uniontype instead of pkt/ut hybrid (#900)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JKRT
JKRT committed May 25, 2020
1 parent 3ab5efe commit 4737bf6
Show file tree
Hide file tree
Showing 26 changed files with 29 additions and 30 deletions.
9 changes: 4 additions & 5 deletions OMCompiler/Compiler/NFFrontEnd/NFBinding.mo
View file
Expand Up @@ -29,7 +29,7 @@
*
*/

encapsulated package NFBinding
encapsulated uniontype NFBinding

public
import Expression = NFExpression;
Expand All @@ -39,19 +39,19 @@ public
import ErrorTypes;

protected
import Binding = NFBinding;
import Dump;
import Error;

public
constant Binding EMPTY_BINDING = Binding.UNBOUND({}, false, AbsynUtil.dummyInfo);
constant Binding EMPTY_BINDING = UNBOUND({}, false, AbsynUtil.dummyInfo);

type EachType = enumeration(
NOT_EACH,
EACH,
REPEAT
);

uniontype Binding
record UNBOUND
// NOTE: Use the EMPTY_BINDING constant above when a default unbound binding
// is needed, to save memory. UNBOUND contains this information to be
Expand Down Expand Up @@ -121,7 +121,7 @@ public
case SOME(exp)
then RAW_BINDING(exp, scope, parents, eachPrefix, info);

else if eachPrefix then UNBOUND(parents, true, info) else NFBinding.EMPTY_BINDING;
else if eachPrefix then UNBOUND(parents, true, info) else EMPTY_BINDING;
end match;
end fromAbsyn;

Expand Down Expand Up @@ -713,7 +713,6 @@ public
else false;
end match;
end containsExp;
end Binding;

annotation(__OpenModelica_Interface="frontend");
end NFBinding;
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFCall.mo
View file
Expand Up @@ -54,7 +54,7 @@ import Inst = NFInst;
import List;
import Lookup = NFLookup;
import MetaModelica.Dangerous.listReverseInPlace;
import NFBinding.Binding;
import Binding = NFBinding;
import NFClass.Class;
import Component = NFComponent;
import NFFunction.Function;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFCeval.mo
View file
Expand Up @@ -31,7 +31,7 @@

encapsulated package NFCeval

import NFBinding.Binding;
import Binding = NFBinding;
import ComponentRef = NFComponentRef;
import Error;
import Component = NFComponent;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFClass.mo
View file
Expand Up @@ -44,7 +44,7 @@ import Restriction = NFRestriction;
import Expression = NFExpression;

protected
import NFBinding.Binding;
import Binding = NFBinding;
import ComplexType = NFComplexType;
import System;
import AbsynUtil;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFComponent.mo
View file
Expand Up @@ -32,7 +32,7 @@
encapsulated uniontype NFComponent

import DAE;
import NFBinding.Binding;
import Binding = NFBinding;
import NFClass.Class;
import NFClassTree.ClassTree;
import Dimension = NFDimension;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFConnectEquations.mo
View file
Expand Up @@ -59,7 +59,7 @@ import Call = NFCall;
import NFBuiltinFuncs;
import NFInstNode.InstNode;
import NFClass.Class;
import NFBinding.Binding;
import Binding = NFBinding;
import NFFunction.Function;
import Global;
import BuiltinCall = NFBuiltinCall;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFConvertDAE.mo
View file
Expand Up @@ -31,7 +31,7 @@

encapsulated package NFConvertDAE

import NFBinding.Binding;
import Binding = NFBinding;
import DAE;
import Equation = NFEquation;
import FlatModel = NFFlatModel;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFEvalConstants.mo
View file
Expand Up @@ -42,7 +42,7 @@ import NFClass.Class;
import NFInstNode.InstNode;
import NFFunction.Function;
import Sections = NFSections;
import NFBinding.Binding;
import Binding = NFBinding;
import Variable = NFVariable;
import Algorithm = NFAlgorithm;
import NFEquation.Branch;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFEvalFunction.mo
View file
Expand Up @@ -38,7 +38,7 @@ import NFInstNode.InstNode;
import Sections = NFSections;
import Statement = NFStatement;
import ComponentRef = NFComponentRef;
import NFBinding.Binding;
import Binding = NFBinding;
import Component = NFComponent;
import Type = NFType;
import Dimension = NFDimension;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFExpression.mo
View file
Expand Up @@ -62,7 +62,7 @@ public
import Type = NFType;
import ComponentRef = NFComponentRef;
import Call = NFCall;
import NFBinding.Binding;
import Binding = NFBinding;
import NFClassTree.ClassTree;
import NFClass.Class;
import NFComponentRef.Origin;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFExpressionIterator.mo
View file
Expand Up @@ -38,7 +38,7 @@ protected

public
import Expression = NFExpression;
import NFBinding.Binding;
import Binding = NFBinding;

record ARRAY_ITERATOR
list<Expression> array;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFFlatModel.mo
View file
Expand Up @@ -39,7 +39,7 @@ protected
import NFFunction.Function;
import Expression = NFExpression;
import Type = NFType;
import NFBinding.Binding;
import Binding = NFBinding;
import Dimension = NFDimension;
import ComplexType = NFComplexType;
import NFInstNode.InstNode;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo
View file
Expand Up @@ -38,7 +38,7 @@ encapsulated package NFFlatten
New instantiation, enable with -d=newInst.
"

import NFBinding.Binding;
import Binding = NFBinding;
import Equation = NFEquation;
import NFFunction.Function;
import NFInstNode.InstNode;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFFunction.mo
View file
Expand Up @@ -45,7 +45,7 @@ import NFModifier.Modifier;
protected
import ErrorExt;
import Inst = NFInst;
import NFBinding.Binding;
import Binding = NFBinding;
import Config;
import DAE;
import Error;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFInst.mo
View file
Expand Up @@ -43,7 +43,7 @@ import SCode;
import DAE;

import Builtin = NFBuiltin;
import NFBinding.Binding;
import Binding = NFBinding;
import Component = NFComponent;
import ComponentRef = NFComponentRef;
import Dimension = NFDimension;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFModifier.mo
View file
Expand Up @@ -43,7 +43,7 @@ public
import Absyn;
import AbsynUtil;
import BaseAvlTree;
import NFBinding.Binding;
import Binding = NFBinding;
import NFInstNode.InstNode;
import SCode;
import Inst = NFInst;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFOperatorOverloading.mo
View file
Expand Up @@ -42,7 +42,7 @@ protected
import NFClassTree.ClassTree;
import NFClass.Class;
import Component = NFComponent;
import NFBinding.Binding;
import Binding = NFBinding;
import Expression = NFExpression;
import Call = NFCall;
import SCodeUtil;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFPackage.mo
View file
Expand Up @@ -37,7 +37,7 @@ protected
import ExecStat.execStat;
import ComponentRef = NFComponentRef;
import Expression = NFExpression;
import NFBinding.Binding;
import Binding = NFBinding;
import Equation = NFEquation;
import Statement = NFStatement;
import List;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFRecord.mo
View file
Expand Up @@ -38,7 +38,7 @@ encapsulated package NFRecord
Functions used by NFInst for handling records.
"

import NFBinding.Binding;
import Binding = NFBinding;
import NFClass.Class;
import Component = NFComponent;
import Dimension = NFDimension;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFScalarize.mo
View file
Expand Up @@ -39,7 +39,7 @@ import ExecStat.execStat;
import ComponentRef = NFComponentRef;
import Type = NFType;
import Expression = NFExpression;
import NFBinding.Binding;
import Binding = NFBinding;
import Equation = NFEquation;
import ExpressionIterator = NFExpressionIterator;
import Dimension = NFDimension;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFSimplifyModel.mo
View file
Expand Up @@ -42,7 +42,7 @@ import NFClass.Class;
import NFInstNode.InstNode;
import NFFunction.Function;
import Sections = NFSections;
import NFBinding.Binding;
import Binding = NFBinding;
import Variable = NFVariable;
import Algorithm = NFAlgorithm;
import Dimension = NFDimension;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFTypeCheck.mo
View file
Expand Up @@ -42,7 +42,7 @@ import DAE;
import Dimension = NFDimension;
import Expression = NFExpression;
import NFInstNode.InstNode;
import NFBinding.Binding;
import Binding = NFBinding;
import NFPrefixes.Variability;

protected
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFTyping.mo
View file
Expand Up @@ -38,7 +38,7 @@ encapsulated package NFTyping
Functions used by NFInst for typing.
"

import NFBinding.Binding;
import Binding = NFBinding;
import Component = NFComponent;
import Dimension = NFDimension;
import Equation = NFEquation;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFUnitCheck.mo
View file
Expand Up @@ -24,7 +24,7 @@ import Expression = NFExpression;
import HashTableCrToUnit = NFHashTableCrToUnit;
import HashTableStringToUnit = NFHashTableStringToUnit;
import HashTableUnitToString = NFHashTableUnitToString;
import NFBinding.Binding;
import Binding = NFBinding;
import Call = NFCall;
import Component = NFComponent;
import NFFunction.Function;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFVariable.mo
View file
Expand Up @@ -30,7 +30,7 @@
*/

encapsulated uniontype NFVariable
import NFBinding.Binding;
import Binding = NFBinding;
import Component = NFComponent;
import ComponentRef = NFComponentRef;
import Expression = NFExpression;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFVerifyModel.mo
View file
Expand Up @@ -46,7 +46,7 @@ protected
import Variable = NFVariable;
import Algorithm = NFAlgorithm;
import Statement = NFStatement;
import NFBinding.Binding;
import Binding = NFBinding;
import Subscript = NFSubscript;
import Dimension = NFDimension;
import Util;
Expand Down

0 comments on commit 4737bf6

Please sign in to comment.