Finalizing tests

Author: MichaelSDavid

src/scanner.c

@@ -124,7 +124,7 @@ static TokenType identifierType() {
         switch (scanner.start[1]) {
           case 'a': return checkKeyword(2, 3, "lse", TOKEN_FALSE);
           case 'o': return checkKeyword(2, 1, "r", TOKEN_FOR);
-          case 'u': return checkKeyword(2, 1, "n", TOKEN_FUN);
+          case 'n': return checkKeyword(2, 1, "c", TOKEN_FUN);
         }
       }
       break;

src/value.c

@@ -68,56 +68,4 @@ bool valuesEqual(Value a, Value b) {
       return false; // Unreachable
   }
 #endif
-}
-//< Types of Values values-equal
-
-// #include <stdio.h>
-// #include <string.h>
-
-// #include "object.h"
-// #include "memory.h"
-// #include "value.h"
-
-// void initValueArray(ValueArray* array) {
-//   array->values = NULL;
-//   array->capacity = 0;
-//   array->count = 0;
-// }
-
-// void writeValueArray(ValueArray* array, Value value) {
-//   if (array->capacity < array->count + 1) {
-//     int oldCapacity = array->capacity;
-//     array->capacity = GROW_CAPACITY(oldCapacity);
-//     array->values = GROW_ARRAY(Value, array->values, oldCapacity, array->capacity);
-//   }
-
-//   array->values[array->count] = value;
-//   array->count++;
-// }
-
-// void freeValueArray(ValueArray* array) {
-//   FREE_ARRAY(Value, array->values, array->capacity);
-//   initValueArray(array);
-// }
-
-// void printValue(Value value) {
-//   switch (value.type) {
-//     case VAL_BOOL:   printf(AS_BOOL(value) ? "true" : "false"); break;
-//     case VAL_NULL:    printf("null"); break;
-//     case VAL_NUMBER: printf("%g", AS_NUMBER(value)); break;
-//     case VAL_OBJ:    printObject(value); break;
-//   }
-// }
-
-// bool valuesEqual(Value a, Value b) {
-//   if (a.type != b.type) return false;
-
-//   switch (a.type) {
-//     case VAL_BOOL:   return AS_BOOL(a) == AS_BOOL(b);
-//     case VAL_NULL:    return true;
-//     case VAL_NUMBER: return AS_NUMBER(a) == AS_NUMBER(b);
-//     case VAL_OBJ:    return AS_OBJ(a) == AS_OBJ(b);
-//     default:
-//       return false; // Unreachable
-//   }
-// }
+}

src/value.h

@@ -96,57 +96,4 @@ void freeValueArray(ValueArray* array);
 
 void printValue(Value value);
 
-#endif
-
-// #ifndef conure_value_h
-// #define conure_value_h
-
-// #include "common.h"
-
-// typedef struct sObj Obj;
-// typedef struct sObjString ObjString;
-
-// typedef enum {
-//   VAL_BOOL,
-//   VAL_NULL, 
-//   VAL_NUMBER,
-//   VAL_OBJ
-// } ValueType;
-
-// typedef struct {
-//   ValueType type;
-//   union {
-//     bool boolean;
-//     double number;
-//     Obj* obj;
-//   } as; 
-// } Value;
-
-// #define IS_BOOL(value)    ((value).type == VAL_BOOL)
-// #define IS_NULL(value)    ((value).type == VAL_NULL)
-// #define IS_NUMBER(value)  ((value).type == VAL_NUMBER)
-// #define IS_OBJ(value)     ((value).type == VAL_OBJ)
-
-// #define AS_OBJ(value)     ((value).as.obj)
-// #define AS_BOOL(value)    ((value).as.boolean)
-// #define AS_NUMBER(value)  ((value).as.number)
-
-// #define BOOL_VAL(value)   ((Value){ VAL_BOOL, { .boolean = value } })
-// #define NULL_VAL          ((Value){ VAL_NULL, { .number = 0 } })
-// #define NUMBER_VAL(value) ((Value){ VAL_NUMBER, { .number = value } })
-// #define OBJ_VAL(object)   ((Value){ VAL_OBJ, { .obj = (Obj*)object } })
-
-// typedef struct {
-//   int capacity;
-//   int count;
-//   Value* values;
-// } ValueArray;
-
-// bool valuesEqual(Value a, Value b);
-
-// void initValueArray(ValueArray* array);
-// void writeValueArray(ValueArray* array, Value value);
-// void freeValueArray(ValueArray* array);
-// void printValue(Value value);
-
-// #endif
+#endif

tests/conure_tests.cn

