Fix X.at-y do parsing on 1.8+

Author: pfitzseb

src/components/keywords.jl

@@ -246,7 +246,7 @@ function parse_blockexpr_sig(ps::ParseState, head)
         if isendoflinews(ps.ws)
             return EXPR(:block, EXPR[], nothing)
         else
-            arg = @closer ps :comma @closer ps :ws  parse_expression(ps)
+            arg = @closer ps :comma @closer ps :ws parse_expression(ps)
             if iscomma(ps.nt) || !(is_wrapped_assignment(arg) || isidentifier(arg))
                 arg = EXPR(:block, EXPR[arg])
                 prevpos = position(ps)
@@ -289,6 +289,7 @@ end
 function parse_do(ps::ParseState, pre::EXPR)
     args, trivia = EXPR[pre], EXPR[EXPR(next(ps))]
     args1, trivia1 = EXPR[], EXPR[]
+
     @closer ps :comma @closer ps :block while !closer(ps)
         push!(args1, @closer ps :ws a = parse_expression(ps))
         if kindof(ps.nt) === Tokens.COMMA

src/components/operators.jl

@@ -370,6 +370,15 @@ function parse_operator_where(ps::ParseState, ret::EXPR, op::EXPR, setscope=true
     return ret
 end
 
+function rewrite_macrocall_quotenode(op, ret, nextarg)
+    mname = EXPR(op, EXPR[ret, EXPR(:quotenode, EXPR[nextarg.args[1]], nothing)], nothing)
+    ret = EXPR(:macrocall, EXPR[mname], nextarg.trivia)
+    for i = 2:length(nextarg.args)
+        push!(ret, nextarg.args[i])
+    end
+    return ret
+end
+
 function parse_operator_dot(ps::ParseState, ret::EXPR, op::EXPR)
     if kindof(ps.nt) === Tokens.LPAREN
         @static if VERSION > v"1.1-"
@@ -405,9 +414,11 @@ function parse_operator_dot(ps::ParseState, ret::EXPR, op::EXPR)
     elseif headof(nextarg) === :vect || headof(nextarg) === :braces
         ret = EXPR(op, EXPR[ret, EXPR(:quote, EXPR[nextarg], nothing)], nothing)
     elseif headof(nextarg) === :macrocall
-        # TODO : ?
-        mname = EXPR(op, EXPR[ret, EXPR(:quotenode, EXPR[nextarg.args[1]], nothing)], nothing)
-        ret = EXPR(:macrocall, EXPR[mname], nextarg.trivia)
+        ret = rewrite_macrocall_quotenode(op, ret, nextarg)
+    elseif VERSION >= v"1.8.0-" && headof(nextarg) === :do && headof(nextarg.args[1]) === :macrocall
+        mcall = rewrite_macrocall_quotenode(op, ret, nextarg.args[1])
+
+        ret = EXPR(:do, EXPR[mcall], nextarg.trivia)
         for i = 2:length(nextarg.args)
             push!(ret, nextarg.args[i])
         end

test/parser.jl

@@ -454,6 +454,11 @@ end
         @test "@sprintf(\"%08d\", id)" |> test_expr
         @test "[@m @n a for a in A]" |> test_expr # ensure closer.insquare propogates
         @test CSTParser.parse("@__DIR__\n\nx", true)[1].span == 8
+
+        if VERSION >= v"1.8.0-"
+            @test "M43018.@test43018() do; end" |> test_expr
+            @test "@M43018.test43018() do; end" |> test_expr
+        end
     end
 
     @testset "Square " begin