issue #21 #22 New test runner

dibyendumajumdar · Jun 6, 2020 · 4eadd9d · 4eadd9d
1 parent 6b27a0a
commit 4eadd9d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/linearizer.c b/src/linearizer.c
@@ -2091,7 +2091,9 @@ static void output_pseudo(struct pseudo *pseudo, membuff_t *mb)
 			break;
 		}
 		case SYM_UPVALUE: {
-			raviX_buffer_add_fstring(mb, "Upval(%u)", pseudo->regnum);
+			raviX_buffer_add_fstring(mb, "Upval(%u, Proc%%%d, %s)", pseudo->regnum,
+						 pseudo->symbol->upvalue.target_variable->variable.block->function->function_expr.proc_id,
+						 pseudo->symbol->upvalue.target_variable->variable.var_name->str);
 			break;
 		}
 		case SYM_GLOBAL: {

diff --git a/tests/expected/results.expected b/tests/expected/results.expected
@@ -2645,7 +2645,7 @@ L0 (entry)
 L1 (exit)
 define Proc%4
 L0 (entry)
-	RET {Upval(0)} {L1}
+	RET {Upval(0, Proc%2, a)} {L1}
 L1 (exit)
 return @integer 1
 function()
@@ -6081,7 +6081,7 @@ L0 (entry)
 L1 (exit)
 define Proc%4
 L0 (entry)
-	RET {Upval(0)} {L1}
+	RET {Upval(0, Proc%2, a)} {L1}
 L1 (exit)
 define Proc%5
 L0 (entry)
@@ -6090,7 +6090,7 @@ L0 (entry)
 L1 (exit)
 define Proc%6
 L0 (entry)
-	RET {Upval(0)} {L1}
+	RET {Upval(0, Proc%2, a)} {L1}
 L1 (exit)
 return function (a, b, c, d, e)
     if a == b then goto l1
@@ -9232,13 +9232,13 @@ L2
 L3
 	LOADGLOBAL {print} {T(2)}
 	CALL {T(2), local(m, 0)} {T(2..)}
-	LEN {Upval(0)} {T(3)}
+	LEN {Upval(0, Proc%1, msgs)} {T(3)}
 	ADD {T(3), 1 Kint(0)} {T(4)}
 	LOADGLOBAL {string} {T(5)}
 	GETsk {T(5), 'sub' Ks(1)} {T(6)}
 	UNMi {3 Kint(2)} {Tint(0)}
 	CALL {T(6), local(m, 0), 3 Kint(2), Tint(0)} {T(6..)}
-	PUT {Upval(0), T(4), T(6[6..])}
+	PUT {Upval(0, Proc%1, msgs), T(4), T(6[6..])}
 	BR {L4}
 L4
 	BR {L1}

diff --git a/tests/input/t05_upvals.in b/tests/input/t05_upvals.in
@@ -5,7 +5,7 @@ function f()
        a = a + 1
        return a
      end
-  end
+  end, a
 end
 #
 return function()