Rename type to type_id

Author: topolarity

contrib/juliac/abi_export.jl

@@ -74,7 +74,7 @@ function emit_pointer_info!(ctx::TypeEmitter, @nospecialize(dt::DataType); inden
         indented_println("  \"id\": ", ctx.type_ids[dt], ",")
         indented_println("  \"kind\": \"pointer\",")
         indented_println("  \"name\": ", type_name_json(dt), ",")
-        indented_println("  \"pointee\": ", pointee_type_id)
+        indented_println("  \"pointee_type_id\": ", pointee_type_id)
         print(ctx.io, " " ^ indent, "}")
     end
 end
@@ -85,7 +85,7 @@ function emit_field_info!(ctx::TypeEmitter, @nospecialize(dt::DataType), field::
     print(ctx.io, " " ^ indent)
     print(ctx.io, "{")
     print(ctx.io, " \"name\": ", field_name_json(dt, field), ",")
-    print(ctx.io, " \"type\": ", type_id, ",")
+    print(ctx.io, " \"type_id\": ", type_id, ",")
     print(ctx.io, " \"offset\": ", desc.offset)
     print(ctx.io, " }")
 end
@@ -161,11 +161,11 @@ function emit_method_info!(ctx::TypeEmitter, method::Core.Method; indent::Int =
             print(ctx.io, " " ^ (indent + 4))
             print(ctx.io, "{")
             print(ctx.io, " \"name\": ", escape_string_json(argnames[i]), ",")
-            print(ctx.io, " \"type\": ", ctx.type_ids[sig.parameters[i]])
+            print(ctx.io, " \"type_id\": ", ctx.type_ids[sig.parameters[i]])
             println(ctx.io, i == length(sig.parameters) ? " }" : " },")
         end
         indented_println("  ],")
-        indented_println("  \"returns\": { \"type\": ", ctx.type_ids[rt], " }")
+        indented_println("  \"returns\": { \"type_id\": ", ctx.type_ids[rt], " }")
         print(ctx.io, " " ^ indent, "}")
     end
 end

test/trimming/trimming.jl

@@ -43,8 +43,8 @@ let exe_suffix = splitext(Base.julia_exename())[2]
     @test length(CVector_Float32["fields"]) == 2
     @test CVector_Float32["fields"][1]["offset"] == 0
     @test CVector_Float32["fields"][2]["offset"] == 8
-    @test abi["types"][CVector_Float32["fields"][1]["type"]]["name"] == "Int32"
-    @test abi["types"][CVector_Float32["fields"][2]["type"]]["name"] == "Ptr{Float32}"
+    @test abi["types"][CVector_Float32["fields"][1]["type_id"]]["name"] == "Int32"
+    @test abi["types"][CVector_Float32["fields"][2]["type_id"]]["name"] == "Ptr{Float32}"
     @test CVector_Float32["size"] == 16
 
     # `CVectorPair{Float32}` should have been exported with the correct info
@@ -53,7 +53,7 @@ let exe_suffix = splitext(Base.julia_exename())[2]
     @test length(CVectorPair_Float32["fields"]) == 2
     @test CVectorPair_Float32["fields"][1]["offset"] == 0
     @test CVectorPair_Float32["fields"][2]["offset"] == 16
-    @test abi["types"][CVectorPair_Float32["fields"][1]["type"]]["name"] == "CVector{Float32}"
-    @test abi["types"][CVectorPair_Float32["fields"][2]["type"]]["name"] == "CVector{Float32}"
+    @test abi["types"][CVectorPair_Float32["fields"][1]["type_id"]]["name"] == "CVector{Float32}"
+    @test abi["types"][CVectorPair_Float32["fields"][2]["type_id"]]["name"] == "CVector{Float32}"
     @test CVectorPair_Float32["size"] == 32
 end