Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit d653ea8

Browse files
mahgeOpenModelica-Hudson
authored andcommitted
NFInst builtin function handling.
- 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]: - #2052 - OpenModelica/OpenModelica-testsuite#792
1 parent da629b0 commit d653ea8

File tree

8 files changed

+5022
-338
lines changed

8 files changed

+5022
-338
lines changed

Compiler/FFrontEnd/FBuiltin.mo

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,8 @@ public function getInitialFunctions
353353
protected
354354
String fileModelica,fileMetaModelica,fileParModelica,filePDEModelica;
355355
algorithm
356-
fileModelica := Settings.getInstallationDirectoryPath() + "/lib/omc/ModelicaBuiltin.mo";
356+
fileModelica := if Flags.isSet(Flags.SCODE_INST) then Settings.getInstallationDirectoryPath() + "/lib/omc/NFModelicaBuiltin.mo"
357+
else Settings.getInstallationDirectoryPath() + "/lib/omc/ModelicaBuiltin.mo";
357358
fileMetaModelica := Settings.getInstallationDirectoryPath() + "/lib/omc/MetaModelicaBuiltin.mo";
358359
fileParModelica := Settings.getInstallationDirectoryPath() + "/lib/omc/ParModelicaBuiltin.mo";
359360
filePDEModelica := Settings.getInstallationDirectoryPath() + "/lib/omc/PDEModelicaBuiltin.mo";

Compiler/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ endif
8181
$(SUSANMO): simcode
8282

8383
builtin:
84-
cp FrontEnd/ModelicaBuiltin.mo FrontEnd/MetaModelicaBuiltin.mo FrontEnd/PDEModelicaBuiltin.mo $(builddir_lib)
84+
cp FrontEnd/ModelicaBuiltin.mo FrontEnd/MetaModelicaBuiltin.mo NFFrontEnd/NFModelicaBuiltin.mo FrontEnd/PDEModelicaBuiltin.mo $(builddir_lib)
8585

8686
.PRECIOUS: Makefile
8787

Compiler/Makefile.omdev.mingw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,5 @@ endif
7878
$(SUSANMO): simcode
7979

8080
builtin:
81-
cp FrontEnd/ModelicaBuiltin.mo FrontEnd/MetaModelicaBuiltin.mo FrontEnd/PDEModelicaBuiltin.mo $(builddir_lib)
81+
cp FrontEnd/ModelicaBuiltin.mo FrontEnd/MetaModelicaBuiltin.mo NFFrontEnd/NFModelicaBuiltin.mo FrontEnd/PDEModelicaBuiltin.mo $(builddir_lib)
8282

0 commit comments

Comments
 (0)