@naanlang/naan 1.0.8 → 1.0.10

package/package.json

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

package/plugins/serviceAws/aws_dynamo.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2022 by Richard C. Zulch
+ * Copyright (c) 2021-2023 by Richard C. Zulch
  *
  */
 
@@ -88,7 +88,7 @@ closure TimeKeys(prefix, baseMS, local timekeys, prelen) {
     // partition key in the specified direction, or false if there are no more keys. Dates in the
     // future are considered invalid and return false.
     //
-    timekeys.adjustPartID = function adjustPartID(partID, adjust, local year, doy, dayms, msec) {
+    timekeys.adjustPartID = function adjustPartID(partID, adjust, local yyyy, doy, dayms, msec) {
         partID = partID.slice(prelen)
         yyyy = toint(partID.substring(0,4))
         doy = toint(partID.substring(4,7))
@@ -246,7 +246,7 @@ closure DynaConverter(local conv) {
     // datumDynToNaan
     // Convert a DynamoDB typed attribute to Naan format.
     //
-    conv.datumDynToNaan = function datumDynToNaan(dtype, dvalue, local output) {
+    conv.datumDynToNaan = function datumDynToNaan(dtype, dvalue) {
         if dtype == "BS" || dtype == "SS"
             dvalue
         else if dtype == "NS"
@@ -305,7 +305,7 @@ closure DynaConverter(local conv) {
     // specified parameter block.
     //
     closure genAttributeNameAdder(params, local adex) {
-        function attrib(name, local adef, atype, key, data) {
+        function attrib(name, local key, data) {
             if !string(name)
                 name = tostring(name)                                       // try to make it a string
             if !params.ExpressionAttributeNames
@@ -377,7 +377,7 @@ closure DynaConverter(local conv) {
     //
 
     conv.createKeyExpression = function createKeyExpression(params, conds
-        local error, attval, rangename, range, keyname, op, expr, rangex, arg1, arg2) {
+        local attval, rangename, range, keyname, op, expr, rangex, arg1, arg2) {
 
         // dupeop
         //
@@ -535,7 +535,7 @@ closure DynaTable(dyna, tablename, local table) {
     //      rangeType:  <name>                  // string | numeric (if exists)
     //  }
     //
-    table.info = closure info(local params, pending, info) {
+    table.info = closure info(local params, pending) {
         if !dyna.aws
             return (list(Error("DynaTable.info: not logged into AWS")))
         params = {
@@ -691,7 +691,7 @@ closure DynaTable(dyna, tablename, local table) {
         }
         params.Key = makeDynKey(list(hashValue, rangeValue))
         pending = new(nonce)
-        dyna.aws.getItem(params, function(error, data, local output) {
+        dyna.aws.getItem(params, function(error, data) {
             if error {
                 dynaTableError = error
                 debuglog("aws.getItem failed", tablename, ErrorString(error))
@@ -716,7 +716,7 @@ closure DynaTable(dyna, tablename, local table) {
             Item: dyna.conv.recordNaanToDyn(record)
         }
         pending = new(nonce)
-        dyna.aws.putItem(params, function(error, data, local output) {
+        dyna.aws.putItem(params, function(error, data) {
             if error {
                 dynaTableError = error
                 debuglog("aws.putItem failed", tablename, ErrorString(error))
@@ -745,7 +745,7 @@ closure DynaTable(dyna, tablename, local table) {
     // The result is a standard result tuple `(error, record).
         
     table.updateRecord = closure updateRecord(hashValue, rangeValue, options,
-        local error, params, actions, pending) {
+        local error, params, pending) {
         if preflightError(this)
             return
         params = {
@@ -817,7 +817,7 @@ closure DynaTable(dyna, tablename, local table) {
                 params.ReturnValues = "NONE"
         }
         pending = new(nonce)
-        dyna.aws.deleteItem(params, function(error, data, local output) {
+        dyna.aws.deleteItem(params, function(error, data) {
             if error {
                 dynaTableError = error
                 debuglog("aws.deleteItem failed", tablename, ErrorString(error))
@@ -868,7 +868,7 @@ closure DynaTable(dyna, tablename, local table) {
     //
 
     table.queryRecords = closure queryRecords(hashValue, options
-        local error, params, hashKey, op, expr, output, error)
+        local error, params, hashKey, output)
     {
         if preflightError(this)
             return
@@ -937,7 +937,7 @@ closure DynaTable(dyna, tablename, local table) {
     //
 
     table.scanRecords = closure scanRecords(options
-        local params, op, expr, output, error)
+        local params, output, error)
     {
         if preflightError(this)
             return

package/plugins/serviceAws/dbt_aws.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2022 by Richard C. Zulch
+ * Copyright (c) 2020-2023 by Richard C. Zulch
  *
  */
 
@@ -77,7 +77,7 @@ closure dawsBucket(s3b, local bucket, s3) {
 
         function s3GetCB(error, resp) {
             if error
-                error = Error("can't get object", error, key)
+                error = Error("can't get object", { status: error.$metadata.httpStatusCode }, error, key)
             else
                 resp.md5 = hashFromETag(resp.ETag)
             callback(error, resp)
@@ -162,7 +162,7 @@ closure dawsBucket(s3b, local bucket, s3) {
         md5 = HashMD5(data)                                                 // hex character string
         s3.putObject(params, function(error, resp) {
             if error
-                error = Error("can't put object", error, key)
+                error = Error("can't put object", { status: error.$metadata.httpStatusCode }, error, key)
             else {
                 resp.length = length(data)
                 resp.md5 = hashFromETag(resp.ETag)
@@ -188,7 +188,7 @@ closure dawsBucket(s3b, local bucket, s3) {
         }
         s3.deleteObject(params, function(error, resp) {
             if error
-                error = Error("can't delete object", error, key)
+                error = Error("can't delete object", { status: error.$metadata.httpStatusCode }, error, key)
             callback(error, resp)
         })
     }
@@ -209,7 +209,7 @@ closure dawsBucket(s3b, local bucket, s3) {
         }
         s3.copyObject(params, function(error, resp) {
             if error
-                error = Error("can't copy object", error)
+                error = Error("can't copy object", { status: error.$metadata.httpStatusCode }, error)
             callback(error, resp)
         })
     }
@@ -245,7 +245,7 @@ closure dawsBucket(s3b, local bucket, s3) {
         function listOne() {                                                // list one chunk of objects
             s3.listObjectsV2(params, function(error, resp) {
                 if error
-                    callback(Error("list objects failed", error))
+                    callback(Error("list objects failed", { status: error.$metadata.httpStatusCode }, error))
                 else {
                     if output {
                         output.Contents = output.Contents.concat(resp.Contents)
@@ -365,7 +365,7 @@ closure dawsTable(database, path, tableOptions, local table) {
     //
     // Convert an S3 get response to a new table document.
     
-    function s3resp2doc(resp, local doc, metadata, metakey) {
+    function s3resp2doc(resp, local doc) {
         if resp.Metadata.naandbt
             try {
                 doc = new(JSONparse(resp.Metadata.naandbt))
@@ -440,7 +440,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             cacheControl: tableOptions.cacheControl
         }, function(error, resp) {
             if error
-                error = Error("add failed", error, id, { status: error.$metadata.httpStatusCode })
+                error = Error("add failed", error, id, { status: error.status })
             else {
                 doc._md5 = resp.md5                                         // update the original doc
                 doc.length = resp.length }
@@ -463,7 +463,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             cacheControl: tableOptions.cacheControl
         }, function(error, resp) {
             if error
-                error = Error("update failed", error, doc._id, { status: error.$metadata.httpStatusCode })
+                error = Error("update failed", error, doc._id, { status: error.status })
             else {
                 doc._md5 = resp.md5                                         // update the original doc
                 doc.modified = undefined                                    // we don't know exact modify date
@@ -484,7 +484,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             return (asyncResult(callback, Error("invalid argument")))
         database.bucket.delete(doc._id, function(error, resp) {
             if error
-                error = Error("delete failed", error, doc._id, { status: error.$metadata.httpStatusCode })
+                error = Error("delete failed", error, doc._id, { status: error.status })
             callback(error, resp)
         })
     }
@@ -501,7 +501,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             return (asyncResult(callback, id))                              // error from makeID
         database.bucket.get(id, false, function(error, resp) {
             if error
-                error = Error("get failed", error, id, { status: error.$metadata.httpStatusCode })
+                error = Error("get failed", error, id, { status: error.status })
             else {
                 resp.key = key
                 resp = s3resp2doc(resp)
@@ -536,7 +536,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             return (asyncResult(callback, id))                                 // error from makeID
         database.bucket.get(id, true, function(error, resp) {
             if error
-                error = Error("md5 failed", error, id, { status: error.$metadata.httpStatusCode })
+                error = Error("md5 failed", error, id, { status: error.status })
             else if resp._md5
                 resp = resp._md5
             else
@@ -561,7 +561,7 @@ closure dawsTable(database, path, tableOptions, local table) {
         if id.slice(-1) == "/"
             database.bucket.list(id.slice(0,-1), true, function blcb(error, resp) {
                 if error
-                    error = Error("head failed", error, id, { status: error.$metadata.httpStatusCode })
+                    error = Error("head failed", error, id, { status: error.status })
                 else if id != resp.CommonPrefixes.0.Prefix {
                     error = Error("head not found", id, resp.CommonPrefixes.0.Prefix, { status: 404 })
                     resp = false
@@ -575,7 +575,7 @@ closure dawsTable(database, path, tableOptions, local table) {
         else
             database.bucket.get(id, true, function bgcb(error, resp) {
                 if error
-                    error = Error("head failed", error, id, { status: error.$metadata.httpStatusCode })
+                    error = Error("head failed", error, id, { status: error.status })
                 else {
                     resp.key = key
                     resp = s3resp2doc(resp)
@@ -602,7 +602,7 @@ closure dawsTable(database, path, tableOptions, local table) {
                 error = Error("copy failed", {
                     source: srckey
                     destination: destkey
-                    status: error.$metadata.httpStatusCode
+                    status: error.status
                 }, error)
             callback(error, resp)
         })
@@ -694,7 +694,7 @@ closure dawsTable(database, path, tableOptions, local table) {
             s3prefix = table.s3prefix
         database.bucket.list(s3prefix, !options.deep, function(error, objects, local obj, key) {
             if error
-                error = Error("records list failed", error, options.prefix, { status: error.$metadata.httpStatusCode })
+                error = Error("records list failed", error, options.prefix, { status: error.status })
             else {
                 for obj in objects.Contents {
                     if obj.Key.startsWith(table.s3prefix)
@@ -787,7 +787,7 @@ closure S3DB(s3b, local database, result) {
     //
     // Delete the database and close it.
 
-    database.destroy = function destroy(local pending) {
+    database.destroy = function destroy() {
         if !database.bucket
             return (list(Error("database closed")))
         list(Error("not sure how to destroy this database"))                // ### delete the base object?

package/test/harness.nlg

@@ -28,7 +28,8 @@ Naan.module.chns("Play");;
  *
  */
 
-closure Parsenv(name, local penv, gohome, saveOperators, lingo, libns, naansym) {
+closure Parsenv(name, local penv, gohome, lingo, naansym) {
+    global()
     penv = new(object, this)
     gohome = makeActivator()
     sleep(1)

package/test/test_05_strings.nlg

@@ -55,6 +55,8 @@ RegisterTestCategory("strings", [
     [ "'$$${4+3}';", '"$${4+3}"' ],
     [ "'a$${4+3}b';", '"a7b"' ],
     [ "'$${}';", '' ],
+    [ "'$${';", '' ],                                                       // ### should be "${"
+    [ "quote('a$${4*5}b');>", '(strcat "a" (* 4 5) "b")' ],
 
 
     //

package/test/test_06_lingoparse.nlg

@@ -524,6 +524,12 @@ RegisterTestCategory("Lingo parse", [
         { errors: "undeclared global at (1, 26) found c" } ],
     [ "function(a) { global(b), c * a };",
         { errors: "undeclared global at (1, 26) found c" } ],
+    [ "closure nest() { function t() { function t() { 3 } } };", "nest"],
+    [ "function errch1() { global(), while:seeking true { loop { break:seeking } } };", "errch1" ],
+    [ "closure errch2() { global(), function a() { b.proc }, function b() { a } };", "errch2" ],
+    [ "function errch3(local a) { f.g(function() { a = 3 }) };", "errch3" ],
+    [ "function errch4(local a) { try {} catch { if true { a=3 } } };", "errch4" ],
+    [ "function errch5() { function&(local a) { } };", "errch5"]
 ]);
 
 

package/test/test_07_lingo.nlg

@@ -301,14 +301,14 @@ RegisterTestCategory("Lingo", [
         "function() {"
         "   loop {"
         "       if 1 {"
-        "           2, if false"
+        "           f(), if false"
         "               break"
-        "       }, 3, break } });>", "(function lambda false (loop false (((identity 1) 2 ((identity false) (break)))) 3 (break)))" ],
+        "       }, 3, break } });>", "(function lambda false (loop false (((identity 1) (f) ((identity false) (break)))) 3 (break)))" ],
            
-    [ "quote(function(){if 1 { 2, if 3 { if 4 5 } else 6 } else 7 });",
+    [ "quote(function(){if 1 { f(), if 3 { if 4 5 } else 6 } else 7 });",
            "function () {\n"
            "    if 1 {\n"
-           "        2\n"
+           "        (f)\n"
            "        if 3 {\n"
            "            if 4\n"
            "                5 }\n"
@@ -387,7 +387,7 @@ RegisterTestCategory("Lingo", [
     [ "for x in `(a b c) print(x);>", "abc|Dictionary{8}" ],
     [ "function() { loop { if x > 3 break, 4 } };>", "(function lambda false (loop false ((> x 3)) 4))" ],
     [ "function () { for xx in [a,b,c] { if true { if xx eq 3, break }, print(xx) } }();>", "abc|Dictionary{7}" ],
-    [ "function (x) { loop try { 1, if x continue, 2, break } catch { 3 } }();", "2" ],
+    [ "function (x) { loop try { f(), if x continue, 2, break } catch { 3 } }();", "2" ],
         
     [ "miter=iterate(`(a,b,c), `x);", "{\n"
         "    target  : (a, b, c),\n"
@@ -455,11 +455,11 @@ RegisterTestCategory("Lingo", [
     [ "function(){function jim(){ print(\"1\"),function jim(){print(\"2\")}, jim()}, jim()}();", "12|\"2\"" ],
     [ "closure(){function jim(){ print(\"1\"),function jim(){print(\"2\")}, jim()}, jim()}();", "12|\"2\"" ],
     [ "function(){function jim(){print(\"1\")},function jim(){print(\"2\")}, jim()}();",
-        { errors: "exception: internal,duplicate procedure name jim in lambda" } ],
+        { errors: "duplicate procedure name at (1, 48) found jim" } ],
     [ "closure(){function jim(){print(\"1\")},function jim(){print(\"2\")}, jim()}();",
-        { errors: "exception: internal,duplicate procedure name jim in lambda" } ],
+        { errors: "duplicate procedure name at (1, 47) found jim" } ],
     [ "function(){function jim(){print(\"1\")}(),function jim(){print(\"2\")}, jim()}();",
-        { errors: "exception: internal,duplicate procedure name jim in lambda" } ],
+        { errors: "duplicate procedure name at (1, 50) found jim" } ],
         
     [ "function(){{spawn:function(){[{ok:true}]}}};", "function () {\n"
         "    {\n"
@@ -482,7 +482,7 @@ RegisterTestCategory("Lingo", [
     [ "function  eee(f) { print(f), function  iii(f) { print(f), ccc() }(7) } (4);", "47|f" ],
     [ "function  fff(f) { print(f), function& iii(f) { print(f), ccc() }(9) } (6);", "69|f" ],
 
-    [ "function  (f, local jjj) { print(f), function jjj(f) { print(f), ccc() }, jjj(21) } (22);", "2221|f" ],
+    [ "function  (f) { print(f), function jjj(f) { print(f), ccc() }, jjj(21) } (22);", "2221|f" ],
     [ "function& (f, local jjj) { print(f), function jjj(f) { print(f), ccc() }, jjj(23) } (24);", "2423|24" ],
     
     [ "function  (g, local f) { f = 17, function  f(g) { print(f, g), ccc() },  f(25) } (26);", "1725|f" ],