@@ -1,22 +1,25 @@
 // Once debug logs are out of the way this will be much smoother
-// Also 'write' may turn to only a function later on
+// Also 'write' may turn to only a function later on (brackets for working highlighting)
 // TODO: Add multi-line comments
 // TODO: Add interactive history in the REPL
 
 // 1 (Arithmetic)
 write("|TEST 1: Arithmetic|");
 
 write(1 + 2 + 3 + 4 + 5);
+write(""); // Separation (TODO: Add escape characters)
 
 // 2 (Boolean logic)
 write("|TEST 2: Boolean Logic|");
 
 write(!(5 - 4 > 3 * 2 == !none));
+write(""); // Separation
 
 // 3 (String operations)
 write("|TEST 3: String Operations|");
 
 write("st" + "ri" + "ng");
+write(""); // Separation
 
 // 4 (Global variable operations)
 write("|TEST 4: Variable Operations|");
@@ -25,6 +28,7 @@ let breakfast = "beignets";
 let beverage = "cafe au lait";
 breakfast = "beignets with " + beverage;
 write(breakfast);
+write(""); // Separation
 
 // 5 (Blocks and local variable operations)
 write("|TEST 5: Blocks and Locals|");
@@ -36,6 +40,8 @@ write("|TEST 5: Blocks and Locals|");
   }
 }
 
+write("--no output--\n"); // Separation
+
 // ERROR CASES (for testing error handling)
 //{
 //  let a = "first";
@@ -72,10 +78,12 @@ for (let i = 1; i < 10; i = i + 1) {
   write(i);
 }
 
+write(""); // Separation
+
 // 7 (Functions and closures)
 write("|TEST 7: Functional Operations|");
 
-fun fib(n) {
+fnc fib(n) {
   if (n < 2) return n;
   return fib(n - 2) + fib(n - 1);
 }
@@ -87,15 +95,17 @@ write(fib(10));
 // (3 seconds without debug info, like Python) (TODO: optimize recursion)
 write(time() - start);
 
+write(""); // Separation
+
 // 8 (Advanced embedded closures)
 write("|TEST 8: Advanced Closures|");
 
 let globalOne;
 let globalTwo;
 
-fun main() {
+fnc main() {
   for (let a = 1; a <= 2; a = a + 1) {
-    fun closure() {
+    fnc closure() {
       write(a);
     }
     if (globalOne == none) {
@@ -110,20 +120,24 @@ main();
 globalOne();
 globalTwo();
 
+write(""); // Separation
+
 // 8 (Garbage collection)
 write("|TEST 8: Garbage Collection|");
 
-fun makeClosure() {
+fnc makeClosure() {
   let a = "data";
 
-  fun f() { write(a); }
+  fnc f() { write(a); }
   return f;
 }
 
 let closure = makeClosure();
 // Garbage collection here
 closure();
 
+write(""); // Separation
+
 // 9 (Classes and instances)
 write("|TEST 9: Classes and Instances|");
 
@@ -134,6 +148,8 @@ pair.first = 1;
 pair.second = 2;
 write(pair.first + pair.second); // 3
 
+write(""); // Separation
+
 // 10 (Methods and constructors)
 write("|TEST 10: Methods and Initializers|");
 
@@ -152,6 +168,8 @@ class CoffeeMaker {
 let maker = CoffeeMaker("coffee and chicory");
 maker.brew();
 
+write(""); // Separation
+
 // 11 (Advanced OOP and inheritance)
 write("|TEST 11: Superclasses and Inheritance|");
 
@@ -171,4 +189,41 @@ class BostonCream < Donut {//EXR3
   }
 }
 
-BostonCream().cook();
+BostonCream().cook();
+
+write(""); // Separation
+
+// 12 (Large-scale optimization)
+write("|TEST 11: Large-Scale Optimization|"); // Speed benchmark
+
+class Zoo {
+  init() {
+    this.aardvark = 1;
+    this.baboon   = 1;
+    this.cat      = 1;
+    this.donkey   = 1;
+    this.elephant = 1;
+    this.fox      = 1;
+  }
+  ant()    { return this.aardvark; }
+  banana() { return this.baboon; }
+  tuna()   { return this.cat; }
+  hay()    { return this.donkey; }
+  grass()  { return this.elephant; }
+  mouse()  { return this.fox; }
+}
+
+let zoo = Zoo();
+let sum = 0;
+let start = time();
+while (sum < 100000000) {
+  sum = sum + zoo.ant()
+            + zoo.banana()
+            + zoo.tuna()
+            + zoo.hay()
+            + zoo.grass()
+            + zoo.mouse();
+}
+
+write(time() - start);
+write(sum);