-
Notifications
You must be signed in to change notification settings - Fork 298
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
More work on new environment and lookup:
- Copied some parts of NFInstTypes (those that depended on NFSCodeEnv) to NFInstTypesOld, for use by the shortcut. - Copied the few functions from NFSCodeInst used by the shortcut into NFSCodeAnalyseRedeclare, and removed NFSCodeInst. - Added a couple of new packages, NFInst and NFMod, and changed CevalScript.runFrontEndWork to use NFInst instead of NFSCodeInst. - Disabled most of the scodeinst tests for now, will enable as I fix the new new instantiation. - Added some utility functions to List and SCode. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14896 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
- Loading branch information
Showing
18 changed files
with
5,923 additions
and
4,424 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,213 @@ | ||
| /* | ||
| * This file is part of OpenModelica. | ||
| * | ||
| * Copyright (c) 1998-CurrentYear, Linköping University, | ||
| * Department of Computer and Information Science, | ||
| * SE-58183 Linköping, Sweden. | ||
| * | ||
| * All rights reserved. | ||
| * | ||
| * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 | ||
| * AND THIS OSMC PUBLIC LICENSE (OSMC-PL). | ||
| * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S | ||
| * ACCEPTANCE OF THE OSMC PUBLIC LICENSE. | ||
| * | ||
| * The OpenModelica software and the Open Source Modelica | ||
| * Consortium (OSMC) Public License (OSMC-PL) are obtained | ||
| * from Linköping University, either from the above address, | ||
| * from the URLs: http://www.ida.liu.se/projects/OpenModelica or | ||
| * http://www.openmodelica.org, and in the OpenModelica distribution. | ||
| * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. | ||
| * | ||
| * This program is distributed WITHOUT ANY WARRANTY; without | ||
| * even the implied warranty of MERCHANTABILITY or FITNESS | ||
| * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH | ||
| * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS | ||
| * OF OSMC-PL. | ||
| * | ||
| * See the full OSMC Public License conditions for more details. | ||
| * | ||
| */ | ||
|
|
||
| encapsulated package NFInstTypesOld | ||
| " file: NFInstTypes.mo | ||
| package: NFInstTypes | ||
| description: Types used by NFSCodeInst. | ||
|
|
||
| RCS: $Id: NFInstTypes.mo 14777 2013-01-15 06:52:32Z mahge930 $ | ||
|
|
||
| Types used by NFSCodeInst. | ||
| " | ||
|
|
||
| public import Absyn; | ||
| public import NFConnect2; | ||
| public import DAE; | ||
| public import SCode; | ||
| public import NFSCodeEnv; | ||
| public import NFInstTypes; | ||
|
|
||
| public type Dimension = NFInstTypes.Dimension; | ||
| public type Condition = NFInstTypes.Condition; | ||
| public type ParamType = NFInstTypes.ParamType; | ||
| public type Prefixes = NFInstTypes.Prefixes; | ||
| public type VarArgs = NFInstTypes.VarArgs; | ||
| public type DaePrefixes = NFInstTypes.DaePrefixes; | ||
| public type Equation = NFInstTypes.Equation; | ||
| public type Statement = NFInstTypes.Statement; | ||
| public type FunctionSlot = NFInstTypes.FunctionSlot; | ||
| public type Prefix = NFInstTypes.Prefix; | ||
|
|
||
| public uniontype Element | ||
| record ELEMENT | ||
| Component component; | ||
| Class cls; | ||
| end ELEMENT; | ||
|
|
||
| record CONDITIONAL_ELEMENT | ||
| Component component; | ||
| end CONDITIONAL_ELEMENT; | ||
|
|
||
| record EXTENDED_ELEMENTS | ||
| "This record is used by NFSCodeInst.instElementList to store elements from | ||
| extends, but is removed by instFlatten. Most functions which handle | ||
| elements should therefore be able to ignore this record." | ||
| Absyn.Path baseClass; | ||
| Class cls; | ||
| DAE.Type ty; | ||
| end EXTENDED_ELEMENTS; | ||
| end Element; | ||
|
|
||
| public uniontype Class | ||
| record COMPLEX_CLASS | ||
| Absyn.Path name; | ||
| list<Element> components; | ||
| list<Equation> equations; | ||
| list<Equation> initialEquations; | ||
| list<list<Statement>> algorithms; | ||
| list<list<Statement>> initialAlgorithms; | ||
| end COMPLEX_CLASS; | ||
|
|
||
| record BASIC_TYPE | ||
| Absyn.Path name; | ||
| end BASIC_TYPE; | ||
| end Class; | ||
|
|
||
| public uniontype Function | ||
|
|
||
| record FUNCTION | ||
| "A function has inputs, output and locals without binding. | ||
| These are resolved to statements in the algorithm section." | ||
| Absyn.Path path; | ||
| list<Element> inputs; | ||
| list<Element> outputs; | ||
| list<Element> locals; | ||
| list<Statement> algorithms "TODO: Add default bindings"; | ||
| end FUNCTION; | ||
|
|
||
| record RECORD_CONSTRUCTOR | ||
| "A record constructor has inputs and locals (with bindings)?" | ||
| Absyn.Path path; | ||
| DAE.Type recType; | ||
| list<Element> inputs "componets of the original record which CAN be modified"; | ||
| list<Element> locals "componets of the original record which CAN NOT be modified (protected, final, constant WITH binding)"; | ||
| list<Statement> algorithms "TODO: Add default bindings"; | ||
| end RECORD_CONSTRUCTOR; | ||
|
|
||
| end Function; | ||
|
|
||
| public uniontype Binding | ||
| record UNBOUND end UNBOUND; | ||
|
|
||
| record RAW_BINDING | ||
| Absyn.Exp bindingExp; | ||
| NFSCodeEnv.Env env; | ||
| Prefix prefix; | ||
| Integer propagatedDims "See NFSCodeMod.propagateMod."; | ||
| Absyn.Info info; | ||
| end RAW_BINDING; | ||
|
|
||
| record UNTYPED_BINDING | ||
| DAE.Exp bindingExp; | ||
| Boolean isProcessing; | ||
| Integer propagatedDims "See NFSCodeMod.propagateMod."; | ||
| Absyn.Info info; | ||
| end UNTYPED_BINDING; | ||
|
|
||
| record TYPED_BINDING | ||
| DAE.Exp bindingExp; | ||
| DAE.Type bindingType; | ||
| Integer propagatedDims "See NFSCodeMod.propagateMod."; | ||
| Absyn.Info info; | ||
| end TYPED_BINDING; | ||
| end Binding; | ||
|
|
||
| public uniontype Component | ||
| record UNTYPED_COMPONENT | ||
| Absyn.Path name; | ||
| DAE.Type baseType; | ||
| array<Dimension> dimensions; | ||
| Prefixes prefixes; | ||
| ParamType paramType; | ||
| Binding binding; | ||
| Absyn.Info info; | ||
| end UNTYPED_COMPONENT; | ||
|
|
||
| record TYPED_COMPONENT | ||
| Absyn.Path name; | ||
| DAE.Type ty; | ||
| Option<Component> parent; //NO_COMPONENT? | ||
| DaePrefixes prefixes; | ||
| Binding binding; | ||
| Absyn.Info info; | ||
| end TYPED_COMPONENT; | ||
|
|
||
| record CONDITIONAL_COMPONENT | ||
| Absyn.Path name; | ||
| DAE.Exp condition; | ||
| SCode.Element element; | ||
| Modifier modifier; | ||
| Prefixes prefixes; | ||
| NFSCodeEnv.Env env; | ||
| Prefix prefix; | ||
| Absyn.Info info; | ||
| end CONDITIONAL_COMPONENT; | ||
|
|
||
| record DELETED_COMPONENT | ||
| Absyn.Path name; | ||
| end DELETED_COMPONENT; | ||
|
|
||
| record OUTER_COMPONENT | ||
| Absyn.Path name; | ||
| Option<Absyn.Path> innerName; | ||
| end OUTER_COMPONENT; | ||
|
|
||
| record PACKAGE | ||
| Absyn.Path name; | ||
| Option<Component> parent; //NO_COMPONENT? | ||
| end PACKAGE; | ||
|
|
||
| record COMPONENT_ALIAS | ||
| Absyn.Path componentName; | ||
| end COMPONENT_ALIAS; | ||
| end Component; | ||
|
|
||
| public uniontype Modifier | ||
| record MODIFIER | ||
| String name; | ||
| SCode.Final finalPrefix; | ||
| SCode.Each eachPrefix; | ||
| Binding binding; | ||
| list<Modifier> subModifiers; | ||
| Absyn.Info info; | ||
| end MODIFIER; | ||
|
|
||
| record REDECLARE | ||
| SCode.Final finalPrefix; | ||
| SCode.Each eachPrefix; | ||
| SCode.Element element; | ||
| end REDECLARE; | ||
|
|
||
| record NOMOD end NOMOD; | ||
| end Modifier; | ||
|
|
||
| end NFInstTypesOld; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.