More const fixes, refresh IR tests, handwrite some tests

Author: mlechu

README.md

@@ -28,7 +28,7 @@ This work is intended to
 
 Note this is a work in progress; many types of syntax are not yet handled.
 
-1. You need a 1.13.0-DEV build of Julia: At least 1.13.0-DEV.408. Commit `ff0a9313de` is currently known to work. Note that JuliaLowering relies on Julia internals and may be broken on the latest Julia dev version from time to time.
+1. You need a 1.13.0-DEV build of Julia: At least 1.13.0-DEV.408. Commit `3864b18af6` is currently known to work. Note that JuliaLowering relies on Julia internals and may be broken on the latest Julia dev version from time to time.
 2. Check out the main branch of [JuliaSyntax](https://github.com/JuliaLang/JuliaSyntax.jl)
 3. Get the latest version of [JuliaSyntaxFormatter](https://github.com/c42f/JuliaSyntaxFormatter.jl)
 4. Run the demo `include("test/demo.jl")`

src/desugaring.jl

@@ -1213,7 +1213,9 @@ function expand_assignment(ctx, ex, is_const=false)
             tmp_rhs = ssavar(ctx, rhs, "rhs")
             rr = tmp_rhs
         end
-        for i in 1:length(stmts)
+        # In const a = b = c, only a is const
+        stmts[1] = @ast ctx ex [(is_const ? K"constdecl" : K"=") stmts[1] rr]
+        for i in 2:length(stmts)
             stmts[i] = @ast ctx ex [K"=" stmts[i] rr]
         end
         if !isnothing(tmp_rhs)
@@ -1274,11 +1276,12 @@ function expand_assignment(ctx, ex, is_const=false)
         x = lhs[1]
         T = lhs[2]
         res = if is_const
-            expand_forms_2(ctx, ex, @ast ctx ex [
-                K"constdecl"
-                lhs[1]
-                convert_for_type_decl(ctx, ex, rhs, T, true)
-            ])
+            expand_forms_2(ctx, @ast ctx ex [
+                K"const"
+                [K"="
+                  lhs[1]
+                  convert_for_type_decl(ctx, ex, rhs, T, true)
+                 ]])
         elseif is_identifier_like(x)
             # Identifer in lhs[1] is a variable type declaration, eg
             # x::T = rhs
@@ -2190,7 +2193,7 @@ function expand_const_decl(ctx, ex)
     k = kind(ex[1])
     if numchildren(ex) == 2
         @ast ctx ex [
-            K"const"
+            K"constdecl"
             ex[1]
             expand_forms_2(ctx, ex[2])
         ]
@@ -2206,7 +2209,9 @@ function expand_const_decl(ctx, ex)
             expand_assignment(ctx, ex[1], true)
         ]
     elseif k == K"="
-        check_assignment(ex[1])
+        if numchildren(ex[1]) >= 1 && kind(ex[1][1]) == K"tuple"
+            throw(LoweringError(ex[1][1], "unsupported `const` tuple"))
+        end
         expand_assignment(ctx, ex[1], true)
     elseif k == K"local"
         throw(LoweringError(ex, "unsupported `const local` declaration"))

test/decls.jl

@@ -49,4 +49,18 @@ end
 @test Core.get_binding_type(test_mod, :a_typed_global_2) === Int
 @test test_mod.a_typed_global_2 === 10
 
+# Const and tuple assignments
+@test JuliaLowering.include_string(test_mod, "(a0, a1, a2) = [1,2,3]") == [1,2,3]
+
+@test JuliaLowering.include_string(test_mod, "const abc::Int = 9") === 9
+
+# redeclaration of the same value used to be allowed
+@test_throws ErrorException JuliaLowering.include_string(test_mod, "abc = 9")
+@test_throws ErrorException JuliaLowering.include_string(test_mod, "abc = 10")
+# redeclaration with const should be OK
+@test JuliaLowering.include_string(test_mod, "const abc::Int = 0") === 0
+
+# Unsupported for now
+@test_throws LoweringError JuliaLowering.include_string(test_mod, "const a,b,c = 1,2,3")
+
 end

test/decls_ir.jl

@@ -30,21 +30,59 @@ const xx = 10
 # Typed const
 const xx::T = 10
 #---------------------
-1   (globaldecl TestMod.xx TestMod.T)
-2   (latestworld)
-3   (globaldecl TestMod.xx)
+1   TestMod.T
+2   (= slot₁/tmp 10)
+3   slot₁/tmp
+4   (call core.isa %₃ %₁)
+5   (gotoifnot %₄ label₇)
+6   (goto label₁₀)
+7   slot₁/tmp
+8   (call top.convert %₁ %₇)
+9   (= slot₁/tmp (call core.typeassert %₈ %₁))
+10  slot₁/tmp
+11  (constdecl TestMod.xx %₁₀)
+12  (latestworld)
+13  (return %₁₀)
+
+########################################
+# Error: Const tuple
+const xxx,xxxx,xxxxx = 10,20,30
+#---------------------
+LoweringError:
+const xxx,xxxx,xxxxx = 10,20,30
+#    └─────────────┘ ── unsupported `const` tuple
+
+########################################
+# Const in chain: only first is const
+const c0 = v0 = v1 = 123
+#---------------------
+1   123
+2   (constdecl TestMod.c0 %₁)
+3   (globaldecl TestMod.v0)
 4   (latestworld)
-5   (call core.get_binding_type TestMod :xx)
-6   (= slot₁/tmp 10)
+5   (call core.get_binding_type TestMod :v0)
+6   (= slot₁/tmp %₁)
 7   slot₁/tmp
 8   (call core.isa %₇ %₅)
 9   (gotoifnot %₈ label₁₁)
 10  (goto label₁₃)
 11  slot₁/tmp
 12  (= slot₁/tmp (call top.convert %₅ %₁₁))
 13  slot₁/tmp
-14  (call top.setglobal! TestMod :xx %₁₃)
-15  (return 10)
+14  (call top.setglobal! TestMod :v0 %₁₃)
+15  (globaldecl TestMod.v1)
+16  (latestworld)
+17  (call core.get_binding_type TestMod :v1)
+18  (= slot₂/tmp %₁)
+19  slot₂/tmp
+20  (call core.isa %₁₉ %₁₇)
+21  (gotoifnot %₂₀ label₂₃)
+22  (goto label₂₅)
+23  slot₂/tmp
+24  (= slot₂/tmp (call top.convert %₁₇ %₂₃))
+25  slot₂/tmp
+26  (call top.setglobal! TestMod :v1 %₂₅)
+27  (return %₁)
 
 ########################################
 # Global assignment

test/misc_ir.jl

@@ -390,3 +390,12 @@ LoweringError:
 x...
 └──┘ ── `...` expression outside call
 
+########################################
+# `include` should increment world age
+include("hi.jl")
+#---------------------
+1   TestMod.include
+2   (call %₁ "hi.jl")
+3   (latestworld)
+4   (return %₂)
+