speed up is_exported_from_stdlib

JuliaLang · Sep 7, 2015 · c2d35bb · c2d35bb
1 parent 47f7b74
commit c2d35bb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/base/reflection.jl b/base/reflection.jl
@@ -31,6 +31,8 @@ names(m::Module, all::Bool, imported::Bool) = sort!(ccall(:jl_module_names, Arra
 names(m::Module, all::Bool) = names(m, all, false)
 names(m::Module) = names(m, false, false)
 
+isexported(m::Module, s::Symbol) = ccall(:jl_module_exports_p, Cint, (Any, Any), m, s)!=0
+
 function isbindingresolved(m::Module, var::Symbol)
     ccall(:jl_binding_resolved_p, Cint, (Any, Any), m, var) != 0
 end

diff --git a/base/show.jl b/base/show.jl
@@ -56,8 +56,7 @@ end
 
 # Check if a particular symbol is exported from a standard library module
 function is_exported_from_stdlib(name::Symbol, mod::Module)
-    if (mod === Base && name in names(Base)) ||
-       (mod === Core && name in names(Core))
+    if (mod === Base || mod === Core) && isexported(mod, name)
         return true
     end
     parent = module_parent(mod)

diff --git a/src/module.c b/src/module.c
@@ -413,6 +413,13 @@ int jl_defines_or_exports_p(jl_module_t *m, jl_sym_t *var)
     return (*bp)->exportp || (*bp)->owner==m;
 }
 
+DLLEXPORT int jl_module_exports_p(jl_module_t *m, jl_sym_t *var)
+{
+    jl_binding_t **bp = (jl_binding_t**)ptrhash_bp(&m->bindings, var);
+    if (*bp == HT_NOTFOUND) return 0;
+    return (*bp)->exportp;
+}
+
 int jl_binding_resolved_p(jl_module_t *m, jl_sym_t *var)
 {
     jl_binding_t **bp = (jl_binding_t**)ptrhash_bp(&m->bindings, var);