nadesiko3 3.3.63 → 3.3.64

package/core/test/inline_indent_test.mjs

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 import assert from 'assert'
 import { NakoCompiler } from '../src/nako3.mjs'
 
@@ -100,4 +101,50 @@ describe('inline_indent_test', async () => {
       '    「b」と表示。\n',
       'a\na\na')
   })
+  it('2つ目の関数の定義が失敗する(#40)', async () => {
+    await cmp('' +
+        '●AAAとは:\n' +
+        '　　それは30\n' +
+        '●BBBとは:\n' +
+        '　　それは50\n' +
+        'BBBを表示。', '50')
+  })
+  it('「もし」のネスト', async () => {
+    await cmp('' +
+        'A=1;B=1;\n' +
+        'もし,A=1ならば:\n' +
+        '　　もし,B=1ならば:\n' +
+        '　　　　「A=1,B=1」と表示\n' +
+        '　　違えば:\n' +
+        '　　　　「A=1,B=0」と表示\n' +
+        '違えば:\n' +
+        '　　もし,B=1ならば:\n' +
+        '　　　　「A=0,B=1」と表示\n' +
+        '　　違えば:\n' +
+        '　　　　「A=0,B=0」と表示\n' +
+        '', 'A=1,B=1')
+    await cmp('' +
+        'A=0;B=0;\n' +
+        'もし,A=1ならば:\n' +
+        '　　もし,B=1ならば:\n' +
+        '　　　　「A=1,B=1」と表示\n' +
+        '　　違えば:\n' +
+        '　　　　「A=1,B=0」と表示\n' +
+        '違えば:\n' +
+        '　　もし,B=1ならば:\n' +
+        '　　　　「A=0,B=1」と表示\n' +
+        '　　違えば:\n' +
+        '　　　　「A=0,B=0」と表示\n' +
+        '', 'A=0,B=0')
+  })
+  it('インラインインデントでJSON(core #46)', async () => {
+    await cmp('' +
+      'A=[99]\nもしA[0]=99ならば:\n' +
+      '　　A=[0,\n0]\n' +
+      'A[0]を表示\n', '0')
+    await cmp('' +
+      'A={"a":0,"b":0}\nもし1ならば:\n' +
+      '　　A={"a":99,\n"b":99}\n' +
+      'A["b"]を表示\n', '99')
+  })
 })

package/core/test/lex_test.mjs

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 import assert from 'assert'
 import { NakoCompiler } from '../src/nako3.mjs'
 

package/demo/js/a.js

