kumi 0.0.25 → 0.0.27

data/golden/min_reduce_scope/expected/nast.txt

@@ -1,12 +1,12 @@
 (NAST
   (VALUE dept_total
-    (Call :"agg.sum"
+    (Call :sum
     (InputRef [:depts, :dept, :teams, :team, :headcount])
   )
   )
   (VALUE company_total
-    (Call :"agg.sum"
-    (Call :"agg.sum"
+    (Call :sum
+    (Call :sum
       (InputRef [:depts, :dept, :teams, :team, :headcount])
     )
   )

data/golden/min_reduce_scope/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_e5612f974eced7c5db52fb03f8ecfd82174c52d530c1f073b180f04d7d4b5886
+module Kumi::Compiled::KUMI_b74a41d0d85c1aa450f7dce23ed22ccfcaf13c330101f5c7ee3f7bc4f4c8b5f4
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)

data/golden/min_reduce_scope/expected/snast.txt

@@ -11,7 +11,7 @@
       ) :: [depts] -> integer
     ) :: [] -> integer
   ) :: [] -> integer
-  (TRAIT big_team
+  (VALUE big_team
     (Call :core.gt
       (InputRef depts.dept.teams.team.headcount key_chain=[]) :: [depts, teams] -> integer
       (Const 10) :: [] -> integer

data/golden/mixed_dimensions/expected/nast.txt

@@ -1,11 +1,11 @@
 (NAST
   (VALUE sum_numbers
-    (Call :"agg.sum"
+    (Call :sum
     (InputRef [:numbers, :num, :value])
   )
   )
   (VALUE matrix_sums
-    (Call :"agg.sum"
+    (Call :sum
     (InputRef [:matrix, :m, :row, :r, :cell])
   )
   )

data/golden/mixed_dimensions/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_bbe68fd87d3413dc8dc47548ccbe52c6bf4a9912417fdfc1a4c2fd87cd576fd9
+module Kumi::Compiled::KUMI_a97fe62e81ba9ee34e23cf45b64886d02e7547bbc48b5bebd1869492d71c1aa8
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)

data/golden/multirank_hoisting/expected/nast.txt

@@ -1,25 +1,25 @@
 (NAST
   (VALUE global_offset_plus
-    (Call :"core.add"
+    (Call :add
     (InputRef [:global_offset])
     (Const 1.0)
   )
   )
   (VALUE batch_bias
-    (Call :"core.add"
+    (Call :add
     (InputRef [:batch, :b, :mean])
     (Ref global_offset_plus)
   )
   )
   (VALUE row_scale2
-    (Call :"core.mul"
+    (Call :multiply
     (InputRef [:batch, :b, :row, :r, :scale])
     (Const 2.0)
   )
   )
   (VALUE elem_affine
-    (Call :"core.add"
-    (Call :"core.mul"
+    (Call :add
+    (Call :multiply
       (InputRef [:batch, :b, :row, :r, :col, :c, :val])
       (Ref row_scale2)
     )
@@ -27,12 +27,12 @@
   )
   )
   (VALUE row_sum_affine
-    (Call :"agg.sum"
+    (Call :sum
     (Ref elem_affine)
   )
   )
   (VALUE batch_total_affine
-    (Call :"agg.sum"
+    (Call :sum
     (Ref row_sum_affine)
   )
   )

data/golden/multirank_hoisting/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_7493f45c6a56b6958f928d8337e155ecf85850b56acef5a72dee8f1f697d1aac
+module Kumi::Compiled::KUMI_eb3b4d06e6af40ce1803535148d7d8e97065abfc8e4186fd66437ebb384ab54f
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)

data/golden/nested_hash/expected/nast.txt

@@ -1,6 +1,6 @@
 (NAST
   (VALUE double
-    (Call :"core.mul"
+    (Call :multiply
     (InputRef [:x, :y, :z])
     (Const 2)
   )

data/golden/nested_hash/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_06206c81b13d30ba2dfe33471a73d550acd8ceaaed39c3bc060cd965ef719e19
+module Kumi::Compiled::KUMI_ad29cac793fb49736b0ba445da6c4c0761ee9fc79fde4b64eeff0a668781e9a5
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)

data/golden/reduction_broadcast/expected/nast.txt

@@ -1,16 +1,16 @@
 (NAST
   (VALUE dept_headcount
-    (Call :"agg.sum"
+    (Call :sum
     (InputRef [:departments, :dept, :teams, :team, :headcount])
   )
   )
   (VALUE teams_per_dept
-    (Call :"agg.count"
+    (Call :count
     (InputRef [:departments, :dept, :teams, :team, :team_name])
   )
   )
   (VALUE avg_headcount_per_dept
-    (Call :"core.div"
+    (Call :divide
     (Ref dept_headcount)
     (Ref teams_per_dept)
   )

data/golden/reduction_broadcast/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_798dac22208bafc0f2b7f93d43bef5ae4c1d550f52f4c3773c486db02058561a
+module Kumi::Compiled::KUMI_6acd7e7a86400b5713bb861b265bd71ca0409744e38f91750bf81b1c8cc7b4f7
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)

data/golden/reduction_broadcast/expected/snast.txt

@@ -15,7 +15,7 @@
       (Ref teams_per_dept) :: [departments] -> integer
     ) :: [departments] -> float
   ) :: [departments] -> float
-  (TRAIT is_above_average_team
+  (VALUE is_above_average_team
     (Call :core.gt
       (InputRef departments.dept.teams.team.headcount key_chain=[]) :: [departments, teams] -> integer
       (Ref avg_headcount_per_dept) :: [departments] -> float

data/golden/roll/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_db1001d7afa366cbc106f0cd804e44bfabd8a08bfd109b89c3fd14e89d14266b
+module Kumi::Compiled::KUMI_bf0841514d27c68c3a5223b5c9e5625080c4342efd1141ccce1a07b41457e613
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)

data/golden/shift/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_79b1226afef716b18baad35a6809f5d0b953aec078c87883fca2ae4c23029fe4
+module Kumi::Compiled::KUMI_5e5c116e1acd27deccebcb9ab5ef133223c7005d86584465d3160f569d3c6a9b
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)

data/golden/shift_2d/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_e33b43acb8aa4e0f0d667f040c07607dbc78bfc52c9993108d5fcfff1f5fb47a
+module Kumi::Compiled::KUMI_949d31a31d5b9027826a4d9e0ac0f4f7cf7ec0cf26a2a52a7da7dc7b6de71a1f
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)

data/golden/simple_math/expected/lir_00_unoptimized.txt

@@ -25,7 +25,7 @@
     %t14 = load_input "y" :: integer
     %t15 = const 2 :: integer
     %t16 = call core.mul(%t14, %t15) :: integer
-    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer>
+    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer, integer, integer>
     yield %t17
   )
 )

data/golden/simple_math/expected/lir_01_hoist_scalar_references.txt

@@ -25,7 +25,7 @@
     %t14 = load_input "y" :: integer
     %t15 = const 2 :: integer
     %t16 = call core.mul(%t14, %t15) :: integer
-    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer>
+    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer, integer, integer>
     yield %t17
   )
 )

data/golden/simple_math/expected/lir_02_inlined.txt

@@ -25,7 +25,7 @@
     %t14 = load_input "y" :: integer
     %t15 = const 2 :: integer
     %t16 = call core.mul(%t14, %t15) :: integer
-    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer>
+    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer, integer, integer>
     yield %t17
   )
 )

data/golden/simple_math/expected/lir_03_cse.txt

@@ -25,7 +25,7 @@
     %t14 = load_input "y" :: integer
     %t15 = const 2 :: integer
     %t16 = call core.mul(%t14, %t15) :: integer
-    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer>
+    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer, integer, integer>
     yield %t17
   )
 )

data/golden/simple_math/expected/lir_04_1_loop_fusion.txt

@@ -25,7 +25,7 @@
     %t14 = load_input "y" :: integer
     %t15 = const 2 :: integer
     %t16 = call core.mul(%t14, %t15) :: integer
-    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer>
+    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer, integer, integer>
     yield %t17
   )
 )

data/golden/simple_math/expected/lir_04_loop_invcm.txt

@@ -25,7 +25,7 @@
     %t14 = load_input "y" :: integer
     %t15 = const 2 :: integer
     %t16 = call core.mul(%t14, %t15) :: integer
-    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer>
+    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer, integer, integer>
     yield %t17
   )
 )

data/golden/simple_math/expected/lir_06_const_prop.txt

@@ -25,7 +25,7 @@
     %t14 = load_input "y" :: integer
     %t15 = const 2 :: integer
     %t16 = call core.mul(%t14, %t15) :: integer
-    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer>
+    %t17 = make_tuple(%t10, %t13, %t16) :: tuple<integer, integer, integer>
     yield %t17
   )
 )

data/golden/simple_math/expected/nast.txt

@@ -1,18 +1,18 @@
 (NAST
   (VALUE sum
-    (Call :"core.add"
+    (Call :add
     (InputRef [:x])
     (InputRef [:y])
   )
   )
   (VALUE product
-    (Call :"core.mul"
+    (Call :multiply
     (InputRef [:x])
     (InputRef [:y])
   )
   )
   (VALUE difference
-    (Call :"core.sub"
+    (Call :subtract
     (InputRef [:x])
     (InputRef [:y])
   )
@@ -20,11 +20,11 @@
   (VALUE results_array
     (Tuple
     (Const 1)
-    (Call :"core.add"
+    (Call :add
       (InputRef [:x])
       (Const 10)
     )
-    (Call :"core.mul"
+    (Call :multiply
       (InputRef [:y])
       (Const 2)
     )

data/golden/simple_math/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_02882cbdd43383967e13d4c1a8f79cc5045859736335a160b1210f35f11b9f0f
+module Kumi::Compiled::KUMI_01c25ad1ae3550b0c23581f73407635ef18b1b5947933fe2edfdcbcef3253d37
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)

data/golden/simple_math/expected/snast.txt

@@ -28,6 +28,6 @@
         (InputRef y key_chain=[]) :: [] -> integer
         (Const 2) :: [] -> integer
       ) :: [] -> integer
-    ) :: [] -> tuple<integer>
-  ) :: [] -> tuple<integer>
+    ) :: [] -> tuple<integer, integer, integer>
+  ) :: [] -> tuple<integer, integer, integer>
 )

data/golden/streaming_basics/expected/nast.txt

@@ -1,14 +1,14 @@
 (NAST
   (VALUE items_subtotal
-    (Call :"core.mul"
+    (Call :multiply
     (InputRef [:items, :item, :price])
     (InputRef [:items, :item, :qty])
   )
   )
   (VALUE items_discounted
-    (Call :"core.mul"
+    (Call :multiply
     (InputRef [:items, :item, :price])
-    (Call :"core.sub"
+    (Call :subtract
       (Const 1.0)
       (InputRef [:discount])
     )
@@ -21,9 +21,9 @@
   )
   )
   (VALUE items_effective
-    (Call :__select__
+    (Call :select
     (Ref items_is_big)
-    (Call :"core.mul"
+    (Call :multiply
       (Ref items_subtotal)
       (Const 0.9)
     )
@@ -31,17 +31,17 @@
   )
   )
   (VALUE total_qty
-    (Call :"agg.sum"
+    (Call :sum
     (InputRef [:items, :item, :qty])
   )
   )
   (VALUE cart_total
-    (Call :"agg.sum"
+    (Call :sum
     (Ref items_subtotal)
   )
   )
   (VALUE cart_total_effective
-    (Call :"agg.sum"
+    (Call :sum
     (Ref items_effective)
   )
   )

data/golden/streaming_basics/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_e64045903bee1b6a265ef34019b7aa91333ec110e041bb47e8350de13c0fa435
+module Kumi::Compiled::KUMI_e1cf5a39d9cce72668a167abe6fc8f84c427d0b38cc7759c0447e7822c722a43
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)

data/golden/streaming_basics/expected/snast.txt

@@ -14,7 +14,7 @@
       ) :: [] -> float
     ) :: [items] -> float
   ) :: [items] -> float
-  (TRAIT items_is_big
+  (VALUE items_is_big
     (Call :core.gt
       (InputRef items.item.price key_chain=[]) :: [items] -> float
       (Const 100.0) :: [] -> float

data/golden/tuples/expected/lir_00_unoptimized.txt

@@ -4,11 +4,11 @@
     %t2 = const 2 :: integer
     %t3 = const 3 :: integer
     %t4 = load_input "x" :: integer
-    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer>
+    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer, integer, integer, integer>
     yield %t5
   )
   (Declaration max_1
-    %t6 = load_decl tuple :: tuple<integer>
+    %t6 = load_decl tuple :: tuple<integer, integer, integer, integer>
     %t7 = fold %t6 fn="agg.max" :: integer
     yield %t7
   )
@@ -18,12 +18,12 @@
     %t10 = const 3 :: integer
     %t11 = load_input "x" :: integer
     %t12 = const 1000 :: integer
-    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer>
+    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer, integer, integer, integer, integer>
     %t14 = fold %t13 fn="agg.max" :: integer
     yield %t14
   )
   (Declaration min_1
-    %t15 = load_decl tuple :: tuple<integer>
+    %t15 = load_decl tuple :: tuple<integer, integer, integer, integer>
     %t16 = fold %t15 fn="agg.min" :: integer
     yield %t16
   )
@@ -33,7 +33,7 @@
     %t19 = const 3 :: integer
     %t20 = load_input "x" :: integer
     %t21 = const -100 :: integer
-    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer>
+    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer, integer, integer, integer, integer>
     %t23 = fold %t22 fn="agg.min" :: integer
     yield %t23
   )

data/golden/tuples/expected/lir_01_hoist_scalar_references.txt

@@ -4,11 +4,11 @@
     %t2 = const 2 :: integer
     %t3 = const 3 :: integer
     %t4 = load_input "x" :: integer
-    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer>
+    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer, integer, integer, integer>
     yield %t5
   )
   (Declaration max_1
-    %t6 = load_decl tuple :: tuple<integer>
+    %t6 = load_decl tuple :: tuple<integer, integer, integer, integer>
     %t7 = fold %t6 fn="agg.max" :: integer
     yield %t7
   )
@@ -18,12 +18,12 @@
     %t10 = const 3 :: integer
     %t11 = load_input "x" :: integer
     %t12 = const 1000 :: integer
-    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer>
+    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer, integer, integer, integer, integer>
     %t14 = fold %t13 fn="agg.max" :: integer
     yield %t14
   )
   (Declaration min_1
-    %t15 = load_decl tuple :: tuple<integer>
+    %t15 = load_decl tuple :: tuple<integer, integer, integer, integer>
     %t16 = fold %t15 fn="agg.min" :: integer
     yield %t16
   )
@@ -33,7 +33,7 @@
     %t19 = const 3 :: integer
     %t20 = load_input "x" :: integer
     %t21 = const -100 :: integer
-    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer>
+    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer, integer, integer, integer, integer>
     %t23 = fold %t22 fn="agg.min" :: integer
     yield %t23
   )

data/golden/tuples/expected/lir_02_inlined.txt

@@ -4,7 +4,7 @@
     %t2 = const 2 :: integer
     %t3 = const 3 :: integer
     %t4 = load_input "x" :: integer
-    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer>
+    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer, integer, integer, integer>
     yield %t5
   )
   (Declaration max_1
@@ -12,7 +12,7 @@
     %t25 = const 2 :: integer
     %t26 = const 3 :: integer
     %t27 = load_input "x" :: integer
-    %t28 = make_tuple(%t24, %t25, %t26, %t27) :: tuple<integer>
+    %t28 = make_tuple(%t24, %t25, %t26, %t27) :: tuple<integer, integer, integer, integer>
     %t7 = fold %t28 fn="agg.max" :: integer
     yield %t7
   )
@@ -22,7 +22,7 @@
     %t10 = const 3 :: integer
     %t11 = load_input "x" :: integer
     %t12 = const 1000 :: integer
-    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer>
+    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer, integer, integer, integer, integer>
     %t14 = fold %t13 fn="agg.max" :: integer
     yield %t14
   )
@@ -31,7 +31,7 @@
     %t30 = const 2 :: integer
     %t31 = const 3 :: integer
     %t32 = load_input "x" :: integer
-    %t33 = make_tuple(%t29, %t30, %t31, %t32) :: tuple<integer>
+    %t33 = make_tuple(%t29, %t30, %t31, %t32) :: tuple<integer, integer, integer, integer>
     %t16 = fold %t33 fn="agg.min" :: integer
     yield %t16
   )
@@ -41,7 +41,7 @@
     %t19 = const 3 :: integer
     %t20 = load_input "x" :: integer
     %t21 = const -100 :: integer
-    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer>
+    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer, integer, integer, integer, integer>
     %t23 = fold %t22 fn="agg.min" :: integer
     yield %t23
   )

data/golden/tuples/expected/lir_03_cse.txt

@@ -4,7 +4,7 @@
     %t2 = const 2 :: integer
     %t3 = const 3 :: integer
     %t4 = load_input "x" :: integer
-    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer>
+    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer, integer, integer, integer>
     yield %t5
   )
   (Declaration max_1
@@ -12,7 +12,7 @@
     %t25 = const 2 :: integer
     %t26 = const 3 :: integer
     %t27 = load_input "x" :: integer
-    %t28 = make_tuple(%t24, %t25, %t26, %t27) :: tuple<integer>
+    %t28 = make_tuple(%t24, %t25, %t26, %t27) :: tuple<integer, integer, integer, integer>
     %t7 = fold %t28 fn="agg.max" :: integer
     yield %t7
   )
@@ -22,7 +22,7 @@
     %t10 = const 3 :: integer
     %t11 = load_input "x" :: integer
     %t12 = const 1000 :: integer
-    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer>
+    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer, integer, integer, integer, integer>
     %t14 = fold %t13 fn="agg.max" :: integer
     yield %t14
   )
@@ -31,7 +31,7 @@
     %t30 = const 2 :: integer
     %t31 = const 3 :: integer
     %t32 = load_input "x" :: integer
-    %t33 = make_tuple(%t29, %t30, %t31, %t32) :: tuple<integer>
+    %t33 = make_tuple(%t29, %t30, %t31, %t32) :: tuple<integer, integer, integer, integer>
     %t16 = fold %t33 fn="agg.min" :: integer
     yield %t16
   )
