@naanlang/naan 1.4.4 → 1.6.0

package/plugins/serviceNexara/speechrec.nlg

@@ -100,7 +100,7 @@ closure NexaraSpeechRec(local nxspr) {
     // Convert a Nexara response to a Yandex SpeechKit structure. Hey, it was first.
     //
     function nexaraToYCSK(resp,
-        local output, wordx, segment, chunk, word, wordet) {
+        local output, wordx, segment, chunk, syncerror, word, wordet, wordtrim, tstart) {
         output = {
             \@type: "type.googleapis.com/yandex.cloud.ai.stt.v2.LongRunningRecognitionResponse"
             chunks: []
@@ -120,14 +120,18 @@ closure NexaraSpeechRec(local nxspr) {
                 ]
             }
             for word in segment.text.split(" ") {
+                if word == ""
+                    continue                                                // ignore extra spaces
                 wordet = resp.words[wordx++]
-                if wordet.word != word {
-                    debuglog("nexaraToYCSK: expected ${word} but got ${wordet.word}")
-                    return (false)
+                wordtrim = wordet.word.trim()                               // detected word without spaces
+                tstart = wordet.start.toFixed(3).concat("s")
+                if !syncerror && wordtrim != word {
+                    syncerror = true
+                    debuglog("nexaraToYCSK: warning: at ${tstart} expected '${word}' but got '${wordtrim}'")
                 }
                 chunk.alternatives.0.words.push({
-                    word: wordet.word
-                    startTime: wordet.start.toFixed(3).concat("s")
+                    word: wordtrim
+                    startTime: tstart
                     endTime: wordet.end.toFixed(3).concat("s")
                 })
             }

package/test/test_02_context.nlg

@@ -265,5 +265,28 @@ RegisterTestCategory("context", [
     [ "closure Xx(y, local xx) { xx = new(object, this) };", "Xx" ],
     [ "x = Xx(33);", "{object Xx}" ],
     [ "car(x@\\.closure.proc.2.0)", "33" ],
-    [ "new(object, 3)@*", "false" ]
+    [ "new(object, 3)@*", "false" ],
+
+    //
+    // undefined objects
+    //
+    
+    [ "closure undef(local o) {\n"
+        "   o = new(object, undef)\n"
+        "   put(o,'.undefined', function udef args {\n"
+        "       print('udef:', args)\n"
+        "   })\n"
+        "   o\n"
+      "};", "undef" ],
+    [ "oo = undef();", "{object undef}"],
+    [ "closure(c) {\n"
+        "xset(c, joe2, macro mjoe args {\n"
+        "   printline(args)\n"
+        "   deref(c, joe, args)\n"
+        "})\n"
+      "}(oo);>", "(macro mjoe args (printline args) (deref c joe args))"],
+    [ "oo.joe(8,2+5);", "udef:(joe 8 7)|(joe, 8, 7)" ],
+    [ "oo.joe2(5,9+3);", "(5 (+ 9 3))|udef:(joe 5 (+ 9 3))|(joe, 5, 9+3)" ],
+    [ "dargs = list(3,quote(2+4));", "(3, 2+4)"],
+    [ "deref(oo, joe, dargs);", "udef:(joe 3 (+ 2 4))|(joe, 3, 2+4)"]
 ]);

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: r[3].apply is not a function" }
+        "prod": { errors: "xcall \"[object Object]\": TypeError: e[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: r[3].apply is not a function" }
+        "prod": { errors: "xcall \"[object Object]\": TypeError: e[3].apply is not a function" }
     }[    "prod"]],
     [ "Number(3);", "[Number 3]" ],
     [ "Number(3).toString();", "\"3\"" ],
@@ -158,6 +158,35 @@ RegisterTestCategory("JSinterop", [
     "    } }" ],
 
     [ "function&(top,local nth){ nth=0, loop { print(nth), closure(nth) { stacktrap(nth,function&(x) { print(\" loop-\",x,\"-\",nth) }) }(nth), if nth >= top break else nth = nth+1 }, }(9);",
-        "0 loop-Dictionary{0}-01 loop-Dictionary{0}-123456789 loop-true-2 loop-true-3 loop-true-4 loop-true-5 loop-true-6 loop-true-7 loop-true-8 loop-true-9|true" ]
+        "0 loop-Dictionary{0}-01 loop-Dictionary{0}-123456789 loop-true-2 loop-true-3 loop-true-4 loop-true-5 loop-true-6 loop-true-7 loop-true-8 loop-true-9|true" ],
+
+    //
+    // Callbacks
+    //
+
+    [ "function mycb() { mynon.wait(), 15 };", "mycb"],
+    [ "oocb=xnew()", "[object Object]" ],
+    [ "oocb.mycb=mycb.proc;>", "(function mycb false (`. mynon wait false) 15)" ],
+    [ "oocb.mycb();", "15" ],
+    [ "mynon = new(nonce);", "Nonce{3}" ],
+    [ "oocb.mycb();", "true" ],
+
+    [ "@\\.suspend = 7", "7" ],
+    [ "function mycb() { mynon.wait(), 16 };", "==> redefined: mycb|mycb"],
+    [ "oocb.mycb=mycb.proc;>", "(function mycb false (`. mynon wait false) 16)" ],
+    [ "oocb.mycb();", "7" ],
+
+    //
+    // JavaScript compiled functions
+    //
+    
+    [ "putproc(`arbyarb, 'return(_lib.pl(narg,nthf));');", "[Compiled arbyarb]" ],
+    [ "arbyarb(3,5,2,4);", "3524|4" ],
+
+    [ "putproc(`bobbuiltin, 'builtin: return(_lib.j2n(_lib.n2j(cx)+_lib.n2j(cy)+_lib.n2j(cz)));');", "[Compiled bobbuiltin]" ],
+    [ "bobbuiltin(1,2,3,4);", "6" ],
+
+    [ "putproc(`joemacro, 'macro: _lib.idle();return(_lib.j2n(_lib.n2j(args[1])(_lib.n2j(args[2][1]))));');", "[Compiled joemacro]" ],
+    [ "joemacro(function(x){x+1}, 8);", "9" ]
 
 ]);

