vine: string interpolation (#178)

tests/programs/aoc_2024/day_01.vi

@@ -26,7 +26,7 @@ pub fn main(&io: &IO) {
     };
   }
 
-  io.println("Total Distance: " ++ total_dist.to_string());
+  io.println("Total Distance: {total_dist}");
 
   let similarity = 0;
   let iter_a = left.into_iter();
@@ -41,5 +41,5 @@ pub fn main(&io: &IO) {
     similarity += a * count;
   }
 
-  io.println("Similarity Score: " ++ similarity.to_string());
+  io.println("Similarity Score: {similarity}");
 }

tests/programs/aoc_2024/day_02.vi

@@ -18,8 +18,8 @@ pub fn main(&io: &IO) {
     }
   }
 
-  io.println("Safe Count: " ++ safe_count.to_string());
-  io.println("Dampened Safe Count: " ++ dampened_safe_count.to_string());
+  io.println("Safe Count: {safe_count}");
+  io.println("Dampened Safe Count: {dampened_safe_count}");
 }
 
 fn is_safe(report: List[N32]) -> Bool {

tests/programs/aoc_2024/day_03.vi

@@ -4,14 +4,14 @@ pub fn main(&io: &IO) {
 
   let part1 = get_muls(input);
 
-  io.println("Part 1: " ++ part1.to_string());
+  io.println("Part 1: {part1}");
 
   let part2 = get_muls(input.split("do()").map(fn(x: String) {
     let (a, _) = x.split_once("don't()");
     a
   }).join(""));
 
-  io.println("Part 2: " ++ part2.to_string());
+  io.println("Part 2: {part2}");
 }
 
 fn get_muls(input: String) -> N32 {

tests/programs/aoc_2024/day_04.vi

@@ -37,7 +37,7 @@ pub fn main(&io: &IO) {
     0,
   );
 
-  io.println("XMAS: " ++ matches.to_string());
+  io.println("XMAS: {matches}");
 
   let matches = diamond(
     lines,
@@ -63,7 +63,7 @@ pub fn main(&io: &IO) {
     0,
   );
 
-  io.println("X-MAS: " ++ matches.to_string());
+  io.println("X-MAS: {matches}");
 }
 
 struct Channel[M](M, ~M);

tests/programs/aoc_2024/day_05.vi

@@ -63,8 +63,8 @@ pub fn main(&io: &IO) {
     }
   }
 
-  io.println("Part 1: " ++ part1.to_string());
-  io.println("Part 2: " ++ part2.to_string());
+  io.println("Part 1: {part1}");
+  io.println("Part 2: {part2}");
 }
 
 type Mask = ((N32, N32), (N32, N32));

tests/programs/aoc_2024/day_06.vi

@@ -27,7 +27,7 @@ pub fn main(&io: &IO) {
 
   let (_, length) = walk(&grid, guard_pos);
 
-  io.println("Part 1: " ++ length.to_string());
+  io.println("Part 1: {length}");
 
   let spaces = [];
   clear(&grid, &spaces);
@@ -42,10 +42,10 @@ pub fn main(&io: &IO) {
       loops += 1;
     }
     i += 1;
-    io.println(i.to_string() ++ " " ++ loops.to_string());
+    io.println("{i} {loops}");
   }
 
-  io.println("Part 2: " ++ loops.to_string());
+  io.println("Part 2: {loops}");
 }
 
 fn clear(&grid: &Array[Array[Char]], &spaces: &List[(N32, N32)]) {

tests/programs/aoc_2024/day_07.vi

@@ -43,6 +43,6 @@ pub fn main(&io: &IO) {
     }
   }
 
-  io.println("Part 1: " ++ part1.to_string());
-  io.println("Part 2: " ++ part2.to_string());
+  io.println("Part 1: {part1}");
+  io.println("Part 2: {part2}");
 }

tests/programs/aoc_2024/day_08.vi

@@ -49,6 +49,6 @@ pub fn main(&io: &IO) {
     y += 1;
   }
 
-  io.println("Part 1: " ++ antinodes1.len().to_string());
-  io.println("Part 2: " ++ antinodes2.len().to_string());
+  io.println("Part 1: {antinodes1.len()}");
+  io.println("Part 2: {antinodes2.len()}");
 }

tests/programs/aoc_2024/day_09.vi

@@ -4,8 +4,8 @@ use std::numeric::N64;
 pub fn main(&io: &IO) {
   let input = io.read_line().unwrap();
 
-  io.println("Part 1: " ++ part1(input).to_string());
-  io.println("Part 2: " ++ part2(input).to_string());
+  io.println("Part 1: {part1(input)}");
+  io.println("Part 2: {part2(input)}");
 }
 
 fn part1(input: String) -> N64 {

tests/programs/aoc_2024/day_10.vi

@@ -51,8 +51,8 @@ pub fn main(&io: &IO) {
     &(io, id, scores, ratings),
   );
 
-  io.println("Scores: " ++ scores.to_string());
-  io.println("Ratings: " ++ ratings.to_string());
+  io.println("Scores: {scores}");
+  io.println("Ratings: {ratings}");
 }
 
 type Set32 = N32;