@@ -41,7 +41,7 @@
     %t19 = const 3 :: integer
     %t20 = load_input "x" :: integer
     %t21 = const -100 :: integer
-    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer>
+    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer, integer, integer, integer, integer>
     %t23 = fold %t22 fn="agg.min" :: integer
     yield %t23
   )

data/golden/tuples/expected/lir_04_1_loop_fusion.txt

@@ -4,7 +4,7 @@
     %t2 = const 2 :: integer
     %t3 = const 3 :: integer
     %t4 = load_input "x" :: integer
-    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer>
+    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer, integer, integer, integer>
     yield %t5
   )
   (Declaration max_1
@@ -12,7 +12,7 @@
     %t25 = const 2 :: integer
     %t26 = const 3 :: integer
     %t27 = load_input "x" :: integer
-    %t28 = make_tuple(%t24, %t25, %t26, %t27) :: tuple<integer>
+    %t28 = make_tuple(%t24, %t25, %t26, %t27) :: tuple<integer, integer, integer, integer>
     %t7 = fold %t28 fn="agg.max" :: integer
     yield %t7
   )
@@ -22,7 +22,7 @@
     %t10 = const 3 :: integer
     %t11 = load_input "x" :: integer
     %t12 = const 1000 :: integer
-    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer>
+    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer, integer, integer, integer, integer>
     %t14 = fold %t13 fn="agg.max" :: integer
     yield %t14
   )
