Adding more tests and updating readme.

cdiggins · Jan 3, 2018 · fc9f016 · fc9f016
1 parent 4947b3e
commit fc9f016
Show file tree

Hide file tree

Showing 7 changed files with 189 additions and 42 deletions.
diff --git a/cat-test.js b/cat-test.js
diff --git a/cat-test.js.map b/cat-test.js.map
diff --git a/cat-test.ts b/cat-test.ts
@@ -15,6 +15,9 @@ function printEnvironment(ce : cat.CatEnvironment) {
 }
 
 function testEvaluator() {
+    console.log("=================");
+    console.log("Testing evaluator");
+    console.log("=================");
     var ce = new cat.CatEvaluator();    
     ce.trace = true;
     ce.eval("6 7 dup mul sub");
@@ -67,7 +70,7 @@ function outputDefinitions() {
     console.log("Core Stack Operations")
     console.log('=====================');
     for (var k in ce.primOps) 
-        outputInstruction(ce.getInstruction(k));
+        console.log(k + " : " + ce.primOps[k]);
 
     console.log('===================');
     console.log("Primitive Functions")
@@ -94,9 +97,39 @@ function outputGrammar() {
     console.log(cat.astSchemaString());
 }
 
+function outputFormalTypes() {
+    var ce = new cat.CatEnvironment();
+
+    console.log('=======================');
+    console.log("Core Stack Formal Types")
+    console.log('=======================');
+    for (var k in ce.primOps) {
+        var i = ce.getInstruction(k);
+        console.log(k + " : " + i.type.toString());
+    }
+
+    console.log('=============================');
+    console.log("Standard Library Formal Types")
+    console.log('=============================');
+    for (var k in ce.stdOps) {
+        var i = ce.getInstruction(k);
+        var t = ti.alphabetizeVarNames(i.type);
+        console.log(k + " : " + t);
+    }    
+}
+
+function testTypes() {
+    var ce = new cat.CatEvaluator();
+    var i = ce.env.addDefinition("test", "quote dup apply");
+    console.log("Type of " + i.name + " : " + i.type);
+    ce.eval("10 test");
+}
+
 outputGrammar();
 outputDefinitions();
+outputFormalTypes();
 testEvaluator();
+testTypes();
 
 declare var process : any;
 process.exit();
diff --git a/cat.js b/cat.js
diff --git a/cat.js.map b/cat.js.map
diff --git a/cat.ts b/cat.ts
@@ -9,6 +9,7 @@ import { Myna as m } from "./node_modules/myna-parser/myna";
 // A type-inference library: https://github.com/cdiggins/type-inference
 import { TypeInference as ti } from "./node_modules/type-inference/type_inference";
 
+// This is a full rewrite of the Cat language (which was originally in C#) written in TypeScript 
 export module CatLanguage
 {
     // Defines a Myna grammar for parsing Cat programs and types