Merge pull request #11148 from ihnorton/typeinfswap

timholy · timholy · commit 8a3d916127cc · 2015-05-06T09:28:23.000-05:00
Add jl_set_typeinf_func (replaces jl_enable_inference)
diff --git a/base/inference.jl b/base/inference.jl
@@ -3291,4 +3291,4 @@ end
 
 #tfunc(f,t) = methods(f,t)[1].func.code.tfunc
 
-ccall(:jl_enable_inference, Void, ())
+ccall(:jl_set_typeinf_func, Void, (Any,), typeinf_ext)
diff --git a/src/init.c b/src/init.c
@@ -1246,10 +1246,11 @@ DLLEXPORT void julia_save()
 
 jl_function_t *jl_typeinf_func=NULL;
 
-DLLEXPORT void jl_enable_inference(void)
+DLLEXPORT void jl_set_typeinf_func(jl_value_t* f)
 {
-    jl_typeinf_func = (jl_function_t*)jl_get_global(jl_base_module,
-                                                    jl_symbol("typeinf_ext"));
+    if (!jl_is_function(f))
+        jl_error("jl_set_typeinf_func must set a jl_function_t*");
+    jl_typeinf_func = (jl_function_t*)f;
 }
 
 static jl_value_t *core(char *name)

Original file line number	Diff line number	Diff line change
`@@ -3291,4 +3291,4 @@ end`
`3291`	`3291`
`3292`	`3292`	`#tfunc(f,t) = methods(f,t)[1].func.code.tfunc`
`3293`	`3293`
`3294`		`-ccall(:jl_enable_inference, Void, ())`
	`3294`	`+ccall(:jl_set_typeinf_func, Void, (Any,), typeinf_ext)`
Original file line number	Diff line number	Diff line change
`@@ -1246,10 +1246,11 @@ DLLEXPORT void julia_save()`
`1246`	`1246`
`1247`	`1247`	`jl_function_t *jl_typeinf_func=NULL;`
`1248`	`1248`
`1249`		`-DLLEXPORT void jl_enable_inference(void)`
	`1249`	`+DLLEXPORT void jl_set_typeinf_func(jl_value_t* f)`
`1250`	`1250`	`{`
`1251`		`- jl_typeinf_func = (jl_function_t*)jl_get_global(jl_base_module,`
`1252`		`- jl_symbol("typeinf_ext"));`
	`1251`	`+ if (!jl_is_function(f))`
	`1252`	`+ jl_error("jl_set_typeinf_func must set a jl_function_t*");`
	`1253`	`+ jl_typeinf_func = (jl_function_t*)f;`
`1253`	`1254`	`}`
`1254`	`1255`
`1255`	`1256`	`static jl_value_t core(char name)`