fix test, add test for different owner

doc/src/manual/variables-and-scoping.md

@@ -842,24 +842,15 @@ Stacktrace:
 The type does not need to be concrete, but annotations with abstract types typically have little
 performance benefit.
 
-As for constants, the type of a global is not typically meant to be redefined. In interactive usage,
-changing the annotation to a narrower type (the new type is a subtype of the previous type) is
-allowed, but can result in unexpected behavior in code that has already been compiled:
+Once a global has either been assigned to or its type has been set, the binding type is not allowed
+to change:
 
 ```jldoctest
-julia> global a::Integer
-
-julia> g() = a
-g (generic function with 1 method)
-
-julia> Base.return_types(g)
-1-element Vector{Any}:
- Integer
-
-julia> global a::Int
-WARNING: redefinition of type of a. This may fail, cause incorrect answers, or produce other errors.
+julia> x = 1
+1
 
-julia> Base.return_types(g)
-1-element Vector{Any}:
- Integer
+julia> global x::Int
+ERROR: cannot set type for global x. It already has a value or is already set to a different type.
+Stacktrace:
+[...]
 ```

test/syntax.jl

@@ -2420,9 +2420,9 @@ end
 @test_throws ParseError("extra token \"2\" after end of expression") Meta.parse("1#==# 2")
 
 @test size([1#==#2#==#3]) == size([1 2 3])
-@test size([1#==#2#==#3]) == size([1	2	3]) # tabs
-@test size([1#==#2#==#3]) == size([1	2 3]) # tabs and spaces
-@test size([1#==#2#==#3]) == size([1 2	3]) # tabs and spaces
+@test size([1#==#2#==#3]) == size([1    2   3]) # tabs
+@test size([1#==#2#==#3]) == size([1    2 3]) # tabs and spaces
+@test size([1#==#2#==#3]) == size([1 2  3]) # tabs and spaces
 @test [zeros(Int,2,2)#==#[1;2]
        [3#==#4]#==#5]          == [zeros(Int,2,2) [1; 2]
                                    [3 4]          5     ] == [0 0 1
@@ -3088,19 +3088,19 @@ end
 
 @test_throws ParseError Meta.parse("""
 function checkUserAccess(u::User)
-	if u.accessLevel != "user\u202e \u2066# users are not allowed\u2069\u2066"
-		return true
-	end
-	return false
+    if u.accessLevel != "user\u202e \u2066# users are not allowed\u2069\u2066"
+        return true
+    end
+    return false
 end
 """)
 
 @test_throws ParseError Meta.parse("""
 function checkUserAccess(u::User)
-	#=\u202e \u2066if (u.isAdmin)\u2069 \u2066 begin admins only =#
-		return true
-	#= end admin only \u202e \u2066end\u2069 \u2066=#
-	return false
+    #=\u202e \u2066if (u.isAdmin)\u2069 \u2066 begin admins only =#
+        return true
+    #= end admin only \u202e \u2066end\u2069 \u2066=#
+    return false
 end
 """)
 
@@ -3169,11 +3169,12 @@ end
     @test m.x === 2
     @test Base.return_types(m.g, ()) == [Int]
 
-    @test Meta.isexpr(Meta.@lower(function f()
+    m = Module()
+    @test_throws ErrorException @eval m function f()
         global x
         x::Int = 1
         x::Float64 = 2.
-    end), :error)
+    end
 
     m = Module()
     @test_throws ErrorException @eval m begin
@@ -3198,4 +3199,24 @@ end
         x = 1
         global x::Float64
     end
+
+    m = Module()
+    @test_throws ErrorException @eval m begin
+        x = 1
+        global x::Int
+    end
+
+    m = Module()
+    @eval m module Foo
+        export bar
+        bar = 1
+    end
+    @eval m begin
+        using .Foo
+        bar::Float64 = 2
+    end
+    @test m.bar === 2.0
+    @test Core.get_binding_type(m, :bar) == Float64
+    @test m.Foo.bar === 1
+    @test Core.get_binding_type(m.Foo, :bar) == Any
 end