tests/programs/aoc_2024/day_11.vi

@@ -17,7 +17,7 @@ pub fn main(&io: &IO) {
   while i < max {
     stones = blink(&io, stones);
     i += 1;
-    io.println(i.to_string() ++ ": " ++ count(&stones).to_string());
+    io.println("{i}: {count(&stones)}");
   }
 }
 

tests/programs/aoc_2024/day_12.vi

@@ -42,7 +42,7 @@ pub fn main(&io: &IO) {
     i += 1;
   }
 
-  io.println("Part 1: " ++ price.to_string());
+  io.println("Part 1: {price}");
 
   let width = array.len() / height;
 
@@ -77,7 +77,7 @@ pub fn main(&io: &IO) {
     y += 1;
   }
 
-  io.println("Part 2: " ++ bulk.to_string());
+  io.println("Part 2: {bulk}");
 }
 
 struct Regions(Array[Region]);
@@ -91,8 +91,8 @@ mod Region {
   pub impl to_string: ToString[Region] {
     fn to_string(self: Region) -> String {
       match self {
-        Region::Root(a, p) { "Root(" ++ a.to_string() ++ ", " ++ p.to_string() ++ ")" }
-        Region::Child(n) { "Child(" ++ n.to_string() ++ ")" }
+        Region::Root(a, p) { "Root({a}, {p})" }
+        Region::Child(n) { "Child({n})" }
       }
     }
   }

tests/programs/aoc_2024/day_13.vi

@@ -45,8 +45,8 @@ pub fn main(&io: &IO) {
     }
   }
 
-  io.println("Part 1: " ++ part1.to_string());
-  io.println("Part 2: " ++ part2.to_string());
+  io.println("Part 1: {part1}");
+  io.println("Part 2: {part2}");
 }
 
 const n64: fn(N32) -> N64 = N64::from_n32;

tests/programs/aoc_2024/day_14.vi

