Merge pull request #1 from adrpo/UseJuliaGCDuringParsing

Use julia gc during parsing
sjoelund · Aug 13, 2019 · 62b282d · 62b282d
2 parents 3b81a3a + 035be73
commit 62b282d
Show file tree

Hide file tree

Showing 5 changed files with 435 additions and 222 deletions.
diff --git a/OMCompiler/Parser/MetaModelicaJuliaLayer.c b/OMCompiler/Parser/MetaModelicaJuliaLayer.c
@@ -27,7 +27,7 @@ void OpenModelica_initMetaModelicaJuliaLayer()
   assert((omc_jl_listEmpty = jl_get_function(MetaModelicaModule, "listEmpty")));
   assert((omc_jl_isDerCref = jl_get_function(parserModule, "isDerCref")));
   assert((omc_jl_tuple2 = jl_get_function(jl_base_module, "tuple")));
-  assert((omc_jl_nil = jl_call0(jl_get_function(ListDefModule, "nil"))));
+  assert((omc_jl_nil = jl_get_global(ListDefModule, jl_symbol("nil"))));
 }
 
 void c_add_source_message(

diff --git a/OMCompiler/Parser/MetaModelicaJuliaLayer.h b/OMCompiler/Parser/MetaModelicaJuliaLayer.h
@@ -3,6 +3,8 @@
 
 #include <julia.h>
 
+#define jl_debug_println(X) jl_call1(jl_get_function(jl_base_module, "show"), (X));
+
 /* Note: These values may be garbage collected away? Call this before each file is parsed? */
 void OpenModelica_initMetaModelicaJuliaLayer();
 
@@ -85,6 +87,4 @@ static inline jl_value_t* or_nil(jl_value_t *value) {
   return value ? value : mmc_mk_nil();
 }
 
-#define jl_debug_println(X) jl_call1(jl_get_function(jl_base_module, "show"), (X));
-
 #endif