[Tolk] Refactor: get rid of split_vars, construct valid LET ops

In FunC (and in Tolk before), tensor vars (actually occupying
several stack slots) were represented as a single var in terms
or IR vars (Ops):
> var a = (1, 2);
> LET (_i) = (_1, _2)

Now, every tensor of N stack slots is represented as N IR vars.
> LET (_i, _j) = (_1, _2)

This will give an ability to control access to parts of a tensor
when implementing `tensorVar.0` syntax.

Author: tolk-vm

tolk-tester/tests/a10.tolk

@@ -104,9 +104,9 @@ fun testStartBalanceCodegen2() {
   testDumpDontPolluteStack PROC:<{
     ...
     DUMPSTK
-    x{6d79} PUSHSLICE	//  f s _9
+    x{6d79} PUSHSLICE	//  f s _5
     STRDUMP DROP
-    SBITS	//  f _11
+    SBITS	//  f _6
   }>
 """
 

tolk-tester/tests/cells-slices.tolk

@@ -220,11 +220,11 @@ Note, that since 'compute-asm-ltr' became on be default, chaining methods codege
     1 PUSHINT	//  _0 _1=1
     SWAP	//  _1=1 _0
     32 STU	//  _0
-    2 PUSHINT	//  _0 _5=2
-    SWAP	//  _5=2 _0
+    2 PUSHINT	//  _0 _4=2
+    SWAP	//  _4=2 _0
     32 STU	//  _0
-    3 PUSHINT	//  _0 _9=3
-    SWAP	//  _9=3 _0
+    3 PUSHINT	//  _0 _7=3
+    SWAP	//  _7=3 _0
     32 STU	//  _0
   }>
 """

tolk-tester/tests/logical-operators.tolk

@@ -332,15 +332,15 @@ These are moments of future optimizations. For now, it's more than enough.
     DUP	//  x x
     IFNOTJMP:<{	//  x
       DROP	//
-      1 PUSHINT	//  _7=1
+      1 PUSHINT	//  _5=1
     }>	//  x
     DUP	//  x x
     IFNOTJMP:<{	//  x
       DROP	//
-      1 PUSHINT	//  _8=1
+      1 PUSHINT	//  _6=1
     }>	//  x
     100 THROWIFNOT
-    -4 PUSHINT	//  _12=-4
+    -4 PUSHINT	//  _9=-4
   }>
 """
 

tolk-tester/tests/mutate-methods.tolk

@@ -307,7 +307,7 @@ fun main(){}
     ...
     incrementTwoInPlace CALLDICT        //  x y sum1
     -ROT
-    10 PUSHINT  //  sum1 x y _8=10
+    10 PUSHINT  //  sum1 x y _10=10
     incrementTwoInPlace CALLDICT        //  sum1 x y sum2
     s1 s3 s0 XCHG3       //  x y sum1 sum2
   }>
@@ -317,8 +317,8 @@ fun main(){}
 """
  load_next PROC:<{
     //  cs
-    32 LDI      //  _3 cs
-    SWAP        //  cs _3
+    32 LDI      //  _4 cs
+    SWAP        //  cs _4
   }>
 """
 

tolk-tester/tests/null-keyword.tolk

@@ -113,7 +113,7 @@ fun main() {
     CONS	//  numbers
     UNCONS	//  h numbers
     DUP	//  h numbers numbers
-    CAR	//  h numbers _12
+    CAR	//  h numbers _13
 """
 
 @fif_codegen
