Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improved function handling in NFInst.
- Added new uniontype NFCall.Call, and changed NFExpression.CALL to only contain an instance of NFCall.Call. - Moved NFExpression.CallAttributes to NFCall, and changed NFExpression to be a uniontype instead of package. - Added new package NFBuiltinFunc, for defining builtin functions that can't be declared in ModelicaBuiltin (currently Integer and String). - Implemented typing and type checking of function calls. - Implemented flattening of functions and generation of a DAE.FunctionTree during flattening. - Added lots of error checking for functions and calls. - Added Type.ENUMERATION_ANY() to represent enumeration(:). - Implemented support for overloaded functions using $overload.
- Loading branch information
1 parent
2a857f1
commit 4c362d1
Showing
23 changed files
with
1,399 additions
and
498 deletions.
There are no files selected for viewing
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,142 @@ | ||
| /* | ||
| * This file is part of OpenModelica. | ||
| * | ||
| * Copyright (c) 1998-2014, Open Source Modelica Consortium (OSMC), | ||
| * c/o Linköpings universitet, 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 LICENSE OR | ||
| * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. | ||
| * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES | ||
| * RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, | ||
| * ACCORDING TO RECIPIENTS CHOICE. | ||
| * | ||
| * The OpenModelica software and the Open Source Modelica | ||
| * Consortium (OSMC) Public License (OSMC-PL) are obtained | ||
| * from OSMC, 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 NFBuiltinFuncs | ||
|
|
||
| import NFFunction.Function; | ||
| import NFFunction.Slot; | ||
| import NFFunction.SlotType; | ||
| import NFFunction.FuncType; | ||
| import NFInstNode.InstNode; | ||
| import NFInstNode.InstNodeType; | ||
| import NFComponent.Component; | ||
| import Type = NFType; | ||
| import Expression = NFExpression; | ||
| import Absyn; | ||
| import Absyn.{Path, TypeSpec}; | ||
| import SCode; | ||
| import SCode.{Mod, Comment}; | ||
| import DAE; | ||
| import Builtin = NFBuiltin; | ||
| import Binding = NFBinding; | ||
|
|
||
| // Dummy SCode component, since we usually don't need the definition for anything. | ||
| constant SCode.Element DUMMY_ELEMENT = SCode.COMPONENT("dummy", | ||
| SCode.defaultPrefixes, SCode.defaultVarAttr, | ||
| TypeSpec.TPATH(Path.IDENT("$dummy"), NONE()), SCode.Mod.NOMOD(), | ||
| SCode.Comment.COMMENT(NONE(), NONE()), NONE(), Absyn.dummyInfo); | ||
|
|
||
| // Default Integer parameter. | ||
| constant Component INT_COMPONENT = Component.TYPED_COMPONENT(NFInstNode.EMPTY_NODE(), | ||
| Type.INTEGER(), Binding.UNBOUND(), NFComponent.DEFAULT_ATTR); | ||
|
|
||
| constant InstNode INT_PARAM = InstNode.COMPONENT_NODE("i", | ||
| DUMMY_ELEMENT, listArray({INT_COMPONENT}), InstNode.EMPTY_NODE()); | ||
|
|
||
| // Default Real parameter. | ||
| constant Component REAL_COMPONENT = Component.TYPED_COMPONENT(NFInstNode.EMPTY_NODE(), | ||
| Type.REAL(), Binding.UNBOUND(), NFComponent.DEFAULT_ATTR); | ||
|
|
||
| constant InstNode REAL_PARAM = InstNode.COMPONENT_NODE("r", | ||
| DUMMY_ELEMENT, listArray({REAL_COMPONENT}), InstNode.EMPTY_NODE()); | ||
|
|
||
| // Default Boolean parameter. | ||
| constant Component BOOL_COMPONENT = Component.TYPED_COMPONENT(NFInstNode.EMPTY_NODE(), | ||
| Type.BOOLEAN(), Binding.UNBOUND(), NFComponent.DEFAULT_ATTR); | ||
|
|
||
| constant InstNode BOOL_PARAM = InstNode.COMPONENT_NODE("b", | ||
| DUMMY_ELEMENT, listArray({BOOL_COMPONENT}), InstNode.EMPTY_NODE()); | ||
|
|
||
| // Default String parameter. | ||
| constant Component STRING_COMPONENT = Component.TYPED_COMPONENT(NFInstNode.EMPTY_NODE(), | ||
| Type.STRING(), Binding.UNBOUND(), NFComponent.DEFAULT_ATTR); | ||
|
|
||
| constant InstNode STRING_PARAM = InstNode.COMPONENT_NODE("s", | ||
| DUMMY_ELEMENT, listArray({STRING_COMPONENT}), InstNode.EMPTY_NODE()); | ||
|
|
||
| // Default enumeration(:) parameter. | ||
| constant Component ENUM_COMPONENT = Component.TYPED_COMPONENT(NFInstNode.EMPTY_NODE(), | ||
| Type.ENUMERATION_ANY(), Binding.UNBOUND(), NFComponent.DEFAULT_ATTR); | ||
|
|
||
| constant InstNode ENUM_PARAM = InstNode.COMPONENT_NODE("e", | ||
| DUMMY_ELEMENT, listArray({ENUM_COMPONENT}), InstNode.EMPTY_NODE()); | ||
|
|
||
| // Integer(e) | ||
| constant Function INTEGER = Function.FUNCTION(Path.IDENT("Integer"), | ||
| InstNode.EMPTY_NODE(), {ENUM_PARAM}, {}, {}, { | ||
| Slot.SLOT("e", SlotType.POSITIONAL, NONE(), NONE()) | ||
| }, Type.INTEGER(), DAE.FUNCTION_ATTRIBUTES_BUILTIN, listArray({true})); | ||
|
|
||
| // String(r, significantDigits=d, minimumLength=0, leftJustified=true) | ||
| constant InstNode STRING_NODE = NFInstNode.CLASS_NODE("String", DUMMY_ELEMENT, | ||
| listArray({}), listArray({}), InstNode.EMPTY_NODE(), InstNodeType.NORMAL_CLASS()); | ||
|
|
||
| constant Function STRING_REAL = Function.FUNCTION(Path.IDENT("String"), | ||
| STRING_NODE, {REAL_PARAM, INT_PARAM, INT_PARAM, BOOL_PARAM}, {STRING_PARAM}, {}, { | ||
| Slot.SLOT("r", SlotType.POSITIONAL, NONE(), NONE()), | ||
| Slot.SLOT("significantDigits", SlotType.NAMED, SOME(Expression.INTEGER(6)), NONE()), | ||
| Slot.SLOT("minimumLength", SlotType.NAMED, SOME(Expression.INTEGER(0)), NONE()), | ||
| Slot.SLOT("leftJustified", SlotType.NAMED, SOME(Expression.BOOLEAN(true)), NONE()) | ||
| }, Type.STRING(), DAE.FUNCTION_ATTRIBUTES_BUILTIN, listArray({true})); | ||
|
|
||
| // String(r, format="-0.6g") | ||
| constant Function STRING_REAL_FORMAT = Function.FUNCTION(Path.IDENT("String"), | ||
| STRING_NODE, {REAL_PARAM, STRING_PARAM}, {STRING_PARAM}, {}, { | ||
| Slot.SLOT("r", SlotType.POSITIONAL, NONE(), NONE()), | ||
| Slot.SLOT("format", SlotType.NAMED, SOME(Expression.STRING("-0.6g")), NONE()) | ||
| }, Type.STRING(), DAE.FUNCTION_ATTRIBUTES_BUILTIN, listArray({true})); | ||
|
|
||
| // String(i, minimumLength=0, leftJustified=true) | ||
| constant Function STRING_INT = Function.FUNCTION(Path.IDENT("String"), | ||
| STRING_NODE, {INT_PARAM, INT_PARAM, BOOL_PARAM}, {STRING_PARAM}, {}, { | ||
| Slot.SLOT("i", SlotType.POSITIONAL, NONE(), NONE()), | ||
| Slot.SLOT("minimumLength", SlotType.NAMED, SOME(Expression.INTEGER(0)), NONE()), | ||
| Slot.SLOT("leftJustified", SlotType.NAMED, SOME(Expression.BOOLEAN(true)), NONE()) | ||
| }, Type.STRING(), DAE.FUNCTION_ATTRIBUTES_BUILTIN, listArray({true})); | ||
|
|
||
| // String(b, minimumLength=0, leftJustified=true) | ||
| constant Function STRING_BOOL = Function.FUNCTION(Path.IDENT("String"), | ||
| STRING_NODE, {BOOL_PARAM, INT_PARAM, BOOL_PARAM}, {STRING_PARAM}, {}, { | ||
| Slot.SLOT("b", SlotType.POSITIONAL, NONE(), NONE()), | ||
| Slot.SLOT("minimumLength", SlotType.NAMED, SOME(Expression.INTEGER(0)), NONE()), | ||
| Slot.SLOT("leftJustified", SlotType.NAMED, SOME(Expression.BOOLEAN(true)), NONE()) | ||
| }, Type.STRING(), DAE.FUNCTION_ATTRIBUTES_BUILTIN, listArray({true})); | ||
|
|
||
| // String(e, minimumLength=0, leftJustified=true) | ||
| constant Function STRING_ENUM = Function.FUNCTION(Path.IDENT("String"), | ||
| STRING_NODE, {ENUM_PARAM, INT_PARAM, BOOL_PARAM}, {STRING_PARAM}, {}, { | ||
| Slot.SLOT("e", SlotType.POSITIONAL, NONE(), NONE()), | ||
| Slot.SLOT("minimumLength", SlotType.NAMED, SOME(Expression.INTEGER(0)), NONE()), | ||
| Slot.SLOT("leftJustified", SlotType.NAMED, SOME(Expression.BOOLEAN(true)), NONE()) | ||
| }, Type.STRING(), DAE.FUNCTION_ATTRIBUTES_BUILTIN, listArray({true})); | ||
|
|
||
| annotation(__OpenModelica_Interface="frontend"); | ||
| end NFBuiltinFuncs; |
Oops, something went wrong.