Skip to content

Commit

Permalink
NFInst builtin function handling.
Browse files Browse the repository at this point in the history
   - Most builtin functions are now handled.
   - A new builtin file NFFrontEnd/NFModelicaBuiltin.mo
     is used by the new instantiation now.
   - Builtin functions are handled by a combination of
      - gnenric functions
      - overloading
      - and special intenral handling when needed.

   - Error messages need to be improved in a number of places.
   - There are some builting functions which will pass
     when not suppsoed to. The will be fixed.

Belonging to [master]:
  - OpenModelica/OMCompiler#2052
  - OpenModelica/OpenModelica-testsuite#792
  • Loading branch information
mahge authored and OpenModelica-Hudson committed Nov 28, 2017
1 parent da629b0 commit d653ea8
Show file tree
Hide file tree
Showing 8 changed files with 5,022 additions and 338 deletions.
3 changes: 2 additions & 1 deletion Compiler/FFrontEnd/FBuiltin.mo
Expand Up @@ -353,7 +353,8 @@ public function getInitialFunctions
protected
String fileModelica,fileMetaModelica,fileParModelica,filePDEModelica;
algorithm
fileModelica := Settings.getInstallationDirectoryPath() + "/lib/omc/ModelicaBuiltin.mo";
fileModelica := if Flags.isSet(Flags.SCODE_INST) then Settings.getInstallationDirectoryPath() + "/lib/omc/NFModelicaBuiltin.mo"
else Settings.getInstallationDirectoryPath() + "/lib/omc/ModelicaBuiltin.mo";
fileMetaModelica := Settings.getInstallationDirectoryPath() + "/lib/omc/MetaModelicaBuiltin.mo";
fileParModelica := Settings.getInstallationDirectoryPath() + "/lib/omc/ParModelicaBuiltin.mo";
filePDEModelica := Settings.getInstallationDirectoryPath() + "/lib/omc/PDEModelicaBuiltin.mo";
Expand Down
2 changes: 1 addition & 1 deletion Compiler/Makefile.in
Expand Up @@ -81,7 +81,7 @@ endif
$(SUSANMO): simcode

builtin:
cp FrontEnd/ModelicaBuiltin.mo FrontEnd/MetaModelicaBuiltin.mo FrontEnd/PDEModelicaBuiltin.mo $(builddir_lib)
cp FrontEnd/ModelicaBuiltin.mo FrontEnd/MetaModelicaBuiltin.mo NFFrontEnd/NFModelicaBuiltin.mo FrontEnd/PDEModelicaBuiltin.mo $(builddir_lib)

.PRECIOUS: Makefile

Expand Down
2 changes: 1 addition & 1 deletion Compiler/Makefile.omdev.mingw
Expand Up @@ -78,5 +78,5 @@ endif
$(SUSANMO): simcode

builtin:
cp FrontEnd/ModelicaBuiltin.mo FrontEnd/MetaModelicaBuiltin.mo FrontEnd/PDEModelicaBuiltin.mo $(builddir_lib)
cp FrontEnd/ModelicaBuiltin.mo FrontEnd/MetaModelicaBuiltin.mo NFFrontEnd/NFModelicaBuiltin.mo FrontEnd/PDEModelicaBuiltin.mo $(builddir_lib)

0 comments on commit d653ea8

Please sign in to comment.