Renames lispy-tests.json to interpreter-tests.json and moves all into one json

Author: codeZeilen

ports-js/interpreter-tests.js

@@ -59,14 +59,9 @@ function valueToString(value) {
 // Load test cases
 let testTable = [];
 try {
-    const testsPath1 = join(__dirname, '../ports/lispy-tests.json');
-    const testsPath2 = join(__dirname, '../ports/lispy-tests2.json');
+    const testsPath = join(__dirname, '../ports/interpreter-tests.json');
 
-    const tests1 = JSON.parse(readFileSync(testsPath1, 'utf8'));
-    testTable = testTable.concat(tests1);
-    
-    const tests2 = JSON.parse(readFileSync(testsPath2, 'utf8'));
-    testTable = testTable.concat(tests2);
+    testTable = JSON.parse(readFileSync(testsPath, 'utf8'));
 } catch (error) {
     console.error(`Error loading test files: ${error.message}`);
     process.exit(1);

ports-py/interpreter-tests.py

@@ -3,12 +3,9 @@
 import numbers
 
 testTable = []
-with open("ports/lispy-tests.json") as file:
-    testTable.extend(json.load(file))
+with open("ports/interpreter-tests.json") as file:
+    testTable = json.load(file)
 
-with open("ports/lispy-tests2.json") as file:
-    testTable.extend(json.load(file))
-
 def matches(structure, target):
     if(isinstance(target, dict) and "type" in target):
         return isinstance(structure, Exception)

ports-rb/interpreter-tests.rb

@@ -31,14 +31,8 @@ def matches(result, target)
 # Load test cases
 test_table = []
 begin
-  tests_path1 = File.join(dirname, "../ports/lispy-tests.json")
-  tests_path2 = File.join(dirname, "../ports/lispy-tests2.json")
-
-  tests1 = JSON.parse(File.read(tests_path1))
-  test_table.concat(tests1)
-
-  tests2 = JSON.parse(File.read(tests_path2))
-  test_table.concat(tests2)
+  tests_path = File.join(dirname, "../ports/interpreter-tests.json")
+  test_table = JSON.parse(File.read(tests_path))
 rescue => error
   puts "Error loading test files: #{error.message}"
   exit(1)

ports/lispy-tests2.json ports/interpreter-tests.jsonports/lispy-tests2.json renamed to ports/interpreter-tests.json

@@ -1,4 +1,41 @@
 [
+    {"input": "(quote (testing 1 (2.0) -3.14e159))", "expected": ["testing", 1, [2.0], -3.14e159]},
+    {"input": "(+ 2 2)", "expected": 4},
+    {"input": "(+ (* 2 100) (* 1 10))", "expected": 210},
+    {"input": "(if (> 6 5) (+ 1 1) (+ 2 2))", "expected": 2},
+    {"input": "(if (< 6 5) (+ 1 1) (+ 2 2))", "expected": 4},
+    {"input": "(cond ((< 6 5) 1) ((< 5 6) 2) (else 3) )", "expected": 2},
+    {"input": "(cond ((< 6 5) 1) (#f 2) (else 3) )", "expected": 3},
+    {"input": "(cond ((< 6 5) 1) (#f 2))", "expected": null},
+    {"input": "(define x 3)", "expected": null},
+    {"input": "x", "expected": 3}, 
+    {"input": "(+ x x)", "expected": 6},
+    {"input": "((lambda (x) (+ x x)) 5)", "expected": 10},
+    {"input": "(define twice (lambda (x) (* 2 x)))", "expected": null}, 
+    {"input": "(twice 5)", "expected": 10},
+    {"input": "(define compose (lambda (f g) (lambda (x) (f (g x)))))", "expected": null},
+    {"input": "((compose list twice) 5)", "expected": [10]},
+    {"input": "(define repeat (lambda (f) (compose f f)))", "expected": null},
+    {"input": "((repeat twice) 5)", "expected": 20}, 
+    {"input": "((repeat (repeat twice)) 5)", "expected": 80},
+    {"input": "(define fact (lambda (n) (if (<= n 1) 1 (* n (fact (- n 1))))))", "expected": null},
+    {"input": "(fact 3)", "expected": 6},
+    {"input": "(fact 50)", "expected": 30414093201713378043612608166064768844377641568960512000000000000},
+    {"input": "(define abs (lambda (n) ((if (> n 0) + -) 0 n)))", "expected": null},
+    {"input": "(list (abs -3) (abs 0) (abs 3))", "expected": [3, 0, 3]},
+    {"input": "(define combine (lambda (f)\n(lambda (x y)\n(if (null? x) (quote ())\n(f (list (car x) (car y))\n((combine f) (cdr x) (cdr y)))))))", "expected": null},
+    {"input": "(define zip (combine cons))", "expected": null},
+    {"input": "(zip (list 1 2 3 4) (list 5 6 7 8))", "expected" : [[1, 5], [2, 6], [3, 7], [4, 8]]},
+    {"input": "(define riff-shuffle (lambda (deck) (begin\n(define take (lambda (n seq) (if (<= n 0) (quote ()) (cons (car seq) (take (- n 1) (cdr seq))))))\n(define drop (lambda (n seq) (if (<= n 0) seq (drop (- n 1) (cdr seq)))))\n(define mid (lambda (seq) (/ (length seq) 2)))\n((combine append) (take (mid deck) deck) (drop (mid deck) deck)))))", "expected" : null},
+    {"input": "(riff-shuffle (list 1 2 3 4 5 6 7 8))", "expected" : [1, 5, 2, 6, 3, 7, 4, 8]},
+    {"input": "((repeat riff-shuffle) (list 1 2 3 4 5 6 7 8))",  "expected" : [1, 3, 5, 7, 2, 4, 6, 8]},
+    {"input": "(riff-shuffle (riff-shuffle (riff-shuffle (list 1 2 3 4 5 6 7 8))))", "expected" : [1,2,3,4,5,6,7,8]},
+    {"input": "(equal? \"a\" 'a)", "expected": false},
+    {"input": "(equal? 'a \"a\")", "expected": false},
+    {"input": "(equal? \"a\" \"a\")", "expected": true},
+    {"input": "(equal? 'a 'a)", "expected": true},
+    {"input": "(eq? 'a 'a)", "expected": true},
+    {"input": "(eqv? 'a 'a)", "expected": true},
     {"input": "()", "expected":  {"type": "SyntaxError"}},
     {"input": "(set! x)", "expected":  {"type": "SyntaxError"}},
     {"input": "(define 3 4)", "expected":  {"type": "SyntaxError"}},