nadesiko3 3.3.63 → 3.3.64

package/src/cnako3mod.mjs

@@ -59,7 +59,8 @@ export class CNako3 extends NakoCompiler {
             .option('-b, --browsers', '対応機器/Webブラウザを表示する')
             .option('-m, --man [command]', 'マニュアルを表示する')
             .option('-p, --speed', 'スピード優先モードの指定')
-            .option('-A, --ast', 'パースした結果をASTで出力する')
+            .option('-A, --ast', '構文解析した結果をASTで出力する')
+            .option('-X, --lex', '字句解析した結果をJSONで出力する')
             // .option('-h, --help', '使い方を表示する')
             // .option('-v, --version', 'バージョンを表示する')
             .parse(process.argv);
@@ -94,7 +95,8 @@ export class CNako3 extends NakoCompiler {
             test: app.test || false,
             browsers: app.browsers || false,
             speed: app.speed || false,
-            ast: app.ast || false
+            ast: app.ast || false,
+            lex: app.lex || false,
         };
         args.mainfile = app.args[0];
         args.output = app.output;
@@ -154,6 +156,12 @@ export class CNako3 extends NakoCompiler {
             await this.nakoCompile(opt, src, false);
             return;
         }
+        // 字句解析の結果をJSONで出力
+        if (opt.lex) {
+            const lex = this.lex(src, opt.mainfile);
+            console.log(this.outputJSON(lex, 0));
+            return;
+        }
         // ASTを出力する
         if (opt.ast) {
             try {
@@ -287,10 +295,9 @@ export class CNako3 extends NakoCompiler {
         }
     }
     /**
-     * ASTを出力
+     * JSONを出力
      */
-    outputAST(opt, src) {
-        const ast = this.parse(src, opt.mainfile);
+    outputJSON(ast, level) {
         const makeIndent = (level) => {
             let s = '';
             for (let i = 0; i < level; i++) {
@@ -299,35 +306,38 @@ export class CNako3 extends NakoCompiler {
             return s;
         };
         const trim = (s) => { return s.replace(/(^\s+|\s+$)/g, ''); };
-        /** AST文字列に変換して返す */
-        const outAST = (ast, level) => {
-            if (typeof (ast) === 'string') {
-                return makeIndent(level) + '"' + ast + '"';
-            }
-            if (typeof (ast) === 'number') {
-                return makeIndent(level) + ast;
-            }
-            if (ast instanceof Array) {
-                const s = makeIndent(level) + '[\n';
-                const sa = [];
-                ast.forEach((a) => {
-                    sa.push(outAST(a, level + 1));
-                });
-                return s + sa.join(',\n') + '\n' + makeIndent(level) + ']';
-            }
-            if (ast instanceof Object) {
-                const s = makeIndent(level) + '{\n';
-                const sa = [];
-                for (const key in ast) {
-                    const sv = trim(outAST(ast[key], level + 1));
-                    const so = makeIndent(level + 1) + '"' + key + '": ' + sv;
-                    sa.push(so);
-                }
-                return s + sa.join(',\n') + '\n' + makeIndent(level) + '}';
-            }
+        if (typeof (ast) === 'string') {
+            return makeIndent(level) + '"' + ast + '"';
+        }
+        if (typeof (ast) === 'number') {
             return makeIndent(level) + ast;
-        };
-        console.log(outAST(ast, 0));
+        }
+        if (ast instanceof Array) {
+            const s = makeIndent(level) + '[\n';
+            const sa = [];
+            ast.forEach((a) => {
+                sa.push(this.outputJSON(a, level + 1));
+            });
+            return s + sa.join(',\n') + '\n' + makeIndent(level) + ']';
+        }
+        if (ast instanceof Object) {
+            const s = makeIndent(level) + '{\n';
+            const sa = [];
+            for (const key in ast) {
+                const sv = trim(this.outputJSON(ast[key], level + 1));
+                const so = makeIndent(level + 1) + '"' + key + '": ' + sv;
+                sa.push(so);
+            }
+            return s + sa.join(',\n') + '\n' + makeIndent(level) + '}';
+        }
+        return makeIndent(level) + ast;
+    }
+    /**
+     * ASTを出力
+     */
+    outputAST(opt, src) {
+        const ast = this.parse(src, opt.mainfile);
+        console.log(this.outputJSON(ast, 0));
     }
     // REPL(対話実行環境)の場合
     async cnakoRepl(_opt) {

package/src/cnako3mod.mts

@@ -40,6 +40,7 @@ interface CNako3ArgOptions {
   man: string
   browsers: boolean
   ast: boolean
+  lex: boolean
 }
 
 interface CNako3Options {
@@ -92,7 +93,8 @@ export class CNako3 extends NakoCompiler {
       .option('-b, --browsers', '対応機器/Webブラウザを表示する')
       .option('-m, --man [command]', 'マニュアルを表示する')
       .option('-p, --speed', 'スピード優先モードの指定')
-      .option('-A, --ast', 'パースした結果をASTで出力する')
+      .option('-A, --ast', '構文解析した結果をASTで出力する')
+      .option('-X, --lex', '字句解析した結果をJSONで出力する')
       // .option('-h, --help', '使い方を表示する')
       // .option('-v, --version', 'バージョンを表示する')
       .parse(process.argv)
@@ -128,7 +130,8 @@ export class CNako3 extends NakoCompiler {
       test: app.test || false,
       browsers: app.browsers || false,
       speed: app.speed || false,
-      ast: app.ast || false
+      ast: app.ast || false,
+      lex: app.lex || false,
     }
     args.mainfile = app.args[0]
     args.output = app.output
@@ -159,7 +162,7 @@ export class CNako3 extends NakoCompiler {
   // 実行する
   async execCommand () {
     // コマンドを解析
-    const opt = this.checkArguments()
+    const opt: CNako3ArgOptions = this.checkArguments()
     // 使い方の表示か？
     if (opt.man) {
       this.cnakoMan(opt.man)
@@ -188,7 +191,12 @@ export class CNako3 extends NakoCompiler {
       await this.nakoCompile(opt, src, false)
       return
     }
-
+    // 字句解析の結果をJSONで出力
+    if (opt.lex) {
+      const lex = this.lex(src, opt.mainfile)
+      console.log(this.outputJSON(lex, 0))
+      return
+    }
     // ASTを出力する
     if (opt.ast) {
       try {
@@ -318,47 +326,49 @@ export class CNako3 extends NakoCompiler {
       }
     }
   }
-
   /**
-   * ASTを出力
+   * JSONを出力
    */
-  outputAST (opt: any, src: string) {
-    const ast = this.parse(src, opt.mainfile)
+  outputJSON (ast: any, level: number): string {
     const makeIndent = (level: number) => {
       let s = ''
       for (let i = 0; i < level; i++) { s += '  ' }
       return s
     }
     const trim = (s: string) => { return s.replace(/(^\s+|\s+$)/g, '') }
-    /** AST文字列に変換して返す */
-    const outAST = (ast: Ast, level: number): string => {
-      if (typeof (ast) === 'string') {
-        return makeIndent(level) + '"' + ast + '"'
-      }
-      if (typeof (ast) === 'number') {
-        return makeIndent(level) + ast
-      }
-      if (ast instanceof Array) {
-        const s = makeIndent(level) + '[\n'
-        const sa: string[] = []
-        ast.forEach((a: Ast) => {
-          sa.push(outAST(a, level + 1))
-        })
-        return s + sa.join(',\n') + '\n' + makeIndent(level) + ']'
-      }
-      if (ast instanceof Object) {
-        const s = makeIndent(level) + '{\n'
-        const sa = []
-        for (const key in ast) {
-          const sv = trim(outAST((ast as any)[key], level + 1))
-          const so = makeIndent(level + 1) + '"' + key + '": ' + sv
-          sa.push(so)
-        }
-        return s + sa.join(',\n') + '\n' + makeIndent(level) + '}'
-      }
+
+    if (typeof (ast) === 'string') {
+      return makeIndent(level) + '"' + ast + '"'
+    }
+    if (typeof (ast) === 'number') {
       return makeIndent(level) + ast
     }
-    console.log(outAST(ast, 0))
+    if (ast instanceof Array) {
+      const s = makeIndent(level) + '[\n'
+      const sa: string[] = []
+      ast.forEach((a: Ast) => {
+        sa.push(this.outputJSON(a, level + 1))
+      })
+      return s + sa.join(',\n') + '\n' + makeIndent(level) + ']'
+    }
+    if (ast instanceof Object) {
+      const s = makeIndent(level) + '{\n'
+      const sa = []
+      for (const key in ast) {
+        const sv = trim(this.outputJSON((ast as any)[key], level + 1))
+        const so = makeIndent(level + 1) + '"' + key + '": ' + sv
+        sa.push(so)
+      }
+      return s + sa.join(',\n') + '\n' + makeIndent(level) + '}'
+    }
+    return makeIndent(level) + ast
+  }
+  /**
+   * ASTを出力
+   */
+  outputAST (opt: any, src: string) {
+    const ast = this.parse(src, opt.mainfile)
+    console.log(this.outputJSON(ast, 0))
   }
 
   // REPL(対話実行環境)の場合

package/src/nako_version.mjs

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

package/src/nako_version.mts

@@ -11,9 +11,9 @@ export interface NakoVersion {
 }
 // 実際のバージョン定義 (自動生成されるので以下を編集しない)
 const nakoVersion: NakoVersion = {
-  version: '3.3.63',
+  version: '3.3.64',
   major: 3,
   minor: 3,
-  patch: 63
+  patch: 64
 }
 export default nakoVersion

package/src/plugin_browser_canvas.mjs

@@ -196,6 +196,7 @@ export default {
     fn: function (url, sys) {
       const img = new window.Image()
       img.src = url
+      img.crossOrigin = 'Anonymous'
       return img
     }
   },
@@ -208,6 +209,7 @@ export default {
       sys.resolveCount++
       const img = new window.Image()
       img.src = url
+      img.crossOrigin = 'Anonymous'
       img.onload = () => {
         sys.__v0['対象'] = img
         sys.resolve()
@@ -229,6 +231,7 @@ export default {
       // 画像を読む
       const img = new window.Image()
       img.src = url
+      img.crossOrigin = 'Anonymous'
       img.onload = () => {
         sys.__v0['対象'] = img
         func(sys)
@@ -260,6 +263,7 @@ export default {
       if (typeof img === 'string') {
         const image = new window.Image()
         image.src = img
+        image.crossOrigin = 'Anonymous'
         image.onload = () => {
           drawFunc(image, sys.__ctx)
         }
@@ -311,6 +315,7 @@ export default {
       if (typeof img === 'string') {
         const image = new window.Image()
         image.src = img
+        image.crossOrigin = 'Anonymous'
         image.onload = () => {
           drawFunc(image, sys.__ctx)
         }