Remove a special case

No longer needed since we no longer put `global` or `local` forms back into the
     expand_forms machine.  Some error messages change slightly as a result.

Author: mlechu

src/desugaring.jl

@@ -4359,10 +4359,7 @@ function expand_forms_2(ctx::DesugaringContext, ex::SyntaxTree, docs=nothing)
     elseif k == K"const"
         expand_const_decl(ctx, ex)
     elseif k == K"local" || k == K"global"
-        if numchildren(ex) == 1 && kind(ex[1]) == K"Identifier"
-            # Don't recurse when already simplified - `local x`, etc
-            ex
-        elseif k == K"global" && kind(ex[1]) == K"const"
+        if k == K"global" && kind(ex[1]) == K"const"
             # Normalize `global const` to `const global`
             expand_const_decl(ctx, @ast ctx ex [K"const" [K"global" ex[1][1]]])
         else

test/scopes_ir.jl

@@ -276,7 +276,7 @@ LoweringError:
 let
     local x
     global x
-#   └──────┘ ── Variable `x` declared both local and global
+#          ╙ ── Variable `x` declared both local and global
 end
 
 ########################################
@@ -288,7 +288,7 @@ end
 LoweringError:
 function f(x)
     local x
-#   └─────┘ ── local variable name `x` conflicts with an argument
+#         ╙ ── local variable name `x` conflicts with an argument
 end
 
 ########################################
@@ -300,7 +300,7 @@ end
 LoweringError:
 function f(x)
     global x
-#   └──────┘ ── global variable name `x` conflicts with an argument
+#          ╙ ── global variable name `x` conflicts with an argument
 end
 
 ########################################
@@ -313,7 +313,7 @@ end
 LoweringError:
 function f((x,))
     global x
-#   └──────┘ ── Variable `x` declared both local and global
+#          ╙ ── Variable `x` declared both local and global
 end
 
 ########################################
@@ -325,7 +325,7 @@ end
 LoweringError:
 function f(::T) where T
     local T
-#   └─────┘ ── local variable name `T` conflicts with a static parameter
+#         ╙ ── local variable name `T` conflicts with a static parameter
 end
 
 ########################################
@@ -337,7 +337,7 @@ end
 LoweringError:
 function f(::T) where T
     global T
-#   └──────┘ ── global variable name `T` conflicts with a static parameter
+#          ╙ ── global variable name `T` conflicts with a static parameter
 end
 
 ########################################
@@ -352,7 +352,7 @@ LoweringError:
 function f(::T) where T
     let
         local T
-#       └─────┘ ── local variable name `T` conflicts with a static parameter
+#             ╙ ── local variable name `T` conflicts with a static parameter
     end
 end
 
@@ -368,7 +368,7 @@ LoweringError:
 function f(::T) where T
     let
         global T
-#       └──────┘ ── global variable name `T` conflicts with a static parameter
+#              ╙ ── global variable name `T` conflicts with a static parameter
     end
 end