Apply suggestions from code review

Co-authored-by: Em Chu <[email protected]>

Author: c42f

src/kinds.jl

@@ -6,9 +6,6 @@ function _register_kinds()
         # expansion, and known to lowering. These are part of the AST API but
         # without having surface syntax.
         "BEGIN_EXTENSION_KINDS"
-            # Used for converting `esc()`'d expressions arising from old macro
-            # invocations during macro expansion
-            "escape"
             # atomic fields or accesses (see `@atomic`)
             "atomic"
             # Flag for @generated parts of a functon

src/macro_expansion.jl

@@ -315,10 +315,22 @@ function expand_forms_1(ctx::MacroExpansionContext, ex::SyntaxTree)
         expand_forms_1(ctx, ex[1])
     elseif k == K"escape"
         # For processing of old-style macros
+        @chk numchildren(ex) >= 1 "`escape` requires an argument"
+        if length(ctx.scope_layer_stack) === 1
+            throw(MacroExpansionError(ex, "`escape` node in outer context"))
+        end
         top_layer = pop!(ctx.scope_layer_stack)
         escaped_ex = expand_forms_1(ctx, ex[1])
         push!(ctx.scope_layer_stack, top_layer)
         escaped_ex
+    elseif k == K"hygienic_scope"
+        @chk numchildren(ex) >= 2 && ex[2].value isa Module "`hygienic_scope` requires an AST and a module"
+        new_layer = ScopeLayer(length(ctx.scope_layers)+1, ex[2].value, true)
+        push!(ctx.scope_layers, new_layer)
+        push!(ctx.scope_layer_stack, new_layer.id)
+        hyg_ex = expand_forms_1(ctx, ex[1])
+        pop!(ctx.scope_layer_stack)
+        hyg_ex
     elseif k == K"juxtapose"
         layerid = get(ex, :scope_layer, current_layer_id(ctx))
         @chk numchildren(ex) == 2

test/macros.jl

@@ -246,4 +246,27 @@ end
 @oldstyle_non_Expr
 """) === 42
 
+@testset "calling with old/new macro signatures" begin
+    # Old defined with 1 arg, new with 2 args, both with 3 (but with different values)
+    Base.eval(test_mod, :(macro sig_mismatch(x); x; end))
+    Base.eval(test_mod, :(macro sig_mismatch(x, y, z); z; end))
+    JuliaLowering.include_string(test_mod, "macro sig_mismatch(x, y); x; end")
+    JuliaLowering.include_string(test_mod, "macro sig_mismatch(x, y, z); x; end")
+
+    @test JuliaLowering.include_string(test_mod, "@sig_mismatch(1)") === 1
+    @test JuliaLowering.include_string(test_mod, "@sig_mismatch(1, 2)") === 1
+    @test JuliaLowering.include_string(test_mod, "@sig_mismatch(1, 2, 3)") === 1 # 3 if we prioritize old sig
+    err = try
+        JuliaLowering.include_string(test_mod, "@sig_mismatch(1, 2, 3, 4)") === 1
+    catch exc
+        sprint(showerror, exc)
+    end
+    @test startswith(err, """
+    MacroExpansionError while expanding @sig_mismatch in module Main.macros.test_mod:
+    @sig_mismatch(1, 2, 3, 4)
+    └───────────────────────┘ ── Error expanding macro
+    Caused by:
+    MethodError: no method matching var"@sig_mismatch"(::LineNumberNode, ::Module, ::Int64, ::Int64, ::Int64, ::Int64)
+    """)
+end
 end # module macros