Apply suggestions from code review

Author: mlechu

src/desugaring.jl

@@ -3251,21 +3251,21 @@ function expand_macro_def(ctx, ex)
     name = sig[1]
     args = remove_empty_parameters(children(sig))
     @chk kind(args[end]) != K"parameters" (args[end], "macros cannot accept keyword arguments")
+    scope_ref = kind(name) == K"." ? name[1] : name
     if ctx.expr_compat_mode
         @ast ctx ex [K"function"
             [K"call"(sig)
                 _make_macro_name(ctx, name)
                 [K"::"
-                    adopt_scope(@ast(ctx, sig, "__source__"::K"Identifier"),
-                                kind(name) == K"." ? name[1] : name)
+                    # TODO: should we be adopting the scope of the K"macro" expression itself?
+                    adopt_scope(@ast(ctx, sig, "__source__"::K"Identifier"), scope_ref)
                     LineNumberNode::K"Value"
                 ]
                 [K"::"
-                    adopt_scope(@ast(ctx, sig, "__module__"::K"Identifier"),
-                                kind(name) == K"." ? name[1] : name)
+                    adopt_scope(@ast(ctx, sig, "__module__"::K"Identifier"), scope_ref)
                     Module::K"Value"
                 ]
-                args[2:end]... # nospecialize?
+                map(e->_apply_nospecialize(ctx, e), args[2:end])...
             ]
             ex[2]
         ]
@@ -3274,8 +3274,7 @@ function expand_macro_def(ctx, ex)
             [K"call"(sig)
                 _make_macro_name(ctx, name)
                 [K"::"
-                    adopt_scope(@ast(ctx, sig, "__context__"::K"Identifier"),
-                                kind(name) == K"." ? name[1] : name)
+                    adopt_scope(@ast(ctx, sig, "__context__"::K"Identifier"), scope_ref)
                     MacroContext::K"Value"
                 ]
                 # flisp: We don't mark these @nospecialize because all arguments to
@@ -4509,7 +4508,12 @@ function expand_forms_2(ctx::DesugaringContext, ex::SyntaxTree, docs=nothing)
                 eval                  ::K"Value"
                 ctx.mod               ::K"Value"
                 [K"inert" ex]
-                ctx.expr_compat_mode  ::K"Bool"
+                [K"parameters"
+                    [K"="
+                        "expr_compat_mode"::K"Identifier"
+                        ctx.expr_compat_mode::K"Bool"
+                    ]
+                ]
             ]
         ]
     elseif k == K"vect"

src/eval.jl

@@ -344,12 +344,12 @@ end
 
 #-------------------------------------------------------------------------------
 # Our version of eval takes our own data structures
-function Core.eval(mod::Module, ex::SyntaxTree, expr_compat_mode::Bool=false)
+function Core.eval(mod::Module, ex::SyntaxTree; expr_compat_mode::Bool=false)
     k = kind(ex)
     if k == K"toplevel"
         x = nothing
         for e in children(ex)
-            x = eval(mod, e, expr_compat_mode)
+            x = eval(mod, e; expr_compat_mode)
         end
         return x
     end

src/macro_expansion.jl

@@ -68,7 +68,7 @@ function expand_quote(ctx, ex)
     # (ex, @HERE) ?
     @ast ctx ex [K"call"
         interpolate_ast::K"Value"
-        ctx.expr_compat_mode ? Expr::K"Value" : SyntaxTree::K"Value"
+        (ctx.expr_compat_mode ? Expr : SyntaxTree)::K"Value"
         [K"inert" ex]
         unquoted...
     ]

src/runtime.jl

@@ -109,6 +109,10 @@ function interpolate_ast(::Type{SyntaxTree}, ex, values...)
 end
 
 function interpolate_ast(::Type{Expr}, ex, values...)
+    # TODO: Adjust `_interpolated_value` to ensure that incoming `Expr` data
+    # structures are treated as AST in Expr compat mode, rather than `K"Value"`?
+    # Or convert `ex` to `Expr` early during lowering and implement
+    # `interpolate_ast` for `Expr`?
     Expr(interpolate_ast(SyntaxTree, ex, values...))
 end
 
@@ -175,7 +179,7 @@ function eval_module(parentmod, modname, expr_compat_mode, body)
     name = Symbol(modname)
     eval(parentmod, :(
         baremodule $name
-            $eval($name, $body, $expr_compat_mode)
+            $eval($name, $body; expr_compat_mode=$expr_compat_mode)
         end
     ))
 end