@@ -0,0 +1,30 @@
+const PluginActiveCheck = {
+  '初期化': {
+    type: 'func',
+    josi: [],
+    fn: function (sys) {
+      sys.__active = true
+      if (sys.__tid !== undefined) {
+        clearInterval(sys.__tid)
+      }
+      sys.__tid = setInterval(()=>{
+        console.log('__active=', sys.__active)
+      },1000)
+    }
+  },
+  '!クリア': {
+    type: 'func',
+    josi: [],
+    fn: function (sys) {
+      sys.__active = false
+      clearInterval(sys.__tid)
+    }
+  }
+}
+
+// CommonJS方式で自動登録を実装
+if (typeof (navigator) === 'object') {
+  navigator.nako3.addPluginObject("PluginActiveCheck", PluginActiveCheck)
+} else {
+  module.exports = pluginObj
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3",
-  "version": "3.3.63",
+  "version": "3.3.64",
   "description": "Japanese Programming Language",
   "type": "module",
   "main": "src/index.mjs",

package/release/_hash.txt

@@ -9,10 +9,10 @@ editor.js:
   sha256(base64): yCSRDXeRvPGZmcmxpMftkQCCVJrf2j1yx0rlCJqp0YE=
   sha512(base64): Smup6m3GPrnpjWnnedDl/Mi7Fg4xZQhomn3q84jigmkNQGLaByYGokLfhU18xW6lc9IOu+u9PRCauoQhlCgGZw==
 nako_gen_async.js:
-  md5(hex): 6968892ef7cbce1a0db0ea7d8f8c3dc8
-  sha256(hex): 7cd4b0d455fbaf4a4d0105c3f858e5cf4e3cb6db9c92a360e0f07d88bc62bf37
-  sha256(base64): fNSw1FX7r0pNAQXD+Fjlz048ttuckqNg4PB9iLxivzc=
-  sha512(base64): Vhw/ex/EyYmdZBxIcVDTI2JgMBmOc3mhltKuUunj0IaU9D7kfnzFuhuVyiA5K2hOoYfsR7v1xaa1eXWsI3Kdrw==
+  md5(hex): fbe87551dbfb1a88bb36e581bdcc7046
+  sha256(hex): 28270f2a6d871cfce1b2d7a3715d75a67cc7e8bad4e96512ecb7224bf74b9dfb
+  sha256(base64): KCcPKm2HHPzhstejcV11pnzH6LrU6WUS7LciS/dLnfs=
+  sha512(base64): yk+ES2Y55BhYfK4mL0s/CqqfgSshxw9sdAkjffu2xpwSyKKRMr1VF7EYRw6V1igfbGD4I6S/kpT9pZk/8oCNfw==
 plugin_caniuse.js:
   md5(hex): 95a7a5c98a92a46b6435e577daba3241
   sha256(hex): 57638b3979be70b45ab8085861f6b2ece43200bd6aa92765d73caf76b9e6fea9
@@ -54,17 +54,17 @@ plugin_weykturtle3d.js:
   sha256(base64): ND/1JqYrFVGTIPYsbBk+tScnF8RVzgYPM0/E2aE8GRw=
   sha512(base64): T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==
 version.js:
-  md5(hex): 1f1c94bb7423de4a3c8c19a9a5bd5cbf
-  sha256(hex): 0226adcf0bfbad5b5cc28a4879b063d0cb29465781f3d26c5b1f7e65b3926593
-  sha256(base64): Aiatzwv7rVtcwopIebBj0MspRleB89JsWx9+ZbOSZZM=
-  sha512(base64): DyAPxfDv5Q2fbbC9IJidx8sM2T2iCYfthM2UwmLuIAK7Eox3M9oMpepx8MqJTsLqT5kIwUG8h0WK/zrofWVFBg==
+  md5(hex): c7f1fd936c048caf8ac0fc6c0896fff4
+  sha256(hex): 19db94f870b0be7122a14762f952781123a174a81d97d05c4c72ec059eb6b5ac
+  sha256(base64): GduU+HCwvnEioUdi+VJ4ESOhdKgdl9BcTHLsBZ62taw=
+  sha512(base64): cvQX/02nmJTUJ8UE8xAuVyYFiedlpALEEH2ygSA8BqUWHzzVcml7d9VkIC7j/+Kmzp4/Ildpeh85eUPz1/X+8Q==
 wnako3.js:
-  md5(hex): 9e33a345effaa9138fca7c5dee14cf88
-  sha256(hex): 16989d5700143641a800de611d4eaf12d967ab7a1c3692e383b3d0a4d3217214
-  sha256(base64): FpidVwAUNkGoAN5hHU6vEtlnq3ocNpLjg7PQpNMhchQ=
-  sha512(base64): xV+AB3l38DI0AAx6o9VcxRS2NhUHHsvz8v6DbJXDbRhIgmBBSfGx2mzAri+iTn0WgXA2lmwyk0nWjnNt315CuA==
+  md5(hex): 23a9d97348fd9cd563a8c1f9809180e9
+  sha256(hex): 5a688c513bb9b1c5c928e8a9f7abbd58496faa82978ca66608684fe7a7a4251f
+  sha256(base64): WmiMUTu5scXJKOip96u9WElvqoKXjKZmCGhP56ekJR8=
+  sha512(base64): uo+98+GwN/P7xEvHfgh2MStl2y5PpyQ/MtCSnumKMljfGHsVOsSD3EqsKZCeGDea/30xuUTBnC4frIBBq83jaQ==
 wnako3webworker.js:
-  md5(hex): 2037184355f0eee59ce3ab06533b58f1
-  sha256(hex): ccae1874db3853798eeea1b977c5a5f4bd5ad86dfefd2eadb1e55ac42155233a
-  sha256(base64): zK4YdNs4U3mO7qG5d8Wl9L1a2G3+/S6tseVaxCFVIzo=
-  sha512(base64): SVGahPR/RbmwzXw/cHzWSpDV8XDXXx7Ihmwvz+4q23aJg0eDGL8WTd9NiRWAEpRm/VIadBj1PDE6tcuu4scXYA==
+  md5(hex): 2b73c6ea16ce17069fe96b85fcb7a849
+  sha256(hex): 954994fc4ab81d4c64552f840a1c91dd5a3eb0b5268d325c6cf470dbdf31f18d
+  sha256(base64): lUmU/Eq4HUxkVS+EChyR3Vo+sLUmjTJcbPRw298x8Y0=
+  sha512(base64): pP85w6f7IDe/ZUMaushFO5a/XPrikM6hXGcU1zhhXTnRoO4DKtnzlosimlq+EI0ZkQz6RhLg4XJE5ioSUCovdg==

package/release/_script-tags.txt

@@ -1,14 +1,14 @@
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/command.json.js" integrity="sha512-oymKntu7VidEOP8+ZFUV/5YWCb+AjbzkUll5EdVg4yWy8OOJpY0gxolztfcHE+WPu0hkOB/lCaP9L4YNHRiRvQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/editor.js" integrity="sha512-Smup6m3GPrnpjWnnedDl/Mi7Fg4xZQhomn3q84jigmkNQGLaByYGokLfhU18xW6lc9IOu+u9PRCauoQhlCgGZw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/nako_gen_async.js" integrity="sha512-Vhw/ex/EyYmdZBxIcVDTI2JgMBmOc3mhltKuUunj0IaU9D7kfnzFuhuVyiA5K2hOoYfsR7v1xaa1eXWsI3Kdrw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/plugin_caniuse.js" integrity="sha512-NbX6BKUNq1J8xwtv5CThQC54Lb/KxaPlimRpsF745nxqjYeuGD7S70j4yOgNm4Uwd7AN5FgezS6NDyhlvoJF2w==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/plugin_csv.js" integrity="sha512-mQvmj25L2Nc2L7gN1rTjayHVMMPhc7TCSiBsuKS4JKOQqN+91uj9qpLAOejzR1ib5jIOBdtrhN+secNTU9BJtw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/plugin_datetime.js" integrity="sha512-1ADTZFkcfU6vpEEJZEYmIbqS6G2XViooDFD4198P61n7VKZ0PhEVj9l8ULFGrW7woSbDqfSPZmkZ7yvcRqPKYA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/plugin_kansuji.js" integrity="sha512-tXC9Q6LejwYG+HUbXcwBHFmhwTsqiMHOBohLNcSx8b02hxk3waPUEQRWeNP7QxAFMv5BOAY+Grruf+XKmmU26g==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/plugin_markup.js" integrity="sha512-pvb+QYO9LMUH055nPJJ5QaWyEYR3wDkHHilV5LLNyxObs7enlHGiF7Jt3Csd93JTdJ3n9hxFbTqWa1QuzVmTfQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/plugin_turtle.js" integrity="sha512-3/BlAe3uVDBgJrgFWzLJa3bvNQVhAQuL343Icict5hI3LndcPjV6mAD8KoWRlxmF8A8S6n8eKnmrh6NFWTjyEw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/plugin_webworker.js" integrity="sha512-JLlIg9cW9UgM2AT+qMgEuKvea3t8R+1jihhlN/QGDQe7iCaGEfXfKG5gpvRb0IUyisNfzncUN8AfLn9wyxGGiw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/plugin_weykturtle3d.js" integrity="sha512-T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/version.js" integrity="sha512-DyAPxfDv5Q2fbbC9IJidx8sM2T2iCYfthM2UwmLuIAK7Eox3M9oMpepx8MqJTsLqT5kIwUG8h0WK/zrofWVFBg==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/wnako3.js" integrity="sha512-xV+AB3l38DI0AAx6o9VcxRS2NhUHHsvz8v6DbJXDbRhIgmBBSfGx2mzAri+iTn0WgXA2lmwyk0nWjnNt315CuA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.63&f=release/wnako3webworker.js" integrity="sha512-SVGahPR/RbmwzXw/cHzWSpDV8XDXXx7Ihmwvz+4q23aJg0eDGL8WTd9NiRWAEpRm/VIadBj1PDE6tcuu4scXYA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/command.json.js" integrity="sha512-oymKntu7VidEOP8+ZFUV/5YWCb+AjbzkUll5EdVg4yWy8OOJpY0gxolztfcHE+WPu0hkOB/lCaP9L4YNHRiRvQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/editor.js" integrity="sha512-Smup6m3GPrnpjWnnedDl/Mi7Fg4xZQhomn3q84jigmkNQGLaByYGokLfhU18xW6lc9IOu+u9PRCauoQhlCgGZw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/nako_gen_async.js" integrity="sha512-yk+ES2Y55BhYfK4mL0s/CqqfgSshxw9sdAkjffu2xpwSyKKRMr1VF7EYRw6V1igfbGD4I6S/kpT9pZk/8oCNfw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/plugin_caniuse.js" integrity="sha512-NbX6BKUNq1J8xwtv5CThQC54Lb/KxaPlimRpsF745nxqjYeuGD7S70j4yOgNm4Uwd7AN5FgezS6NDyhlvoJF2w==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/plugin_csv.js" integrity="sha512-mQvmj25L2Nc2L7gN1rTjayHVMMPhc7TCSiBsuKS4JKOQqN+91uj9qpLAOejzR1ib5jIOBdtrhN+secNTU9BJtw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/plugin_datetime.js" integrity="sha512-1ADTZFkcfU6vpEEJZEYmIbqS6G2XViooDFD4198P61n7VKZ0PhEVj9l8ULFGrW7woSbDqfSPZmkZ7yvcRqPKYA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/plugin_kansuji.js" integrity="sha512-tXC9Q6LejwYG+HUbXcwBHFmhwTsqiMHOBohLNcSx8b02hxk3waPUEQRWeNP7QxAFMv5BOAY+Grruf+XKmmU26g==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/plugin_markup.js" integrity="sha512-pvb+QYO9LMUH055nPJJ5QaWyEYR3wDkHHilV5LLNyxObs7enlHGiF7Jt3Csd93JTdJ3n9hxFbTqWa1QuzVmTfQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/plugin_turtle.js" integrity="sha512-3/BlAe3uVDBgJrgFWzLJa3bvNQVhAQuL343Icict5hI3LndcPjV6mAD8KoWRlxmF8A8S6n8eKnmrh6NFWTjyEw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/plugin_webworker.js" integrity="sha512-JLlIg9cW9UgM2AT+qMgEuKvea3t8R+1jihhlN/QGDQe7iCaGEfXfKG5gpvRb0IUyisNfzncUN8AfLn9wyxGGiw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/plugin_weykturtle3d.js" integrity="sha512-T4B8Cvhn9j5YdMGk4rwPInfqmcXtGEjD2g6X6wSqXvYyIXuSy+t1RVf1viZ2zljHlk3wN6pwKvvg/NIJvfMAzw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/version.js" integrity="sha512-cvQX/02nmJTUJ8UE8xAuVyYFiedlpALEEH2ygSA8BqUWHzzVcml7d9VkIC7j/+Kmzp4/Ildpeh85eUPz1/X+8Q==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/wnako3.js" integrity="sha512-uo+98+GwN/P7xEvHfgh2MStl2y5PpyQ/MtCSnumKMljfGHsVOsSD3EqsKZCeGDea/30xuUTBnC4frIBBq83jaQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.3.64&f=release/wnako3webworker.js" integrity="sha512-pP85w6f7IDe/ZUMaushFO5a/XPrikM6hXGcU1zhhXTnRoO4DKtnzlosimlq+EI0ZkQz6RhLg4XJE5ioSUCovdg==" crossorigin="anonymous"></script>