Skip to content

Commit

Permalink
fix cross-module eval precompile warning
Browse files Browse the repository at this point in the history
samoconnor committed Dec 30, 2015
1 parent a8b4e3d commit d8f5bf3
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/SymDict.jl
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ macro SymDict(args...)
end
# Convert key from string to symbol if needed...
if !isa(a.args[1], Symbol)
a.args[1] = eval(:(symbol($(a.args[1]))))
a.args[1] = current_module().eval(:(symbol($(a.args[1]))))
end
a.head = :kw
a.args[2] = esc(a.args[2])
@@ -89,9 +89,13 @@ Base.merge!{V}(d::Dict{Symbol,V}; args...) = merge!(d, Dict{Symbol,V}(args))

Base.merge(d::Dict{ASCIIString,Any}) = d
Base.merge(d::Dict{ASCIIString,Any}, p::Pair...) = merge(d, Dict(p))
Base.merge!(d::Dict{ASCIIString,Any}) = d
Base.merge!(d::Dict{ASCIIString,Any}, p::Pair...) = merge!(d, Dict(p))

Base.merge{K,V}(d::Dict{K,V}) = d
Base.merge{K,V}(d::Dict{K,V}, p::Pair{K,V}...) = merge(d, Dict{K,V}(p))
Base.merge!{K,V}(d::Dict{K,V}) = d
Base.merge!{K,V}(d::Dict{K,V}, p::Pair{K,V}...) = merge!(d, Dict{K,V}(p))


# Return default is there is no dictionary.

0 comments on commit d8f5bf3

Please sign in to comment.