@@ -55,15 +55,14 @@ pub fn main(&io: &IO) {
 
   let part1 = a * b * c * d;
 
-  io.println("Part 1: " ++ part1.to_string());
+  io.println("Part 1: {part1}");
 
   let i = 0;
   while io.read_line() is Some(line) {
     if N32::parse(line) is Some(n) {
       i = n;
     }
-    let esc = String({ chars: [Char::from_n32(27)] });
-    io.println(esc ++ "[2J" ++ esc ++ "[H");
+    io.println("\x1b[2J\x1b[H");
     let grid = Array::new(height, Array::new(width, '.'));
     let iter = robots.into_iter();
     while iter.next() is Some((px, py, vx, vy)) {
@@ -81,5 +80,5 @@ pub fn main(&io: &IO) {
 
   let part2 = 0;
 
-  io.println("Part 2: " ++ part2.to_string());
+  io.println("Part 2: {part2}");
 }

tests/programs/aoc_2024/day_15.vi

@@ -75,7 +75,7 @@ pub fn main(&io: &IO) {
 
   show_grid();
 
-  io.println("Part 1: " ++ part1.to_string());
+  io.println("Part 1: {part1}");
 
   grid = Array::from_list(initial_grid.to_list().map(fn(row: Array[Char]) {
     let new_row = [];
@@ -196,5 +196,5 @@ pub fn main(&io: &IO) {
 
   show_grid();
 
-  io.println("Part 2: " ++ part2.to_string());
+  io.println("Part 2: {part2}");
 }

tests/programs/aoc_2024/day_16.vi

@@ -84,9 +84,9 @@ pub fn main(&io: &IO) {
     }
   }
 
-  io.println("Part 1: " ++ part1.to_string());
+  io.println("Part 1: {part1}");
 
-  io.println("Part 2: " ++ part2.to_string());
+  io.println("Part 2: {part2}");
 }
 
 fn delta(dir: N32) -> (N32, N32) {

tests/programs/aoc_2024/day_17.vi

@@ -60,5 +60,6 @@ pub fn main(&io: &IO) {
     ip += 2;
   }
 
-  io.println("Part 1: " ++ output.map(fn(x: N32) { x.to_string() }).join(","));
+  let output = output.map(fn(x: N32) { x.to_string() }).join(",");
+  io.println("Part 1: {output}");
 }

tests/programs/aoc_2024/day_18.vi

@@ -43,7 +43,7 @@ pub fn main(&io: &IO) {
 
   let part1 = pathfind(grid, size, iters);
 
-  io.println("Part 1: " ++ part1.to_string());
+  io.println("Part 1: {part1}");
 
   let set = DisjointSet::new(size * size);
 
@@ -92,7 +92,7 @@ pub fn main(&io: &IO) {
 
   let (x, y) = *data.get(i);
 
-  io.println("Part 2: " ++ x.to_string() ++ "," ++ y.to_string());
+  io.println("Part 2: {x},{y}");
 }
 
 struct DisjointSet(Array[Node]);

tests/programs/aoc_2024/day_19.vi

@@ -16,8 +16,8 @@ pub fn main(&io: &IO) {
     }
   }
 
-  io.println("Part 1: " ++ possible.to_string());
-  io.println("Part 2: " ++ ways.to_string());
+  io.println("Part 1: {possible}");
+  io.println("Part 2: {ways}");
 }
 
 fn match_counts(design: String, patterns: List[String]) -> Array[N64] {

tests/programs/aoc_2024/day_20.vi

@@ -84,8 +84,8 @@ pub fn main(&io: &IO) {
     i += 1;
   }
 
-  io.println("Part 1: " ++ part1.to_string());
-  io.println("Part 2: " ++ part2.to_string());
+  io.println("Part 1: {part1}");
+  io.println("Part 2: {part2}");
 }
 
 fn eq((ax, ay): (N32, N32), (bx, by): (N32, N32)) -> Bool {

tests/programs/aoc_2024/day_21.vi

@@ -19,7 +19,7 @@ pub fn main(&io: &IO) {
     sum += num * len;
   }
 
-  io.println("Part 1: " ++ sum.to_string());
+  io.println("Part 1: {sum}");
 
   let c = base_cost_func();
   let i = 0;
@@ -54,7 +54,7 @@ pub fn main(&io: &IO) {
     sum = sum.add(cost.mul(N64::from_n32(num)));
   }
 
-  io.println("Part 2: " ++ sum.to_string());
+  io.println("Part 2: {sum}");
 }
 
 fn control_string(cur: Char, string: String, seed: N32, f: fn(Char, Char, Bool) -> String) -> String {

tests/programs/aoc_2024/day_22.vi

@@ -30,7 +30,7 @@ pub fn main(&io: &IO) {
     buyer += 1;
   }
 
-  io.println("Part 1: " ++ part1.to_string());
+  io.println("Part 1: {part1}");
 
   io.println(map.len().to_string());
 
@@ -40,7 +40,7 @@ pub fn main(&io: &IO) {
     part2 = part2.max(bananas);
   }
 
-  io.println("Part 2: " ++ part2.to_string());
+  io.println("Part 2: {part2}");
 }
 
 fn evolve(&secret: &N32) {

tests/programs/aoc_2024/day_23.vi

@@ -36,8 +36,8 @@ pub fn main(&io: &IO) {
       }
     }
 
-    io.println("Triangles: " ++ triangles.to_string());
-    io.println("Part 1: " ++ t_triangles.to_string());
+    io.println("Triangles: {triangles}");
+    io.println("Part 1: {t_triangles}");
   }
 
   fn extend_clique(

tests/programs/aoc_2024/day_24.vi

@@ -50,7 +50,7 @@ pub fn main(&io: &IO) {
     }
   }
 
-  io.println("Part 1: " ++ part1.to_string());
+  io.println("Part 1: {part1}");
 }
 
 struct Wire(~Bool, Bool);

tests/programs/aoc_2024/day_25.vi

@@ -35,7 +35,7 @@ pub fn main(&io: &IO) {
     sum += n;
   }
 
-  io.println("Part 1: " ++ sum.to_string());
+  io.println("Part 1: {sum}");
 }
 
 fn fits(lock: List[N32], key: List[N32]) -> Bool {

tests/programs/basic_diverge.vi

@@ -4,7 +4,7 @@ pub fn main(&io: &IO) {
   io.println(foo(0, &zero_count));
   io.println(foo(1, &zero_count));
   io.println(foo(0, &zero_count));
-  io.println("\nzero_count: " ++ zero_count.to_string());
+  io.println("\nzero_count: {zero_count}");
 }
 
 fn foo(value: N32, &zero_count: &N32) -> String {

tests/programs/classify_primes.vi

@@ -14,7 +14,7 @@ pub fn main(&io: &IO) {
       }
       "prime"
     };
-    io.println(n.to_string() ++ ": " ++ class);
+    io.println("{n}: {class}");
     n += 1;
   }
 }

tests/programs/cyclist.vi

@@ -7,7 +7,7 @@ pub fn main(&io: &IO) {
 
   while list.pop_front() is Some(val) {
     cycle(&list, val);
-    io.println(val.to_string() ++ ";\t" ++ list.to_string());
+    io.println("{val};\t{list}");
   }
 }
 

tests/programs/final_countdown.vi

@@ -5,7 +5,7 @@ pub fn main(&io: &IO) {
   let i = 10;
   while i > 0 {
     let &&m = &msg_ref;
-    m ++= i.to_string() ++ "...\n"
+    m ++= "{i}...\n"
     i -= 1;
   }
   let &m = msg_ref;