@@ -31,7 +31,7 @@
     %t30 = const 2 :: integer
     %t31 = const 3 :: integer
     %t32 = load_input "x" :: integer
-    %t33 = make_tuple(%t29, %t30, %t31, %t32) :: tuple<integer>
+    %t33 = make_tuple(%t29, %t30, %t31, %t32) :: tuple<integer, integer, integer, integer>
     %t16 = fold %t33 fn="agg.min" :: integer
     yield %t16
   )
@@ -41,7 +41,7 @@
     %t19 = const 3 :: integer
     %t20 = load_input "x" :: integer
     %t21 = const -100 :: integer
-    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer>
+    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer, integer, integer, integer, integer>
     %t23 = fold %t22 fn="agg.min" :: integer
     yield %t23
   )

data/golden/tuples/expected/lir_04_loop_invcm.txt

@@ -4,7 +4,7 @@
     %t2 = const 2 :: integer
     %t3 = const 3 :: integer
     %t4 = load_input "x" :: integer
-    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer>
+    %t5 = make_tuple(%t1, %t2, %t3, %t4) :: tuple<integer, integer, integer, integer>
     yield %t5
   )
   (Declaration max_1
@@ -12,7 +12,7 @@
     %t25 = const 2 :: integer
     %t26 = const 3 :: integer
     %t27 = load_input "x" :: integer
-    %t28 = make_tuple(%t24, %t25, %t26, %t27) :: tuple<integer>
+    %t28 = make_tuple(%t24, %t25, %t26, %t27) :: tuple<integer, integer, integer, integer>
     %t7 = fold %t28 fn="agg.max" :: integer
     yield %t7
   )
@@ -22,7 +22,7 @@
     %t10 = const 3 :: integer
     %t11 = load_input "x" :: integer
     %t12 = const 1000 :: integer
-    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer>
+    %t13 = make_tuple(%t8, %t9, %t10, %t11, %t12) :: tuple<integer, integer, integer, integer, integer>
     %t14 = fold %t13 fn="agg.max" :: integer
     yield %t14
   )
@@ -31,7 +31,7 @@
     %t30 = const 2 :: integer
     %t31 = const 3 :: integer
     %t32 = load_input "x" :: integer
-    %t33 = make_tuple(%t29, %t30, %t31, %t32) :: tuple<integer>
+    %t33 = make_tuple(%t29, %t30, %t31, %t32) :: tuple<integer, integer, integer, integer>
     %t16 = fold %t33 fn="agg.min" :: integer
     yield %t16
   )
@@ -41,7 +41,7 @@
     %t19 = const 3 :: integer
     %t20 = load_input "x" :: integer
     %t21 = const -100 :: integer
-    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer>
+    %t22 = make_tuple(%t17, %t18, %t19, %t20, %t21) :: tuple<integer, integer, integer, integer, integer>
     %t23 = fold %t22 fn="agg.min" :: integer
     yield %t23
   )