nadesiko3 3.6.21 → 3.6.23

package/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3core",
-  "version": "3.6.21",
+  "version": "3.6.22",
   "description": "Japanese Programming Language Nadesiko v3 core",
   "main": "index.mjs",
   "type": "module",
@@ -10,6 +10,7 @@
     "test:indent": "mocha ./test/indent_test.mjs",
     "test:indent_inline": "mocha ./test/inline_indent_test.mjs",
     "test:a": "mocha ./test/side_effects_test.mjs",
+    "clean": "cnako3 batch/clean.nako3",
     "tsc": "tsc --watch",
     "build": "tsc && node command/snako.mjs batch/build_nako_version.nako3 && tsc",
     "eslint": "eslint ./src/*.mts",

package/core/src/nako_ast.mts

@@ -152,6 +152,7 @@ export interface AstFor extends AstBlocks {
   // blocks[2] ... valueInc
   // blocks[3] ... loop block
   flagDown: boolean; // 
+  flagUp: boolean; // 
   loopDirection: null | 'up' | 'down'; // ループの方向
 }
 

package/core/src/nako_core_version.mjs

@@ -1,8 +1,8 @@
 // 実際のバージョン定義 (自動生成されるので以下を編集しない)
 const coreVersion = {
-    version: '3.6.20',
+    version: '3.6.22',
     major: 3,
     minor: 6,
-    patch: 20
+    patch: 22
 };
 export default coreVersion;

package/core/src/nako_core_version.mts

@@ -11,9 +11,9 @@ export interface NakoCoreVersion {
 }
 // 実際のバージョン定義 (自動生成されるので以下を編集しない)
 const coreVersion: NakoCoreVersion = {
-  version: '3.6.20',
+  version: '3.6.22',
   major: 3,
   minor: 6,
-  patch: 20
+  patch: 22
 }
 export default coreVersion

package/core/src/nako_gen.mjs

@@ -1071,6 +1071,7 @@ export class NakoGen {
             made = this._convGen(astTo, true);
         }
         const flagDown = node.flagDown;
