clean up deprecated

JuliaLang · Jul 10, 2015 · 7682f91 · 7682f91
1 parent b7d7716
commit 7682f91
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -18,6 +18,8 @@
 # the name of the function, which is used to ensure that the deprecation warning
 # is only printed the first time for each call place.
 
+using Base.Meta
+
 macro deprecate(old,new)
     meta = Expr(:meta, :noinline)
     if isa(old,Symbol)
@@ -34,13 +36,8 @@ macro deprecate(old,new)
     elseif isa(old,Expr) && old.head == :call
         oldcall = sprint(io->show_unquoted(io,old))
         newcall = sprint(io->show_unquoted(io,new))
-        oldsym = if isa(old.args[1],Symbol)
-            old.args[1]
-        elseif isa(old.args[1],Expr) && old.args[1].head == :curly
-            old.args[1].args[1]
-        else
-            error("invalid usage of @deprecate")
-        end
+        oldsym = uncurly(old.args[1])
+        isa(oldsym, Symbol) || error("invalid usage of @deprecate")
         oldname = Expr(:quote, oldsym)
         Expr(:toplevel,
             Expr(:export,esc(oldsym)),