Move from passing values to passing value pointers. Create class

hierarchy for values.
jonnyarnold · Mar 19, 2017 · f540b80 · f540b80
1 parent f9cb4ff
commit f540b80
Show file tree

Hide file tree

Showing 17 changed files with 331 additions and 260 deletions.
diff --git a/spec/e2e/bool.spec.cpp b/spec/e2e/bool.spec.cpp
@@ -1,7 +1,7 @@
 #include "spec/spec.h"
 
 TEST_CASE("Boolean set/get") {
-  REQUIRE(resultOf("x = true; x").asBool() == true);
+  REQUIRE(resultOf("x = true; x")->asBool() == true);
 }
 
 // TEST_CASE("and") {

diff --git a/spec/e2e/language.spec.cpp b/spec/e2e/language.spec.cpp
@@ -9,7 +9,7 @@
 // }
 
 TEST_CASE("Semicolons") {
-  REQUIRE(resultOf("x = true; x").asBool() == true);
+  REQUIRE(resultOf("x = true; x")->asBool() == true);
 }
 
 // TEST_CASE("Brackets") {

diff --git a/spec/e2e/number.spec.cpp b/spec/e2e/number.spec.cpp
@@ -1,19 +1,19 @@
 #include "spec/spec.h"
 
 TEST_CASE("Positive integer set/get") {
-  REQUIRE(resultOf("x = 1; x").asNumber() == fn::Number(0, 1));
+  REQUIRE(resultOf("x = 1; x")->asNumber() == fn::Number(0, 1));
 }
 
 TEST_CASE("Negative integer set/get") {
-  REQUIRE(resultOf("x = -1; x").asNumber() == fn::Number(0, -1));
+  REQUIRE(resultOf("x = -1; x")->asNumber() == fn::Number(0, -1));
 }
 
 TEST_CASE("Positive decimal set/get") {
-  REQUIRE(resultOf("x = 1.23; x").asNumber() == fn::Number(-2, 123));
+  REQUIRE(resultOf("x = 1.23; x")->asNumber() == fn::Number(-2, 123));
 }
 
 TEST_CASE("Negative decimal set/get") {
-  REQUIRE(resultOf("x = -1.23; x").asNumber() == fn::Number(-2, -123));
+  REQUIRE(resultOf("x = -1.23; x")->asNumber() == fn::Number(-2, -123));
 }
 
 // TODO: Mathematical precedence

diff --git a/spec/spec.cpp b/spec/spec.cpp
@@ -7,11 +7,11 @@
 // Include new test files in the Makefile.
 // Include global helpers here.
 
-vm::Value resultOf(bytecode::CodeBlob instructions) {
-  return (VM()).run(&instructions);
+vm::Value* resultOf(bytecode::CodeBlob instructions) {
+  return (VM(true)).run(&instructions);
 }
 
-vm::Value resultOf(std::string code) {
+vm::Value* resultOf(std::string code) {
   return execCode(code);
 }
 

diff --git a/spec/spec.h b/spec/spec.h
@@ -1,4 +1,4 @@
-#pragma once 
+#pragma once
 
 #include "vendor/catch.h" // Needed by all specs.
 
@@ -9,5 +9,5 @@
 using namespace fn;
 
 // Get the value of a code listing.
-vm::Value resultOf(bytecode::CodeBlob instructions);
-vm::Value resultOf(std::string code);
+vm::Value* resultOf(bytecode::CodeBlob instructions);
+vm::Value* resultOf(std::string code);
diff --git a/spec/vm/bool.spec.cpp b/spec/vm/bool.spec.cpp
@@ -2,104 +2,104 @@
 
 TEST_CASE("BOOL false") {
   bytecode::CodeBlob instructions = bytecode::iFalse();
-  REQUIRE(resultOf(instructions).asBool() == false);
+  REQUIRE(resultOf(instructions)->asBool() == false);
 }
 
 TEST_CASE("BOOL true") {
   bytecode::CodeBlob instructions = bytecode::iTrue();
-  REQUIRE(resultOf(instructions).asBool() == true);
+  REQUIRE(resultOf(instructions)->asBool() == true);
 }
 
 TEST_CASE("AND true true") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iTrue(),
-    bytecode::iAnd(0, 0)
+    bytecode::iAnd(1, 1)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == true);
+  REQUIRE(resultOf(instructions)->asBool() == true);
 }
 
 TEST_CASE("AND true false") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iTrue(),
     bytecode::iFalse(),
-    bytecode::iAnd(0, 1)
+    bytecode::iAnd(1, 2)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == false);
+  REQUIRE(resultOf(instructions)->asBool() == false);
 }
 
 TEST_CASE("AND false true") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iFalse(),
     bytecode::iTrue(),
-    bytecode::iAnd(0, 1)
+    bytecode::iAnd(1, 2)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == false);
+  REQUIRE(resultOf(instructions)->asBool() == false);
 }
 
 TEST_CASE("AND false false") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iFalse(),
-    bytecode::iAnd(0, 0)
+    bytecode::iAnd(1, 1)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == false);
+  REQUIRE(resultOf(instructions)->asBool() == false);
 }
 
 TEST_CASE("OR true true") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iTrue(),
-    bytecode::iOr(0, 0)
+    bytecode::iOr(1, 1)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == true);
+  REQUIRE(resultOf(instructions)->asBool() == true);
 }
 
 TEST_CASE("OR true false") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iTrue(),
     bytecode::iFalse(),
-    bytecode::iOr(0, 1)
+    bytecode::iOr(1, 2)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == true);
+  REQUIRE(resultOf(instructions)->asBool() == true);
 }
 
 TEST_CASE("OR false true") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iFalse(),
     bytecode::iTrue(),
-    bytecode::iOr(0, 1)
+    bytecode::iOr(1, 2)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == true);
+  REQUIRE(resultOf(instructions)->asBool() == true);
 }
 
 TEST_CASE("OR false false") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iFalse(),
-    bytecode::iOr(0, 0)
+    bytecode::iOr(1, 1)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == false);
+  REQUIRE(resultOf(instructions)->asBool() == false);
 }
 
 TEST_CASE("NOT true") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iTrue(),
-    bytecode::iNot(0)
+    bytecode::iNot(1)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == false);
+  REQUIRE(resultOf(instructions)->asBool() == false);
 }
 
 TEST_CASE("NOT false") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iFalse(),
-    bytecode::iNot(0)
+    bytecode::iNot(1)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == true);
+  REQUIRE(resultOf(instructions)->asBool() == true);
 }
diff --git a/spec/vm/call.spec.cpp b/spec/vm/call.spec.cpp
@@ -5,16 +5,16 @@ TEST_CASE("CALL builtin") {
     bytecode::iFalse()
   };
 
-  REQUIRE(resultOf(instructions).asBool() == false);
+  REQUIRE(resultOf(instructions)->asBool() == false);
 }
 
 TEST_CASE("CALL def") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iDefHeader(2),
     bytecode::iFalse(),
     bytecode::iReturnLast(),
-    bytecode::iCall(0)
+    bytecode::iCall(1)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == false);
+  REQUIRE(resultOf(instructions)->asBool() == false);
 }
diff --git a/spec/vm/load.spec.cpp b/spec/vm/load.spec.cpp
@@ -3,8 +3,8 @@
 TEST_CASE("LOAD") {
   bytecode::CodeBlob instructions = bytecode::CodeBlob{
     bytecode::iTrue(),
-    bytecode::iLoad(0)
+    bytecode::iLoad(1)
   };
 
-  REQUIRE(resultOf(instructions).asBool() == true);
+  REQUIRE(resultOf(instructions)->asBool() == true);
 }