+        const flagUp = node.flagUp;
         let inc = '1';
         if (astInc.type !== 'nop') {
             inc = this._convGen(astInc, true);
@@ -1083,11 +1084,13 @@ export class NakoGen {
             `const ${varFrom} = ${kara};\n` +
             `const ${varTo} = ${made};\n` +
             `if (${varFrom} <= ${varTo}) { // up\n` +
-            `  for (let ${varI} = ${varFrom}; ${varI} <= ${varTo}; ${varI}+= ${inc}) {\n` +
-            `    ${sorePrefex};${loopVarSetter}\n` +
-            '    // for block begin\n' +
-            `    ${block}\n` +
-            '    // for block end\n' +
+            `  if (${flagUp}) {` +
+            `    for (let ${varI} = ${varFrom}; ${varI} <= ${varTo}; ${varI}+= ${inc}) {\n` +
+            `      ${sorePrefex};${loopVarSetter}\n` +
+            '      // for block begin\n' +
+            `      ${block}\n` +
+            '      // for block end\n' +
+            '    };\n' +
             '  };\n' +
             '} else { // down\n' +
             `  if (${flagDown}) {` +

package/core/src/nako_gen.mts

@@ -1141,6 +1141,7 @@ export class NakoGen {
       made = this._convGen(astTo, true)
     }
     const flagDown = node.flagDown
+    const flagUp = node.flagUp
     let inc = '1'
     if (astInc.type !== 'nop') {
       inc = this._convGen(astInc, true)
@@ -1154,11 +1155,13 @@ export class NakoGen {
       `const ${varFrom} = ${kara};\n` +
       `const ${varTo} = ${made};\n` +
       `if (${varFrom} <= ${varTo}) { // up\n` +
-      `  for (let ${varI} = ${varFrom}; ${varI} <= ${varTo}; ${varI}+= ${inc}) {\n` +
-      `    ${sorePrefex};${loopVarSetter}\n` +
-      '    // for block begin\n' +
-      `    ${block}\n` +
-      '    // for block end\n' +
+      `  if (${flagUp}) {` +
+      `    for (let ${varI} = ${varFrom}; ${varI} <= ${varTo}; ${varI}+= ${inc}) {\n` +
+      `      ${sorePrefex};${loopVarSetter}\n` +
+      '      // for block begin\n' +
+      `      ${block}\n` +
+      '      // for block end\n' +
+      '    };\n' +
       '  };\n' +
       '} else { // down\n' +
       `  if (${flagDown}) {` +

package/core/src/nako_parser3.mjs

@@ -1070,6 +1070,7 @@ export class NakoParser extends NakoParserBase {
     yFor() {
         const errorForArguments = '『繰り返す』文でAからBまでの指定がありません。';
         let flagDown = true; // AからBまでの時、A>=Bを許容するかどうか
+        let flagUp = true; // AからBまでの時、A<=Bを許容するかどうか
         let loopDirection = null; // ループの方向を一方向に限定する
         const map = this.peekSourceMap();
         if (this.check('繰返') || this.check('増繰返') || this.check('減繰返')) {
@@ -1086,6 +1087,9 @@ export class NakoParser extends NakoParserBase {
                 if (incdec.value === '増') {
                     flagDown = false;
                 }
+                else {
+                    flagUp = false;
+                }
                 const w = incdec.value + kurikaesu.type;
                 if (w == '増繰返') {
                     kurikaesu.type = '増繰返';
@@ -1108,6 +1112,9 @@ export class NakoParser extends NakoParserBase {
             if (kurikaesu.type === '増繰返') {
                 flagDown = false;
             }
+            else {
+                flagUp = false;
+            }
             loopDirection = kurikaesu.type === '増繰返' ? 'up' : 'down';
         }
         const vTo = this.popStack(['まで', 'を']); // 範囲オブジェクトの場合もあり
@@ -1164,6 +1171,7 @@ export class NakoParser extends NakoParserBase {
             type: 'for',
             blocks: [vFrom, vTo, vInc, block],
             flagDown,
+            flagUp,
             loopDirection,
             word: wordStr,
             josi: '',

package/core/src/nako_parser3.mts

@@ -935,6 +935,7 @@ export class NakoParser extends NakoParserBase {
   yFor (): AstFor | null {
     const errorForArguments = '『繰り返す』文でAからBまでの指定がありません。'
     let flagDown = true // AからBまでの時、A>=Bを許容するかどうか
+    let flagUp = true // AからBまでの時、A<=Bを許容するかどうか
     let loopDirection : null | 'up' | 'down' = null // ループの方向を一方向に限定する
     const map = this.peekSourceMap()
     if (this.check('繰返') || this.check('増繰返') || this.check('減繰返')) {
@@ -947,7 +948,7 @@ export class NakoParser extends NakoParserBase {
     const incdec = this.stack.pop()
     if (incdec) {
       if (incdec.type === 'word' && (incdec.value === '増' || incdec.value === '減')) {
-        if (incdec.value === '増') { flagDown = false }
+        if (incdec.value === '増') { flagDown = false } else { flagUp = false }
         const w = incdec.value + kurikaesu.type
         if (w == '増繰返') {
           kurikaesu.type =  '増繰返'
@@ -964,7 +965,7 @@ export class NakoParser extends NakoParserBase {
     let vInc: Ast = this.yNop()
     if (kurikaesu.type === '増繰返' || kurikaesu.type === '減繰返') {
       vInc = this.popStack(['ずつ']) || this.yNop()
-      if (kurikaesu.type === '増繰返') { flagDown = false }
+      if (kurikaesu.type === '増繰返') { flagDown = false } else { flagUp = false }
       loopDirection = kurikaesu.type === '増繰返' ? 'up' : 'down'
     }
     const vTo = this.popStack(['まで', 'を']) // 範囲オブジェクトの場合もあり
@@ -1013,6 +1014,7 @@ export class NakoParser extends NakoParserBase {
       type: 'for',
       blocks: [vFrom, vTo, vInc, block],
       flagDown,
+      flagUp,
       loopDirection,
       word: wordStr,
       josi: '',

package/core/test/dncl2_test.mjs

@@ -25,7 +25,7 @@ describe('dncl2 (core #41)', async () => {
       'C=10\n' +
       'Iを1から10まで1ずつ減らしながら:\n' +
       '　　C=C-1\n' +
-      'Cを表示', '0')
+      'Cを表示', '10')
   })
   it('繰り返し文([繰り返す]あり)', async () => {
     await cmp('!DNCL2\n' +
@@ -37,7 +37,7 @@ describe('dncl2 (core #41)', async () => {
       'C=10\n' +
       'Iを1から10まで1ずつ減らしながら繰り返す:\n' +
       '　　C=C-1\n' +
-      'Cを表示', '0')
+      'Cを表示', '10')
     await cmp('!DNCL2\n' +
       'C=0\n' +
       'm を 1 から 3 まで 1 ずつ増やしながら繰り返す:\n' +

package/core/test/flow_test.mjs

@@ -429,6 +429,24 @@ describe('flow_test', async () => {
       'ここまで\n' +
       'Aを表示;', '321')
   })
+  it('「AからBまでNずつ減らし繰り返す」文でBからAまでも実行してしまう問題 #1753', async () => {
+    await cmp(
+      'A="";Nを1から3まで繰り返す\n' +
+      '　　A=A&N\n' +
+      'ここまで\n' +
+      'Aを表示;', '123')
+    // 増やすのに減らさない
+    await cmp(
+      'A="";Nを1から3まで1ずつ増やし繰り返す\n' +
+      '　　A=A&N\n' +
+      'ここまで\n' +
+      'Aを表示;', '123')
+    await cmp(
+      'A="";Nを1から3まで1ずつ減らし繰り返す\n' +
+      '　　A=A&N\n' +
+      'ここまで\n' +
+      'Aを表示;', '')
+  })
   it('もしの省略を実装する nadesiko3#1604', async () => {
     await cmp(
       'A=10;Aが10と一致するならば\n' +

package/core/tsconfig.json

@@ -103,8 +103,8 @@
     */
   },
   /* "extends": "./core/tsconfig.json", */
-  "exclude": ["core/deno/*", "deno/*", "utils/*", "core/sample/*"],
-  "include": ["core/*", "core/src/*", "src/*"],
+  "exclude": ["deno/*", "utils/*", "sample/*"],
+  "include": ["src/*", "command/*", "test/*"],
   "ts-node": {
     "esm": true
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3",
-  "version": "3.6.21",
+  "version": "3.6.23",
   "description": "Japanese Programming Language",
   "type": "module",
   "main": "src/index.mjs",
@@ -29,6 +29,7 @@
     "build:nako_version": "node src/cnako3.mjs batch/build_nako_version.nako3",
     "build:tsc": "tsc",
     "build": "npm run build:tsc && npm run build:nako_version && npm run build:tsc && npm run build:command && npm run build:esbuild && node src/cnako3.mjs batch/calc_hash.nako3",
+    "build:core": "cd core && npm run build",
     "build:watch": "node bundle_esbuild.js --watch",
     "clean": "npm run build:tsc && node src/cnako3.mjs batch/clean.nako3",
     "tsc": "tsc --watch",
@@ -110,7 +111,7 @@
     "crypto-browserify": "^3.12.0",
     "css-loader": "^7.1.1",
     "es6-promise": "^4.2.8",
-    "esbuild": "0.23.1",
+    "esbuild": "0.24.0",
     "eslint": "^8.57.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
@@ -120,7 +121,7 @@
     "globals": "^15.1.0",
     "hotkeys-js": "^3.13.7",
     "markdownlint": "^0.35.0",
-    "markdownlint-cli": "^0.41.0",
+    "markdownlint-cli": "^0.42.0",
     "mocha": "^10.4.0",
     "mocha-css": "^1.0.1",
     "module-alias": "^2.2.3",

package/release/_hash.txt

@@ -1,8 +1,8 @@
 command.json.js:
-  md5(hex): 84362eea2e3b9e9e98a5e9347e9ce893
-  sha256(hex): 2474bde61a038d6810e3976889b180e3a388f943b2ba93b95d9b3841c7dc1753
-  sha256(base64): JHS95hoDjWgQ45doibGA46OI+UOyupO5XZs4QcfcF1M=
-  sha512(base64): S3byWtbA4Q52Kje4SeEPUvd3MLS7gx23YQNi5tWntuXYziAIG2Vu4sS53SnNfCaG5gAhiaHxB2BYSWMge1tyTw==
+  md5(hex): 449b407d05b4f2e24902f89b4b99f11b
+  sha256(hex): 18aa800c04c22650b7e4a3faf94e329636ecdc1174a18889e5fdff2fc931dff4
+  sha256(base64): GKqADATCJlC35KP6+U4yljbs3BF0oYiJ5f3/L8kx3/Q=
+  sha512(base64): xPenQ4Jr6UqAw0nk+iPNa1t5vXo3dQqCSoxFU4pBEvWOlYiALGXSBsmopgwBk290vdPa0aOd8zKKi1yeU8sBZw==
 core_src_nako_josi_list_mjs.js:
   md5(hex): 2fc99e9b0127c3a50756d4ba4dcc2568
   sha256(hex): 09821bf4b80ff1c7445cccd154685d00ac2f53a65a3382f4e96e70ac6676330b
@@ -14,10 +14,10 @@ core_src_nako_reserved_words_mjs.js:
   sha256(base64): 5aJLQsB3GeRK5kfAq4b0Azk0ZCw+3Dv1gU0iOuelIZc=
   sha512(base64): UzZigh2tIhgBO3+Sp1wnqKMvAGfhqSRdH2+ffmRy4+8CVNEeepddaDV0oKJ+vyvi28zQLmXeMsjRu+Frj3YlTg==
 edit_main.js:
-  md5(hex): 05f334036f6bd9f453c2190b9c5e9318
-  sha256(hex): 578da32e264fdaedf21e1b0e51ccbc52515008057a2413b136e7c3ba5aeaa70c
-  sha256(base64): V42jLiZP2u3yHhsOUcy8UlFQCAV6JBOxNufDulrqpww=
-  sha512(base64): lxV1LclyAeTf0BcjFUbHdiZqlSCby43rV3Ra6MkkuGLncH4HXfHsf85GNt6+SL5ada9I4dRoAJ1bD9IToeq+zw==
+  md5(hex): 75f6a3541b8e8ab87d54d8e455672cd3
+  sha256(hex): 7b9148e1d7260ee009ef43f8825ce4aebd1b590eed2f4a6d7d756afca8c3e271
+  sha256(base64): e5FI4dcmDuAJ70P4glzkrr0bWQ7tL0ptfXVq/KjD4nE=
+  sha512(base64): mIc6yc7LR43KMaYWcMm2HLzR/YWyYoY74pCU8D6o6QpRNArTHQFBUBLblV7rJjIeNCop8R7UBk1vOB1uqERd1Q==
 edit_main.js:
   md5(hex): 57ca3d9fbf56352e72858c7ce0b09483
   sha256(hex): 9ab24fc718a835070d72d23bafd8e90de25e86f755fba67fee6238347201a422
@@ -29,10 +29,10 @@ version_main.js:
   sha256(base64): BolWQdiyjXjgsV7rd9zbBaP5hJYi3ZWU6lucT5V8fkQ=
   sha512(base64): KMEb25tO1BMsNxzECPwLM6bi1IIS5wX+VRN6mdzbqhtqPr7eY1K7Wwg66MpCmhrc45KoEJthR4NWyw9O7ODgLw==
 editor.js:
-  md5(hex): 05f334036f6bd9f453c2190b9c5e9318
-  sha256(hex): 578da32e264fdaedf21e1b0e51ccbc52515008057a2413b136e7c3ba5aeaa70c
-  sha256(base64): V42jLiZP2u3yHhsOUcy8UlFQCAV6JBOxNufDulrqpww=
-  sha512(base64): lxV1LclyAeTf0BcjFUbHdiZqlSCby43rV3Ra6MkkuGLncH4HXfHsf85GNt6+SL5ada9I4dRoAJ1bD9IToeq+zw==
+  md5(hex): 75f6a3541b8e8ab87d54d8e455672cd3
+  sha256(hex): 7b9148e1d7260ee009ef43f8825ce4aebd1b590eed2f4a6d7d756afca8c3e271
+  sha256(base64): e5FI4dcmDuAJ70P4glzkrr0bWQ7tL0ptfXVq/KjD4nE=
+  sha512(base64): mIc6yc7LR43KMaYWcMm2HLzR/YWyYoY74pCU8D6o6QpRNArTHQFBUBLblV7rJjIeNCop8R7UBk1vOB1uqERd1Q==
 nako_gen_async.js:
   md5(hex): 42d5fed01039474ff197d449c27c84ad
   sha256(hex): d78d516b32b551c4a51ceef529568760783c84f6c5d90029fa9b38922d5b4430
@@ -144,22 +144,22 @@ wnako3webworker.js:
   sha256(base64): zkHQ1vYOjoH4nffi+OulPeq/tql28XhdNuKpcaBCOKk=
   sha512(base64): cY0Mzrpoz/uEyY1n8MeJeWdDmm9vqI7dh28wEqJGtVRfYOJvDHiYDzzlfGndOWmzZmHUK6ZAE7YaUJ7zZxiZLw==
 version.js:
-  md5(hex): 036dfc9eca4f63e4e53f11a5a1597260
-  sha256(hex): e7d49390d7ff73ad9a533f0c907c11ea5e1905fed979aa34618182e123d61f34
-  sha256(base64): 59STkNf/c62aUz8MkHwR6l4ZBf7Zeao0YYGC4SPWHzQ=
-  sha512(base64): FA7YvspBoZepTXpf6y/NOd1MTaoBtZ2D9JDA8Ra99NAi3GOWxTF2WA/c9QS3KlAcRCJAwSOW5r7uc0gBczeYWw==
+  md5(hex): 7e42b4d7231b390f5b7e435223e3d461
+  sha256(hex): 5184a1fe30184cda7e8fed3086fa527ff0626bd33c915754c73a1fee4bd7181d
+  sha256(base64): UYSh/jAYTNp+j+0whvpSf/Bia9M8kVdUxzof7kvXGB0=
+  sha512(base64): k/X8zJOzVxlQWWaMWqb2XFf9XovNbQv8XzCwvWS1/LyHA5aKNdyCJK3bq6SnaYttZMKSlztrw4TuV+m1vqvvWQ==
 version_main.js:
-  md5(hex): 036dfc9eca4f63e4e53f11a5a1597260
-  sha256(hex): e7d49390d7ff73ad9a533f0c907c11ea5e1905fed979aa34618182e123d61f34
-  sha256(base64): 59STkNf/c62aUz8MkHwR6l4ZBf7Zeao0YYGC4SPWHzQ=
-  sha512(base64): FA7YvspBoZepTXpf6y/NOd1MTaoBtZ2D9JDA8Ra99NAi3GOWxTF2WA/c9QS3KlAcRCJAwSOW5r7uc0gBczeYWw==
+  md5(hex): 7e42b4d7231b390f5b7e435223e3d461
+  sha256(hex): 5184a1fe30184cda7e8fed3086fa527ff0626bd33c915754c73a1fee4bd7181d
+  sha256(base64): UYSh/jAYTNp+j+0whvpSf/Bia9M8kVdUxzof7kvXGB0=
+  sha512(base64): k/X8zJOzVxlQWWaMWqb2XFf9XovNbQv8XzCwvWS1/LyHA5aKNdyCJK3bq6SnaYttZMKSlztrw4TuV+m1vqvvWQ==
 wnako3.js:
-  md5(hex): 7bf85f51a1bd93b64e745e3eb1782d67
-  sha256(hex): bfa3fa92b6920154f76fb4246ec1471a3bc24a26070d49c8ded56425426ba55b
-  sha256(base64): v6P6kraSAVT3b7QkbsFHGjvCSiYHDUnI3tVkJUJrpVs=
-  sha512(base64): r9wh3bU6XYu/RPPteNaFUagyQiA96kmugQRHUVGnv/MmXNOLK3U//+IHje8PDqu4D7lTjxciEVxeNZqK2Ak/AA==
+  md5(hex): c164784113df88d8c24c748dc3330085
+  sha256(hex): 573f7f11435e7eaa46c5e8c2a09a0786b4397ecfb3fadf2840982c0debc608d3
+  sha256(base64): Vz9/EUNefqpGxejCoJoHhrQ5fs+z+t8oQJgsDevGCNM=
+  sha512(base64): qr2foAD+GhaDZ1OMpn37YZNIIGmTJnXeT4qudeJWrcxUCYkdynidyg+E/MrcZOv/atEwY6qUmbXC/S9TpLZKxQ==
 wnako3webworker.js:
-  md5(hex): 5ca285de0c812f33ca6a06f01ac27243
-  sha256(hex): ffae9313994f67b2b1482221ac46c7d3cf1184be6644f901327797371e00798a
-  sha256(base64): /66TE5lPZ7KxSCIhrEbH088RhL5mRPkBMneXNx4AeYo=
-  sha512(base64): xV9gE5+/z3NMIjLfsc4TqwUG2/+tgTXvUuzRKJqaO3qRBGyB2dmf35/gI/L9eeWur2ezqJ6rSTphKn6h8fimcg==
+  md5(hex): e4722fd34759a8de3fe5122f427af49c
+  sha256(hex): d85fe1ab3e0369a36fa1fc1126de4d056f856f694bb823bcfec2c598fd3d18d9
+  sha256(base64): 2F/hqz4DaaNvofwRJt5NBW+Fb2lLuCO8/sLFmP09GNk=
+  sha512(base64): HGE4GxYu8/YC19l7qvbmXTfKEBsQm30D0nPUqrbFohF1VHiTWRwnkpO6FJqLmfLbFALonnWwd+9OpUJUi+y67w==

package/release/_script-tags.txt

@@ -1,33 +1,33 @@
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/command.json.js" integrity="sha512-S3byWtbA4Q52Kje4SeEPUvd3MLS7gx23YQNi5tWntuXYziAIG2Vu4sS53SnNfCaG5gAhiaHxB2BYSWMge1tyTw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/core_src_nako_josi_list_mjs.js" integrity="sha512-0+LAeEfPy2Lrl+DeJMjbBIUda9Y5ttpLGy3/FW8rjSW8bN3udrALJa5V/bhjxU7mYouumV/QGN2wt3oxMCKy9g==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/core_src_nako_reserved_words_mjs.js" integrity="sha512-UzZigh2tIhgBO3+Sp1wnqKMvAGfhqSRdH2+ffmRy4+8CVNEeepddaDV0oKJ+vyvi28zQLmXeMsjRu+Frj3YlTg==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/edit_main.js" integrity="sha512-lxV1LclyAeTf0BcjFUbHdiZqlSCby43rV3Ra6MkkuGLncH4HXfHsf85GNt6+SL5ada9I4dRoAJ1bD9IToeq+zw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/edit_main.js" integrity="sha512-VluJJhYbxG+I5sofn1bKqOuIqMXdCyUUM9dnSBEVAkUXUy/ENHfG6hQFTZULcHy9iNfqPHXTfWuCgyMzQ9Hxrg==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/version_main.js" integrity="sha512-KMEb25tO1BMsNxzECPwLM6bi1IIS5wX+VRN6mdzbqhtqPr7eY1K7Wwg66MpCmhrc45KoEJthR4NWyw9O7ODgLw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/editor.js" integrity="sha512-lxV1LclyAeTf0BcjFUbHdiZqlSCby43rV3Ra6MkkuGLncH4HXfHsf85GNt6+SL5ada9I4dRoAJ1bD9IToeq+zw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/nako_gen_async.js" integrity="sha512-/73lycspxJ921s+NmqaOKF58X9rCsgEZrZT4O4sW1aCe5CSXtQevIasAoGgIoL3a5RmlaghbaIVASwAgmoE3+g==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_caniuse.js" integrity="sha512-V6nOBHnhxPChu+S/LfB7elCeBk985ukLmBmkCyPk4ai5VfoJZuOIttg72PbZSxWfP5eQTrlLNajsorfwNw/vcA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_datetime.js" integrity="sha512-ofb5jVaHjjTRoCAmHnbewc2fS8vr1oEkX/B3WoOCjYpDnZ3nnl3EDz6fdAS8CFFzGvuekCk2RFN5BuM9kX6FAg==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_kansuji.js" integrity="sha512-N+S8Th1yCiQy3q5jh0TFvlTOtrWNE82a4UJZ9O3ml3BGBYA141bpWlJR5c34dObTe1prbLJZ7v5WvV0vnDnr9A==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_keigo.js" integrity="sha512-u067+CeBvMb6+oINFY9Wz77GBk4NSxS2+k35GJ3RsFFmphJliwzwmV2ceID0gZ4mbjJ0xJHQX9WIypiyI6yfdA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_markup.js" integrity="sha512-mEcV3CYWM6+zmuxgojP/9wbQNtkTPuPzFHo1KTG2TPaDbSfdPZCazFcNmdjJ95o7+VFfxs2Id7yB02bqSeBxNg==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_three.js" integrity="sha512-4loRkhlxZ9A9v5t3sk5VECW7T33axIVbBQgwkNdgcjk03yRqAvxut5OS4n3BBS4jnWWHOE3i0vj9qxOOp4uV3Q==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_toml.js" integrity="sha512-Z4JmOCY66VuyoD8m4dCzKttEbCTEUfqyuqlmcOhs69m/88skKcPYWXi+4W+Td5LdI3xqezn4BkN32F9ZkPzUpQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_turtle.js" integrity="sha512-ce8etr+HoC+UjUyXSgxJzy3+pOYhsBdt9jDzhks2H/eEPQ1gIz7M8hoeyP0223zLLZHBBzlHiL/a6mmJdoKQ+w==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_webworker.js" integrity="sha512-6UHX2dgMPRY4BuIxLXaERKaA8Wg5eK2pWy+OysU0/+gt2E15M7K5Vr8+4CQt6hylWnmzmJQJfgObIr+yjW5kPw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_weykturtle3d.js" integrity="sha512-ONFdombPCdgdnXs7VMUAHpe8IBvTuLzSgzmERf1jEhHo4l06wDpkpRRCk3/9a1hiXRHQ+le2LZBT7XH4VA27sQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_caniuse.js" integrity="sha512-V6nOBHnhxPChu+S/LfB7elCeBk985ukLmBmkCyPk4ai5VfoJZuOIttg72PbZSxWfP5eQTrlLNajsorfwNw/vcA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_datetime.js" integrity="sha512-ofb5jVaHjjTRoCAmHnbewc2fS8vr1oEkX/B3WoOCjYpDnZ3nnl3EDz6fdAS8CFFzGvuekCk2RFN5BuM9kX6FAg==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_kansuji.js" integrity="sha512-N+S8Th1yCiQy3q5jh0TFvlTOtrWNE82a4UJZ9O3ml3BGBYA141bpWlJR5c34dObTe1prbLJZ7v5WvV0vnDnr9A==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_keigo.js" integrity="sha512-u067+CeBvMb6+oINFY9Wz77GBk4NSxS2+k35GJ3RsFFmphJliwzwmV2ceID0gZ4mbjJ0xJHQX9WIypiyI6yfdA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_markup.js" integrity="sha512-mEcV3CYWM6+zmuxgojP/9wbQNtkTPuPzFHo1KTG2TPaDbSfdPZCazFcNmdjJ95o7+VFfxs2Id7yB02bqSeBxNg==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_three.js" integrity="sha512-4loRkhlxZ9A9v5t3sk5VECW7T33axIVbBQgwkNdgcjk03yRqAvxut5OS4n3BBS4jnWWHOE3i0vj9qxOOp4uV3Q==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_turtle.js" integrity="sha512-ce8etr+HoC+UjUyXSgxJzy3+pOYhsBdt9jDzhks2H/eEPQ1gIz7M8hoeyP0223zLLZHBBzlHiL/a6mmJdoKQ+w==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_webworker.js" integrity="sha512-6UHX2dgMPRY4BuIxLXaERKaA8Wg5eK2pWy+OysU0/+gt2E15M7K5Vr8+4CQt6hylWnmzmJQJfgObIr+yjW5kPw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/plugin_weykturtle3d.js" integrity="sha512-ONFdombPCdgdnXs7VMUAHpe8IBvTuLzSgzmERf1jEhHo4l06wDpkpRRCk3/9a1hiXRHQ+le2LZBT7XH4VA27sQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/wnako3.js" integrity="sha512-ZBC5fnWXr1/lcjLwXqmTj1OXfBewmzxlPqnz6ZnDhtVUY9invxAimbYuxMrgb3ZiFnopNLH7xPbgWlFJNB/jmQ==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/wnako3webworker.js" integrity="sha512-cY0Mzrpoz/uEyY1n8MeJeWdDmm9vqI7dh28wEqJGtVRfYOJvDHiYDzzlfGndOWmzZmHUK6ZAE7YaUJ7zZxiZLw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/version.js" integrity="sha512-FA7YvspBoZepTXpf6y/NOd1MTaoBtZ2D9JDA8Ra99NAi3GOWxTF2WA/c9QS3KlAcRCJAwSOW5r7uc0gBczeYWw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/version_main.js" integrity="sha512-FA7YvspBoZepTXpf6y/NOd1MTaoBtZ2D9JDA8Ra99NAi3GOWxTF2WA/c9QS3KlAcRCJAwSOW5r7uc0gBczeYWw==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/wnako3.js" integrity="sha512-r9wh3bU6XYu/RPPteNaFUagyQiA96kmugQRHUVGnv/MmXNOLK3U//+IHje8PDqu4D7lTjxciEVxeNZqK2Ak/AA==" crossorigin="anonymous"></script>
-<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.21&f=release/wnako3webworker.js" integrity="sha512-xV9gE5+/z3NMIjLfsc4TqwUG2/+tgTXvUuzRKJqaO3qRBGyB2dmf35/gI/L9eeWur2ezqJ6rSTphKn6h8fimcg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/command.json.js" integrity="sha512-xPenQ4Jr6UqAw0nk+iPNa1t5vXo3dQqCSoxFU4pBEvWOlYiALGXSBsmopgwBk290vdPa0aOd8zKKi1yeU8sBZw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/core_src_nako_josi_list_mjs.js" integrity="sha512-0+LAeEfPy2Lrl+DeJMjbBIUda9Y5ttpLGy3/FW8rjSW8bN3udrALJa5V/bhjxU7mYouumV/QGN2wt3oxMCKy9g==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/core_src_nako_reserved_words_mjs.js" integrity="sha512-UzZigh2tIhgBO3+Sp1wnqKMvAGfhqSRdH2+ffmRy4+8CVNEeepddaDV0oKJ+vyvi28zQLmXeMsjRu+Frj3YlTg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/edit_main.js" integrity="sha512-mIc6yc7LR43KMaYWcMm2HLzR/YWyYoY74pCU8D6o6QpRNArTHQFBUBLblV7rJjIeNCop8R7UBk1vOB1uqERd1Q==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/edit_main.js" integrity="sha512-VluJJhYbxG+I5sofn1bKqOuIqMXdCyUUM9dnSBEVAkUXUy/ENHfG6hQFTZULcHy9iNfqPHXTfWuCgyMzQ9Hxrg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/version_main.js" integrity="sha512-KMEb25tO1BMsNxzECPwLM6bi1IIS5wX+VRN6mdzbqhtqPr7eY1K7Wwg66MpCmhrc45KoEJthR4NWyw9O7ODgLw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/editor.js" integrity="sha512-mIc6yc7LR43KMaYWcMm2HLzR/YWyYoY74pCU8D6o6QpRNArTHQFBUBLblV7rJjIeNCop8R7UBk1vOB1uqERd1Q==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/nako_gen_async.js" integrity="sha512-/73lycspxJ921s+NmqaOKF58X9rCsgEZrZT4O4sW1aCe5CSXtQevIasAoGgIoL3a5RmlaghbaIVASwAgmoE3+g==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_caniuse.js" integrity="sha512-V6nOBHnhxPChu+S/LfB7elCeBk985ukLmBmkCyPk4ai5VfoJZuOIttg72PbZSxWfP5eQTrlLNajsorfwNw/vcA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_datetime.js" integrity="sha512-ofb5jVaHjjTRoCAmHnbewc2fS8vr1oEkX/B3WoOCjYpDnZ3nnl3EDz6fdAS8CFFzGvuekCk2RFN5BuM9kX6FAg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_kansuji.js" integrity="sha512-N+S8Th1yCiQy3q5jh0TFvlTOtrWNE82a4UJZ9O3ml3BGBYA141bpWlJR5c34dObTe1prbLJZ7v5WvV0vnDnr9A==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_keigo.js" integrity="sha512-u067+CeBvMb6+oINFY9Wz77GBk4NSxS2+k35GJ3RsFFmphJliwzwmV2ceID0gZ4mbjJ0xJHQX9WIypiyI6yfdA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_markup.js" integrity="sha512-mEcV3CYWM6+zmuxgojP/9wbQNtkTPuPzFHo1KTG2TPaDbSfdPZCazFcNmdjJ95o7+VFfxs2Id7yB02bqSeBxNg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_three.js" integrity="sha512-4loRkhlxZ9A9v5t3sk5VECW7T33axIVbBQgwkNdgcjk03yRqAvxut5OS4n3BBS4jnWWHOE3i0vj9qxOOp4uV3Q==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_toml.js" integrity="sha512-Z4JmOCY66VuyoD8m4dCzKttEbCTEUfqyuqlmcOhs69m/88skKcPYWXi+4W+Td5LdI3xqezn4BkN32F9ZkPzUpQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_turtle.js" integrity="sha512-ce8etr+HoC+UjUyXSgxJzy3+pOYhsBdt9jDzhks2H/eEPQ1gIz7M8hoeyP0223zLLZHBBzlHiL/a6mmJdoKQ+w==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_webworker.js" integrity="sha512-6UHX2dgMPRY4BuIxLXaERKaA8Wg5eK2pWy+OysU0/+gt2E15M7K5Vr8+4CQt6hylWnmzmJQJfgObIr+yjW5kPw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_weykturtle3d.js" integrity="sha512-ONFdombPCdgdnXs7VMUAHpe8IBvTuLzSgzmERf1jEhHo4l06wDpkpRRCk3/9a1hiXRHQ+le2LZBT7XH4VA27sQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_caniuse.js" integrity="sha512-V6nOBHnhxPChu+S/LfB7elCeBk985ukLmBmkCyPk4ai5VfoJZuOIttg72PbZSxWfP5eQTrlLNajsorfwNw/vcA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_datetime.js" integrity="sha512-ofb5jVaHjjTRoCAmHnbewc2fS8vr1oEkX/B3WoOCjYpDnZ3nnl3EDz6fdAS8CFFzGvuekCk2RFN5BuM9kX6FAg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_kansuji.js" integrity="sha512-N+S8Th1yCiQy3q5jh0TFvlTOtrWNE82a4UJZ9O3ml3BGBYA141bpWlJR5c34dObTe1prbLJZ7v5WvV0vnDnr9A==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_keigo.js" integrity="sha512-u067+CeBvMb6+oINFY9Wz77GBk4NSxS2+k35GJ3RsFFmphJliwzwmV2ceID0gZ4mbjJ0xJHQX9WIypiyI6yfdA==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_markup.js" integrity="sha512-mEcV3CYWM6+zmuxgojP/9wbQNtkTPuPzFHo1KTG2TPaDbSfdPZCazFcNmdjJ95o7+VFfxs2Id7yB02bqSeBxNg==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_three.js" integrity="sha512-4loRkhlxZ9A9v5t3sk5VECW7T33axIVbBQgwkNdgcjk03yRqAvxut5OS4n3BBS4jnWWHOE3i0vj9qxOOp4uV3Q==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_turtle.js" integrity="sha512-ce8etr+HoC+UjUyXSgxJzy3+pOYhsBdt9jDzhks2H/eEPQ1gIz7M8hoeyP0223zLLZHBBzlHiL/a6mmJdoKQ+w==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_webworker.js" integrity="sha512-6UHX2dgMPRY4BuIxLXaERKaA8Wg5eK2pWy+OysU0/+gt2E15M7K5Vr8+4CQt6hylWnmzmJQJfgObIr+yjW5kPw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/plugin_weykturtle3d.js" integrity="sha512-ONFdombPCdgdnXs7VMUAHpe8IBvTuLzSgzmERf1jEhHo4l06wDpkpRRCk3/9a1hiXRHQ+le2LZBT7XH4VA27sQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/wnako3.js" integrity="sha512-ZBC5fnWXr1/lcjLwXqmTj1OXfBewmzxlPqnz6ZnDhtVUY9invxAimbYuxMrgb3ZiFnopNLH7xPbgWlFJNB/jmQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/wnako3webworker.js" integrity="sha512-cY0Mzrpoz/uEyY1n8MeJeWdDmm9vqI7dh28wEqJGtVRfYOJvDHiYDzzlfGndOWmzZmHUK6ZAE7YaUJ7zZxiZLw==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/version.js" integrity="sha512-k/X8zJOzVxlQWWaMWqb2XFf9XovNbQv8XzCwvWS1/LyHA5aKNdyCJK3bq6SnaYttZMKSlztrw4TuV+m1vqvvWQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/version_main.js" integrity="sha512-k/X8zJOzVxlQWWaMWqb2XFf9XovNbQv8XzCwvWS1/LyHA5aKNdyCJK3bq6SnaYttZMKSlztrw4TuV+m1vqvvWQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/wnako3.js" integrity="sha512-qr2foAD+GhaDZ1OMpn37YZNIIGmTJnXeT4qudeJWrcxUCYkdynidyg+E/MrcZOv/atEwY6qUmbXC/S9TpLZKxQ==" crossorigin="anonymous"></script>
+<script defer src="https://nadesi.com/v3/cdn.php?v=3.6.23&f=release/wnako3webworker.js" integrity="sha512-HGE4GxYu8/YC19l7qvbmXTfKEBsQm30D0nPUqrbFohF1VHiTWRwnkpO6FJqLmfLbFALonnWwd+9OpUJUi+y67w==" crossorigin="anonymous"></script>