package/plugins/serviceGC/russian_trusted_root_ca_pem.crt

@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFwjCCA6qgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx
-PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu
-ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg
-Q0EwHhcNMjIwMzAxMjEwNDE1WhcNMzIwMjI3MjEwNDE1WjBwMQswCQYDVQQGEwJS
-VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg
-YW5kIENvbW11bmljYXRpb25zMSAwHgYDVQQDDBdSdXNzaWFuIFRydXN0ZWQgUm9v
-dCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMfFOZ8pUAL3+r2n
-qqE0Zp52selXsKGFYoG0GM5bwz1bSFtCt+AZQMhkWQheI3poZAToYJu69pHLKS6Q
-XBiwBC1cvzYmUYKMYZC7jE5YhEU2bSL0mX7NaMxMDmH2/NwuOVRj8OImVa5s1F4U
-zn4Kv3PFlDBjjSjXKVY9kmjUBsXQrIHeaqmUIsPIlNWUnimXS0I0abExqkbdrXbX
-YwCOXhOO2pDUx3ckmJlCMUGacUTnylyQW2VsJIyIGA8V0xzdaeUXg0VZ6ZmNUr5Y
-Ber/EAOLPb8NYpsAhJe2mXjMB/J9HNsoFMBFJ0lLOT/+dQvjbdRZoOT8eqJpWnVD
-U+QL/qEZnz57N88OWM3rabJkRNdU/Z7x5SFIM9FrqtN8xewsiBWBI0K6XFuOBOTD
-4V08o4TzJ8+Ccq5XlCUW2L48pZNCYuBDfBh7FxkB7qDgGDiaftEkZZfApRg2E+M9
-G8wkNKTPLDc4wH0FDTijhgxR3Y4PiS1HL2Zhw7bD3CbslmEGgfnnZojNkJtcLeBH
-BLa52/dSwNU4WWLubaYSiAmA9IUMX1/RpfpxOxd4Ykmhz97oFbUaDJFipIggx5sX
-ePAlkTdWnv+RWBxlJwMQ25oEHmRguNYf4Zr/Rxr9cS93Y+mdXIZaBEE0KS2iLRqa
-OiWBki9IMQU4phqPOBAaG7A+eP8PAgMBAAGjZjBkMB0GA1UdDgQWBBTh0YHlzlpf
-BKrS6badZrHF+qwshzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qwshzAS
-BgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
-AAOCAgEAALIY1wkilt/urfEVM5vKzr6utOeDWCUczmWX/RX4ljpRdgF+5fAIS4vH
-tmXkqpSCOVeWUrJV9QvZn6L227ZwuE15cWi8DCDal3Ue90WgAJJZMfTshN4OI8cq
-W9E4EG9wglbEtMnObHlms8F3CHmrw3k6KmUkWGoa+/ENmcVl68u/cMRl1JbW2bM+
-/3A+SAg2c6iPDlehczKx2oa95QW0SkPPWGuNA/CE8CpyANIhu9XFrj3RQ3EqeRcS
-AQQod1RNuHpfETLU/A2gMmvn/w/sx7TB3W5BPs6rprOA37tutPq9u6FTZOcG1Oqj
-C/B7yTqgI7rbyvox7DEXoX7rIiEqyNNUguTk/u3SZ4VXE2kmxdmSh3TQvybfbnXV
-4JbCZVaqiZraqc7oZMnRoWrXRG3ztbnbes/9qhRGI7PqXqeKJBztxRTEVj8ONs1d
-WN5szTwaPIvhkhO3CO5ErU2rVdUr89wKpNXbBODFKRtgxUT70YpmJ46VVaqdAhOZ
-D9EUUn4YaeLaS8AjSF/h7UkjOibNc4qVDiPP+rkehFWM66PVnP1Msh93tc+taIfC
-EYVMxjh8zNbFuoc7fzvvrFILLe7ifvEIUqSVIC/AzplM/Jxw7buXFeGP1qVCBEHq
-391d/9RAfaZ12zkwFsl+IKwE/OZxW8AHa9i1p4GO0YSNuczzEm4=
------END CERTIFICATE-----