fixup! Revert to the use of StringMacroName/CmdMacroName kinds

Author: c42f

src/integration/expr.jl

@@ -348,7 +348,7 @@ end
     elseif k == K"macrocall"
         if length(args) >= 2
             a2 = args[2]
-            if @isexpr(a2, :macrocall) && kind(firstchildhead) == K"CmdMacroName"
+            if @isexpr(a2, :macrocall) && kind(firstchildhead) == K"MacroNameCmd"
                 # Fix up for custom cmd macros like foo`x`
                 args[2] = a2.args[3]
             end

src/julia/kinds.jl

@@ -196,8 +196,8 @@ register_kinds!(JuliaSyntax, 0, [
         "Placeholder" # Used for empty catch variables, and all-underscore identifiers in lowering
         # String and command macro names are modeled as a special kind of
         # identifier as they need to be mangled before lookup.
-        "StringMacroName"
-        "CmdMacroName"
+        "MacroNameStr"
+        "MacroNameCmd"
     "END_IDENTIFIERS"
 
     "BEGIN_KEYWORDS"
@@ -1108,8 +1108,8 @@ const _nonunique_kind_names = Set([
     K"Char"
     K"CmdString"
 
-    K"StringMacroName"
-    K"CmdMacroName"
+    K"MacroNameStr"
+    K"MacroNameCmd"
 ])
 
 """

src/julia/literal_parsing.jl

@@ -455,9 +455,9 @@ function lower_identifier_name(name::AbstractString, k::Kind)
     # Replicate eager lowering done by the flisp parser
     if k == K"macro_name"
         name == "." ? "@__dot__" : "@$name"
-    elseif k == K"StringMacroName"
+    elseif k == K"MacroNameStr"
         "@$(name)_str"
-    elseif k == K"CmdMacroName"
+    elseif k == K"MacroNameCmd"
         "@$(name)_cmd"
     else
         name

src/julia/parser.jl

@@ -1797,7 +1797,7 @@ function parse_call_chain(ps::ParseState, mark, is_macrocall=false)
             #
             # Use a special token kind for string and cmd macro names so the
             # names can be expanded later as necessary.
-            name_kind = is_string_delim(k) ? K"StringMacroName" : K"CmdMacroName"
+            name_kind = is_string_delim(k) ? K"MacroNameStr" : K"MacroNameCmd"
             reset_node!(ps, last_identifier_pos, kind=name_kind)
             parse_string(ps, true)
             t = peek_token(ps)

test/parser.jl

@@ -1170,8 +1170,8 @@ parsestmt_with_kind_tests = [
     ":+="    => "(quote-: +=::op=)"
     ":.+="   => "(quote-: (. +=::op=))"
     # str/cmd macro name kinds
-    "x\"str\""   => """(macrocall x::StringMacroName (string-r "str"::String))"""
-    "x`str`"     => """(macrocall x::CmdMacroName (cmdstring-r "str"::CmdString))"""
+    "x\"str\""   => """(macrocall x::MacroNameStr (string-r "str"::String))"""
+    "x`str`"     => """(macrocall x::MacroNameCmd (cmdstring-r "str"::CmdString))"""
 ]
 
 @testset "parser `Kind` remapping" begin