@naanlang/naan 1.0.14 → 1.0.16

package/lib/env_node.js

@@ -37,6 +37,7 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     if (typeof(options) != 'object')
         options = { };
     var repl = require('repl');
+    var replServer;
     var process = require('process');
     var Naan = require('./core/naanlib');
     var naanlib = new Naan.Naanlib();
@@ -69,6 +70,14 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         outEnable = true;
         naanlib.textLine(cmd);
     };
+    
+    this.setPrompt = function setPrompt(prompt) {
+        if (replServer) {
+            replServer.setPrompt(prompt);
+            return (prompt);
+        }
+        return (false);
+    };
 
 
     //==========================================================================
@@ -85,9 +94,9 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     
     if (!options.replDisable)
     {
-        var nprompt = repl.start({ prompt: 'Naan> ', eval: myEval});
+        replServer = repl.start({ prompt: 'Naan> ', eval: myEval});
     
-        nprompt.on('line', function(cmd) {                                  // process raw command line
+        replServer.on('line', function(cmd) {                                  // process raw command line
             if (cmd.charAt(0) != ".") {
                 textToRemoteTerm(cmd);
                 naanlib.textLine(cmd + "\n");
@@ -98,7 +107,7 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         // Hook the ^C interrupt
         //
     
-        nprompt._events.SIGINT = function () {
+        replServer._events.SIGINT = function () {
             naanlib.escape();
         };
     
@@ -106,7 +115,7 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         // Hook an exit command
         //
     
-        nprompt.on('exit', function() {
+        replServer.on('exit', function() {
             process.exit();
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@naanlang/naan",
-    "version": "1.0.14",
+    "version": "1.0.16",
     "author": "Richard C. Zulch",
     "description": "Naan™ software platform",
     "main": "./lib/core/naanlib.js",

package/test/test_01_core.nlg

@@ -357,12 +357,16 @@ RegisterTestCategory("core", [
     [ "print(testcore=`testcore);", "testcore|testcore" ],
     [ "print(testcore=42);", "42|42" ],
  
-    [ "cond();", { errors: "cond( requires if expression at (1, 6) found )" } ],
+    [ "cond();", "false" ],
+    [ "cond(true);",
+        { errors: "if expression required at (1, 6) found true" } ],
     [ "quote(cond(if false 3 else if true 4));>", "(cond ((identity false) 3) ((identity true) 4))" ],
     [ "cond(if false 3 else if true 4);", "4" ],
     [ "cond (if 1 and\n 2, 3);", "3" ],
     [ "cond(print(false),print(\"hi\"));",
-        { errors: "cond( requires if expression at (1, 6) found print" } ],
+        { errors: "if expression required at (1, 6) found print" } ],
+    [ "cond(if 3 4, print(5));",
+        { errors: "if expression required at (1, 14) found print" } ],
     
     [ "body();", "false" ],
     [ "quote(body(if false 3 else if true 4));>", "(body ((identity false) 3) ((identity true) 4))" ],
@@ -370,8 +374,10 @@ RegisterTestCategory("core", [
     [ "body(print(\"hi\"), print(\" there\"),4+3);>", "hi there|7" ],
     [ "body(print(false),print(\"hi\"));", "falsehi|\"hi\"" ],
 
-    [ "push();>", { errors: "attempt to modify constant false" } ],
-    [ "push(true);>", { errors: "attempt to modify constant false" } ],
+    [ "push();>",
+        { errors: "attempt to modify constant false" } ],
+    [ "push(true);>",
+        { errors: "attempt to modify constant false" } ],
     [ "push(true, 3);>", "false" ],
     [ "testcore=false;", "false" ],
     [ "push(11, testcore);>", "(11)" ],
@@ -427,6 +433,8 @@ RegisterTestCategory("core", [
     [ "temp(2, `(1 2 3));>", "(2 3)|(2 3)" ],
     [ "function (ex1, lex1) { ex1+pop(lex1), print(lex1), lex1 }(2, `(1 2 3));>", "(2 3)|(2 3)" ],
     [ "quote(function (a)\n { f(b)-\ng(c) * h(d)\n });>", "(function lambda (a) (- (f b) (* (g c) (h d))))" ],
+    [ "quote(function (a)\n { f(b)\n-g(c) * h(d)\n });>",
+        { errors: "ambiguous newline (use \\ or ,) at (3, 1) found -" }],
     [ "quote(function (a)\n { f(b)\\\n-g(c) * h(d)\n });>", "(function lambda (a) (- (f b) (* (g c) (h d))))" ],
     
     [ "tempo = temp.proc;>", "(function temp (ex1 lex1) (+ ex1 (pop lex1)) (print lex1) lex1)" ],

package/test/test_03_jsinterop.nlg

@@ -35,11 +35,11 @@ RegisterTestCategory("JSinterop", [
 
     [ "o(3);", {
         "dev": { errors: "xcall \"[object Object]\": TypeError: object.apply is not a function" }
-        "prod": { errors: "xcall \"[object Object]\": TypeError: e[3].apply is not a function" }
+        "prod": { errors: "xcall \"[object Object]\": TypeError: r[3].apply is not a function" }
     }[    "prod"]],
     [ "o(Number);", {
         "dev": { errors: "xcall \"[object Object]\": TypeError: object.apply is not a function" }
-        "prod": { errors: "xcall \"[object Object]\": TypeError: e[3].apply is not a function" }
+        "prod": { errors: "xcall \"[object Object]\": TypeError: r[3].apply is not a function" }
     }[    "prod"]],
     [ "Number(3);", "[Number 3]" ],
     [ "Number(3).toString();", "\"3\"" ],
@@ -71,6 +71,12 @@ RegisterTestCategory("JSinterop", [
     ["Array([3]);", "[Array [3]]"],
     ["Array([3]).0;", "[Array 3]"],
     ["Array([3]).0.0;", "3"],
+    ["[].concat([])", "[]"],
+    ["[].concat(3)", "[3]"],
+    ["[].concat([3])", "[3]"],
+    ["[].concat(Array())", "[]"],
+    ["[].concat(Array(a))", '["a"]'],
+    ["[].concat(xnew())", "[[object Object]]"],
 
     
     //

package/test/test_06_lingoparse.nlg

@@ -61,7 +61,7 @@ RegisterTestCategory("Lingo parse", [
     //
     
     [ "4&&3;", { exprs: "(&& 4 3)" } ],
-    [ "4\\\n&&3;", { exprs: "(&& 4 3)" } ],
+    [ "4\n&&3;", { exprs: "(&& 4 3)" } ],
     [ "4&&\n3;", { exprs: "(&& 4 3)" } ],
     [ "function test0(x, y) { \n y = 3\n x  \n };", { exprs: "(defproc function test0 (x y) (= y 3) x)" } ],
 
@@ -438,15 +438,18 @@ RegisterTestCategory("Lingo parse", [
     [ "try{nest()}finally{};",
         { exprs: "(catch ((nest)) false false)" } ],
     [ "try{nest()}catch{}finally{};",
-        { exprs: "(catch ((nest)) (((identity true))) false)" } ],
+        { exprs: "(catch ((nest)) (((identity true) false)) false)" } ],
     [ "function test1() { try { nest() } finally { } };",
         { exprs: "(defproc function test1 false (catch ((nest)) false false))",
         text: "==> redefined: test1" } ],
     [ "function(){try{nest()}catch{},if(1)2};",
-        { exprs: "(function lambda false (catch ((nest)) (((identity true))) false) ((identity 1) 2))" } ],
+        { exprs: "(function lambda false (catch ((nest)) (((identity true) false)) false) ((identity 1) 2))" } ],
     [ "function(x) { try {} catch { if true { 4 } } };",
         { exprs: "(function lambda (x) (catch false (((identity true) 4)) false))" } ],
-    
+    [ "try { throw(green) } catch { printline(4) };",
+        { exprs: "(catch ((throw green)) (((identity true) (printline 4))) false)",
+        text: "4" } ],
+
     //
     // cond
     //
@@ -514,11 +517,25 @@ RegisterTestCategory("Lingo parse", [
         "    if 1 - 2\n"
         "        3\n"
         "}" ],
+    [ "function(x) {if x\n[2]\n3 };",
+        { errors: "ambiguous newline (use \\ or ,) at (2, 1) found [" } ],
+    [ "function(x) {if x,\n[2]\n3 };",
+        "function (x) {\n"
+        "    if x\n"
+        "        [2]\n"
+        "    3\n"
+        "}" ],
+    [ "function(x) {if x\\\n[2]\n3 };",
+        "function (x) {\n"
+        "    if x[2]\n"
+        "        3\n"
+        "}" ],
+    [ "function(x) {if x\n(2)\n3 };",
+        { errors: "ambiguous newline (use \\ or ,) at (2, 1) found (" } ],
     [ "function() { else };",
         { errors: "stray keyword at (1, 14) found else" } ],
     [ "function() { if 1 else 3 };",
-        { errors: "stray keyword at (1, 19) found else"
-            "|mismatched delimiter at (1, 24) found 3 expected } starting with { at (1, 12)" } ],
+        { errors: "stray keyword at (1, 19) found else" } ],
 
     //
     // semantic validity

package/test/test_07_lingo.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2018-2021 by Richard C. Zulch
+ * Copyright (c) 2018-2023 by Richard C. Zulch
  *
  */
 
@@ -297,6 +297,27 @@ RegisterTestCategory("Lingo", [
     [ "aa[1] /= 2;", "3" ],
 
 
+    //
+    // catch
+    //
+    
+    [ "try { throw(green) } catch { printline(4) };", "4|4" ],
+    [ "try { throw(blue) } catch { false(),printline(5) };", "5|5" ],
+    [ "try { 1/0 } catch {};", "false"],
+    [ "try { 1/0 } catch { 0 };", "0"],
+    [ "try { 1/0 } catch { exception };", '(internal, "divide by zero")'],
+    [ "try { 1/0 } catch { if exception == 3 4, printline(5) };",
+        { errors: "if expression required at (1, 42) found printline"} ],
+    [ "try { throw(blue) } catch { if exception == blue printline(blue) };", "blue|blue"],
+    [ "try { throw(green) } catch { if exception == blue printline(blue) };", 
+        { errors: "exception: green" } ],
+    [ "try { throw(green) } catch { if exception == blue printline(blue),"
+        "if exception == green printline(green) };", "green|green"],
+    [ "try { throw(red) } catch { if exception == blue printline(blue),"
+        "if exception == green printline(green) };", 
+        { errors: "exception: red" } ],
+
+
     //
     // if else
     //