@@ -133,7 +133,7 @@ fun main() {
 """
   test7 PROC:<{
     ...
-    LDOPTREF	//  b _18 _17
+    LDOPTREF	//  b _8 _7
     DROP	    //  b c
     ISNULL	    //  b _11
     10 MULCONST	//  b _13

tolk/abscode.cpp

@@ -31,16 +31,6 @@ void TmpVar::dump(std::ostream& os) const {
   os << " : " << v_type << " (width ";
   os << v_type->calc_width_on_stack();
   os << ")";
-  if (coord > 0) {
-    os << " = _" << (coord >> 8) << '.' << (coord & 255);
-  } else if (coord < 0) {
-    int n = (~coord >> 8), k = (~coord & 0xff);
-    if (k) {
-      os << " = (_" << n << ".._" << (n + k - 1) << ")";
-    } else {
-      os << " = ()";
-    }
-  }
   os << std::endl;
 }
 
@@ -51,7 +41,7 @@ void TmpVar::show(std::ostream& os, int omit_idx) const {
       return;
     }
   }
-  os << '_' << idx;
+  os << '_' << ir_idx;
 }
 
 std::ostream& operator<<(std::ostream& os, const TmpVar& var) {
@@ -182,47 +172,6 @@ void VarDescrList::show(std::ostream& os) const {
   os << " ]\n";
 }
 
-void Op::split_vars(const std::vector<TmpVar>& vars) {
-  split_var_list(left, vars);
-  split_var_list(right, vars);
-  for (auto& op : block0) {
-    op.split_vars(vars);
-  }
-  for (auto& op : block1) {
-    op.split_vars(vars);
-  }
-}
-
-void Op::split_var_list(std::vector<var_idx_t>& var_list, const std::vector<TmpVar>& vars) {
-  int new_size = 0, changes = 0;
-  for (var_idx_t v : var_list) {
-    int c = vars.at(v).coord;
-    if (c < 0) {
-      ++changes;
-      new_size += (~c & 0xff);
-    } else {
-      ++new_size;
-    }
-  }
-  if (!changes) {
-    return;
-  }
-  std::vector<var_idx_t> new_var_list;
-  new_var_list.reserve(new_size);
-  for (var_idx_t v : var_list) {
-    int c = vars.at(v).coord;
-    if (c < 0) {
-      int n = (~c >> 8), k = (~c & 0xff);
-      while (k-- > 0) {
-        new_var_list.push_back(n++);
-      }
-    } else {
-      new_var_list.push_back(v);
-    }
-  }
-  var_list = std::move(new_var_list);
-}
-
 void Op::show(std::ostream& os, const std::vector<TmpVar>& vars, std::string pfx, int mode) const {
   if (mode & 2) {
     os << pfx << " [";
@@ -444,26 +393,22 @@ void CodeBlob::print(std::ostream& os, int flags) const {
   os << "-------- END ---------\n\n";
 }
 
-var_idx_t CodeBlob::create_var(TypePtr var_type, const LocalVarData* v_sym, SrcLocation location) {
-  vars.emplace_back(var_cnt, var_type, v_sym, location);
-  return var_cnt++;
-}
-
-bool CodeBlob::import_params(FormalArgList&& arg_list) {
-  if (var_cnt || in_var_cnt) {
-    return false;
-  }
-  std::vector<var_idx_t> list;
-  for (const auto& par : arg_list) {
-    TypePtr arg_type;
-    const LocalVarData* arg_sym;
-    SrcLocation arg_loc;
-    std::tie(arg_type, arg_sym, arg_loc) = par;
-    list.push_back(create_var(arg_type, arg_sym, arg_loc));
-  }
-  emplace_back(loc, Op::_Import, list);
-  in_var_cnt = var_cnt;
-  return true;
+std::vector<var_idx_t> CodeBlob::create_var(TypePtr var_type, const LocalVarData* v_sym, SrcLocation loc) {
+  std::vector<var_idx_t> ir_idx;
+  ir_idx.reserve(var_type->calc_width_on_stack());
+  if (const TypeDataTensor* t_tensor = var_type->try_as<TypeDataTensor>()) {
+    for (TypePtr item : t_tensor->items) {
+      std::vector<var_idx_t> nested = create_var(item, v_sym, loc);
+      ir_idx.insert(ir_idx.end(), nested.begin(), nested.end());
+    }
+  } else if (var_type != TypeDataVoid::create()) {
+    tolk_assert(var_type->calc_width_on_stack() == 1);
+    vars.emplace_back(var_cnt, var_type, v_sym, loc);
+    ir_idx.emplace_back(var_cnt);
+    var_cnt++;
+  }
+  tolk_assert(static_cast<int>(ir_idx.size()) == var_type->calc_width_on_stack());
+  return ir_idx;
 }
 
 }  // namespace tolk

tolk/analyzer.cpp

@@ -26,40 +26,6 @@ namespace tolk {
  * 
  */
 
-int CodeBlob::split_vars(bool strict) {
-  int n = var_cnt, changes = 0;
-  for (int j = 0; j < var_cnt; j++) {
-    TmpVar& var = vars[j];
-    int width_j = var.v_type->calc_width_on_stack();
-    if (strict && width_j < 0) {
-      throw ParseError{var.where, "variable does not have fixed width, cannot manipulate it"};
-    }
-    if (width_j == 1) {
-      continue;
-    }
-    std::vector<TypePtr> comp_types;
-    var.v_type->extract_components(comp_types);
-    tolk_assert(width_j <= 254 && n <= 0x7fff00);
-    tolk_assert((unsigned)width_j == comp_types.size());
-    var.coord = ~((n << 8) + width_j);
-    for (int i = 0; i < width_j; i++) {
-      auto v = create_var(comp_types[i], vars[j].v_sym, vars[j].where);
-      tolk_assert(v == n + i);
-      tolk_assert(vars[v].idx == v);
-      vars[v].coord = ((int)j << 8) + i + 1;
-    }
-    n += width_j;
-    ++changes;
-  }
-  if (!changes) {
-    return 0;
-  }
-  for (auto& op : ops) {
-    op.split_vars(vars);
-  }
-  return changes;
-}
-
 bool CodeBlob::compute_used_code_vars() {
   VarDescrList empty_var_info;
   return compute_used_code_vars(ops, empty_var_info, true);

tolk/generics-helpers.cpp

@@ -202,8 +202,8 @@ td::Result<std::vector<TypePtr>> deduce_substitutionTs_on_generic_func_call(cons
   try {
     GenericSubstitutionsDeduceForFunctionCall deducing(called_fun);
     for (const LocalVarData& param : called_fun->parameters) {
-      if (param.declared_type->has_genericT_inside() && param.idx < static_cast<int>(arg_types.size())) {
-        deducing.consider_next_condition(param.declared_type, arg_types[param.idx]);
+      if (param.declared_type->has_genericT_inside() && param.param_idx < static_cast<int>(arg_types.size())) {
+        deducing.consider_next_condition(param.declared_type, arg_types[param.param_idx]);
       }
     }
     int idx = deducing.get_first_not_deduced_idx();
@@ -233,7 +233,7 @@ const FunctionData* instantiate_generic_function(SrcLocation loc, const Function
   std::vector<LocalVarData> parameters;
   parameters.reserve(fun_ref->get_num_params());
   for (const LocalVarData& orig_p : fun_ref->parameters) {
-    parameters.emplace_back(orig_p.name, orig_p.loc, replace_genericT_with_deduced(orig_p.declared_type, fun_ref->genericTs, substitutionTs), orig_p.flags, orig_p.idx);
+    parameters.emplace_back(orig_p.name, orig_p.loc, replace_genericT_with_deduced(orig_p.declared_type, fun_ref->genericTs, substitutionTs), orig_p.flags, orig_p.param_idx);
   }
   TypePtr declared_return_type = replace_genericT_with_deduced(fun_ref->declared_return_type, fun_ref->genericTs, substitutionTs);
   const GenericsInstantiation* instantiationTs = new GenericsInstantiation(loc, std::move(substitutionTs));