From da651355b99c83fd0f69482f2fb2ece4451c6c87 Mon Sep 17 00:00:00 2001
From: Mattia Giambirtone <nocturn9x@nocturn9x.space>
Date: Mon, 1 Aug 2022 13:16:07 +0200
Subject: [PATCH] Added a few more tests

---
 src/backend/vm.nim    |  5 ++---
 src/util/debugger.nim |  9 ++++++--
 tests/fib.pn          | 51 +++++++++++++++++++++++++++++++++++++++++++
 tests/import/a.pn     |  0
 tests/import/b.pn     |  0
 tests/lt_gt.pn        |  6 +++++
 6 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 tests/fib.pn
 create mode 100644 tests/import/a.pn
 create mode 100644 tests/import/b.pn
 create mode 100644 tests/lt_gt.pn

diff --git a/src/backend/vm.nim b/src/backend/vm.nim
index 531668c..99a5fee 100644
--- a/src/backend/vm.nim
+++ b/src/backend/vm.nim
@@ -263,12 +263,11 @@ proc constReadUInt8(self: PeonVM, idx: int): PeonObject =
     result = PeonObject(kind: UInt8, uTiny: self.chunk.consts[idx])
 
 
-proc constReadString(self: PeonVM, idx: int): PeonObject =
+proc constReadString(self: PeonVM, size: int, idx: int): PeonObject =
     ## Reads a constant from the
     ## chunk's constant table and
     ## returns a Peon object. Assumes
     ## the constant is a string
-    let size = self.readLong()
     result = PeonObject(kind: String, str: self.chunk.consts[idx..<size].fromBytes())
 
 
@@ -346,7 +345,7 @@ proc dispatch*(self: PeonVM) =
             of LoadUInt8:
                 self.push(self.constReadUInt8(int(self.readLong())))
             of LoadString:
-                self.push(self.constReadString(int(self.readLong())))
+                self.push(self.constReadString(int(self.readLong()), int(self.readLong())))
             of LoadFloat32:
                 self.push(self.constReadFloat32(int(self.readLong())))
             of LoadFloat64:
diff --git a/src/util/debugger.nim b/src/util/debugger.nim
index b921268..0592585 100644
--- a/src/util/debugger.nim
+++ b/src/util/debugger.nim
@@ -160,10 +160,16 @@ proc loadAddressInstruction(self: Debugger, instruction: OpCode) =
 
 proc constantInstruction(self: Debugger, instruction: OpCode) =
     ## Debugs instructions that operate on the constant table
+    var size: uint
+    if instruction == LoadString:
+        size = [self.chunk.code[self.current + 1], self.chunk.code[self.current + 2], self.chunk.code[self.current + 3]].fromTriple()
+        self.current += 3
     var constant = [self.chunk.code[self.current + 1], self.chunk.code[self.current + 2], self.chunk.code[self.current + 3]].fromTriple()
     printInstruction(instruction)
-    stdout.styledWriteLine(fgGreen, &", points to constant at position ", fgYellow, $constant)
+    stdout.styledWrite(fgGreen, &", points to constant at position ", fgYellow, $constant)
     self.current += 4
+    if instruction == LoadString:
+        stdout.styledWriteLine(fgGreen, " of length ", fgYellow, $size)
 
 
 proc jumpInstruction(self: Debugger, instruction: OpCode) =
@@ -179,7 +185,6 @@ proc jumpInstruction(self: Debugger, instruction: OpCode) =
         self.checkFrameStart(i)
 
 
-
 proc disassembleInstruction*(self: Debugger) =
     ## Takes one bytecode instruction and prints it
     printDebug("Offset: ")
diff --git a/tests/fib.pn b/tests/fib.pn
new file mode 100644
index 0000000..97e0b7b
--- /dev/null
+++ b/tests/fib.pn
@@ -0,0 +1,51 @@
+operator `<`(a, b: int): bool {
+    #pragma[magic: "LessThanInt64", pure]
+}
+
+
+operator `-`(a, b: float): float {
+    #pragma[magic: "SubFloat64", pure]
+}
+
+
+operator `-`(a, b: int): int {
+    #pragma[magic: "SubInt64", pure]
+}
+
+
+operator `+`(a, b: int): int {
+    #pragma[magic: "AddInt64", pure]
+}
+
+
+operator `/`(a, b: int): int {
+    #pragma[magic: "DivInt64", pure]
+}
+
+
+fn clock: float {
+    #pragma[magic: "SysClock64", pure]
+}
+
+
+fn print(x: float) {
+    #pragma[magic: "GenericPrint"]
+}
+
+
+fn print(x: int) {
+    #pragma[magic: "GenericPrint"]
+}
+
+
+fn fib(n: int): int {
+    if n < 2 {
+        return n;
+    }
+    return fib(n - 2) + fib(n - 1);
+}
+
+
+var x = clock();
+print(fib(25));
+print(clock() - x);
diff --git a/tests/import/a.pn b/tests/import/a.pn
new file mode 100644
index 0000000..e69de29
diff --git a/tests/import/b.pn b/tests/import/b.pn
new file mode 100644
index 0000000..e69de29
diff --git a/tests/lt_gt.pn b/tests/lt_gt.pn
new file mode 100644
index 0000000..6049f38
--- /dev/null
+++ b/tests/lt_gt.pn
@@ -0,0 +1,6 @@
+operator `<`(a, b: int): bool {#pragma[magic: "LessThanInt64", pure]}
+operator `>`(a, b: int): bool {return b < a;}
+
+
+3 > 2;
+2 < 3;