From b880e934f836741ce0a89cb3c6105930b215fe48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Cardeal=20da=20Natividade?= Date: Thu, 30 Jul 2015 07:17:30 -0300 Subject: [PATCH 1/2] rename `@remove` to `@removemeta` To keep it consistent --- README.md | 2 +- src/Dispatch/MetaUtilities.jl | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 93e73c4..fd2b9a2 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ using ExpressionPatterns.Dispatch.MetaUtilities @metaconflicts @f #> < > | < > -@remove @f(z,x+y) +@removemeta @f(z,x+y) @metaconflicts @f #> nothing diff --git a/src/Dispatch/MetaUtilities.jl b/src/Dispatch/MetaUtilities.jl index 71aaf98..b642bcf 100644 --- a/src/Dispatch/MetaUtilities.jl +++ b/src/Dispatch/MetaUtilities.jl @@ -5,7 +5,7 @@ using ...Dispatch.TopMetaTables import ...Dispatch.Applications: MACROMETHODS, METAFUNCTIONS import ...Dispatch.TableManipulation: print_conflicts import Base.Meta: quot -export @prefer, @whichmeta, @remove, @importmeta, @metamethods, @metaconflicts +export @prefer, @whichmeta, @removemeta, @importmeta, @metamethods, @metaconflicts const MU = MetaUtilities const MM = MACROMETHODS @@ -75,15 +75,15 @@ conflictscode(m, typ, M=current_module()) = # remove #---------------------------------------------------------------------------- -@macromethod remove( m(*{patterns})) = esc(removecode(m, patterns, :fun)) -@macromethod remove( M.m(*{patterns})) = esc(removecode(m, patterns, :fun, M)) -@macromethod remove( @m(*{patterns})) = esc(removecode(m, patterns, :macro)) -@macromethod remove(M.@m(*{patterns})) = esc(removecode(m, patterns, :macro, M)) +@macromethod removemeta( m(*{patterns})) = esc(removecode(m, patterns, :fun)) +@macromethod removemeta( M.m(*{patterns})) = esc(removecode(m, patterns, :fun, M)) +@macromethod removemeta( @m(*{patterns})) = esc(removecode(m, patterns, :macro)) +@macromethod removemeta(M.@m(*{patterns})) = esc(removecode(m, patterns, :macro, M)) -@macromethod remove(label, :L{from}, m) = esc(removecode(m, label, :fun)) -@macromethod remove(label, :L{from}, M.m) = esc(removecode(m, label, :fun, M)) -@macromethod remove(label, :L{from}, @m) = esc(removecode(m, label, :macro)) -@macromethod remove(label, :L{from}, M.@m) = esc(removecode(m, label, :macro, M)) +@macromethod removemeta(label, :L{from}, m) = esc(removecode(m, label, :fun)) +@macromethod removemeta(label, :L{from}, M.m) = esc(removecode(m, label, :fun, M)) +@macromethod removemeta(label, :L{from}, @m) = esc(removecode(m, label, :macro)) +@macromethod removemeta(label, :L{from}, M.@m) = esc(removecode(m, label, :macro, M)) #---------------------------------------------------------------------------- From 4fa31000595343d7eaabff73336d6a5af06d2e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Cardeal=20da=20Natividade?= Date: Thu, 30 Jul 2015 07:23:18 -0300 Subject: [PATCH 2/2] rename `@remove` in reflection tests --- test/reflection.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/reflection.jl b/test/reflection.jl index 24707ac..48fbf90 100644 --- a/test/reflection.jl +++ b/test/reflection.jl @@ -65,14 +65,14 @@ ypx = :(y+x) @test @h(x+y) == [:x, :y] @test h(:(x+y)) == [:x, :y] -@remove plus from @h -@remove plus from h +@removemeta plus from @h +@removemeta plus from h @test @h(x+y) == [:(x+y)] @test h(:(x+y)) == [:(x+y)] -@remove @h(x) -@remove h(x) +@removemeta @h(x) +@removemeta h(x) @test_throws MetaMethodError @eval @h(x) @test_throws MetaMethodError h(:x)