nadesiko3 3.2.30 → 3.2.34

package/release/wnako3webworker.js.LICENSE.txt

@@ -58,6 +58,10 @@
   !*** ./src/plugin_worker.js ***!
   \******************************/
 
+/*!*******************************!*\
+  !*** ./src/nako_from_dncl.js ***!
+  \*******************************/
+
 /*!*******************************!*\
   !*** ./src/nako_josi_list.js ***!
   \*******************************/

package/release/yoyakugo.json

@@ -4,6 +4,8 @@
   "間",
   "間繰返",
   "繰返",
+  "増繰返",
+  "減繰返",
   "反復",
   "抜",
   "続",
@@ -25,6 +27,7 @@
   "関数",
   "インデント構文",
   "非同期モード",
+  "DNCLモード",
   "モード設定",
   "取込"
 ]

package/src/nako3.js

@@ -7,6 +7,7 @@ const NakoLexer = require('./nako_lexer')
 const Prepare = require('./nako_prepare')
 const NakoGenSync = require('./nako_gen')
 const NakoIndent = require('./nako_indent')
+const NakoDncl = require('./nako_from_dncl')
 const PluginSystem = require('./plugin_system')
 const PluginMath = require('./plugin_math')
 const PluginPromise = require('./plugin_promise')
@@ -83,6 +84,7 @@ function NakoGen (mode) {
  *     column?: number
  *   }
  *   genMode?: string
+ *   checkInit?: boolean
  * }} Ast
  *
  * @typedef {(
@@ -301,9 +303,11 @@ class NakoCompiler {
     }
     // インデント構文 (#596)
     const { code: code2, insertedLines, deletedLines } = NakoIndent.convert(code, filename)
+    // DNCL構文 (#1140)
+    const code3 = NakoDncl.convert(code2, filename)
 
     // 全角半角の統一処理
-    const preprocessed = this.prepare.convert(code2)
+    const preprocessed = this.prepare.convert(code3)
 
     const tokenizationSourceMapping = new SourceMappingOfTokenization(code2.length, preprocessed)
     const indentationSyntaxSourceMapping = new SourceMappingOfIndentSyntax(code2, insertedLines, deletedLines)
@@ -540,6 +544,7 @@ class NakoCompiler {
     /** @type {Ast} */
     let ast
     try {
+      this.parser.genMode = 'sync' // set default
       ast = this.parser.parse(lexerOutput.tokens)
     } catch (err) {
       if (typeof err.startOffset !== 'number') {

package/src/nako_from_dncl.js

@@ -0,0 +1,239 @@
+/**
+ * DNCLに対応する構文
+ */
+const { NakoIndentError } = require('./nako_errors')
+const NakoPrepare = require('./nako_prepare')
+
+const DNCL_KEYWORDS = ['!DNCLモード']
+/**
+ * DNCLのソースコードをなでしこに変換する
+ * @param {String} src 
+ * @param {String} filename 
+ * @returns {String} converted soruce
+ */
+function convert(src, filename) {
+    // 改行を合わせる
+    src = src.replace(/(\r\n|\r)/g, '\n')
+    // 「!DNCLモード」を使うかチェック
+    if (!isIndentSyntaxEnabled(src)) { return src }
+    let result = dncl2nako(src, filename)
+    // console.log("=====\n" + result)
+    // process.exit()
+    return result
+}
+
+function isIndentSyntaxEnabled(src) {
+  // プログラム冒頭に「!DNCLモード」があればDNCL構文が有効
+  const keywords = DNCL_KEYWORDS
+  const lines = src.split('\n', 30)
+  for (const line of lines) {
+    const line2 = line.replace('！', '!')
+    if (keywords.indexOf(line2) >= 0) {
+      return true
+    }
+  }
+  return false
+}
+
+/**
+ * make space string
+ * @param {number} n 
+ */
+function make_spaces(n) {
+    let s = ''
+    for (let i = 0; i < n; i++) {
+        s += ' '
+    }
+    return s
+}
+
+/**
+ * DNCLからなでしこに変換する(判定なし)
+ * @param {string} src
+ * @param {string} filename
+ * @returns {string} converted source
+ */
+function dncl2nako(src, filename) {
+    // 全角半角を統一
+    src = conv2half(src)
+    // 行頭の「|」はインデントを表す記号
+    const a = src.split('\n')
+    for (let i = 0; i < a.length; i++) {
+        a[i] = a[i].replace(/^(\s*[|\s]+)(.*$)/, (m0, m1, m2) => {
+            return make_spaces(m1.length) + m2
+        })
+    }
+    src = a.join('\n')
+    // ---------------------------------
+    // 置換開始
+    // ---------------------------------
+    // 単純置換リスト
+    const simple_conv_list = {
+        'を実行する': 'ここまで',
+        'を実行し,そうでなくもし': '違えば、もし',
+        'を実行し，そうでなくもし': '違えば、もし',
+        'を実行し、そうでなくもし': '違えば、もし',
+        'を実行し,そうでなければ': '違えば',
+        'を実行し，そうでなければ': '違えば',
+        'を実行し、そうでなければ': '違えば',
+        'を繰り返す': 'ここまで',
+        '改行なしで表示': '継続表示',
+        'のすべての値を0にする': '=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]',
+        'ずつ増やしながら':'ずつ増やし繰り返す',
+        'ずつ減らしながら':'ずつ減らし繰り返す',
+    }
+
+    let result = ''
+    while (src !='') {
+        // 代入記号を変更
+        const ch = src.charAt(0)
+        // 空白を飛ばす
+        if (ch === ' ' || ch === '　' || ch == '\t') {
+            result += ch
+            src = src.substring(1)
+            continue
+        }
+        // 1行先読み
+        let line = ''
+        const i = src.indexOf('\n')
+        if (i >= 0) {
+            line = src.substring(0, i)
+        } else {
+            line = src
+        }
+        //「var を n 増やす」を「var = var + 1」と置き換える
+        const r = line.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*を\s*([0-9a-zA-Z_]+)\s*(増やす|減らす)/)
+        if (r) {
+            const var_name = r[1]
+            const inc_val = r[2]
+            const inc_dec = r[3]
+            if (inc_dec == '増やす') {
+                result += `${var_name} = ${var_name} + ${inc_val};`
+            } else {
+                result += `${var_name} = ${var_name} - ${inc_val};`
+            }
+            src = src.substring(r[0].length)
+            continue
+        }
+        //「S1とS2とS3を表示する」を「(S1)&(S2)&S3)を表示」と置き換える
+        // あまりスマートではないが手抜きで
+        if (line.indexOf('表示') >= 0) {
+            const r5 = line.match(/^(.+?)と(.+?)と(.+?)と(.+?)と(.+?)を表示/)
+            if (r5) {
+                const s1 = r5[1]
+                const s2 = r5[2]
+                const s3 = r5[3]
+                const s4 = r5[4]
+                const s5 = r5[4]
+                result += `(${s1})&(${s2})&(${s3})&(${s4})&(${s5})を表示`
+                src = src.substring(r5[0].length)
+                continue
+            }
+            const r4 = line.match(/^(.+?)と(.+?)と(.+?)と(.+?)を表示/)
+            if (r4) {
+                const s1 = r4[1]
+                const s2 = r4[2]
+                const s3 = r4[3]
+                const s4 = r4[4]
+                result += `(${s1})&(${s2})&(${s3})&(${s4})を表示`
+                src = src.substring(r4[0].length)
+                continue
+            }
+            const r3 = line.match(/^(.+?)と(.+?)と(.+?)を表示/)
+            if (r3) {
+                const s1 = r3[1]
+                const s2 = r3[2]
+                const s3 = r3[3]
+                result += `(${s1})&(${s2})&(${s3})を表示`
+                src = src.substring(r3[0].length)
+                continue
+            }
+            const r2 = line.match(/^(.+?)と(.+?)を表示/)
+            if (r2) {
+                const s1 = r2[1]
+                const s2 = r2[2]
+                result += `(${s1})&(${s2})を表示`
+                src = src.substring(r2[0].length)
+                continue
+            }
+        }
+        // 『もしj>hakosuならばhakosu←jを実行する』のような単文のもし文
+        const rif = line.match(/^もし(.+)を実行する(。|．)*/)
+        if (rif) {
+            const sent = dncl2nako(rif[1], filename)
+            result += `もし、${sent};`
+            src = src.substring(rif[0].length)
+            continue
+        }        
+        // 一覧から単純な変換
+        {
+            let flag = false
+            for (let key in simple_conv_list) {
+                const src_key = src.substring(0, key.length)
+                if (src_key === key) {
+                    result += simple_conv_list[key]
+                    src = src.substring(key.length)
+                    flag = true
+                    break
+                }
+            }
+            if (flag) { continue }
+        }
+
+        // 1文字削る
+        src = src.substring(1)
+        result += ch
+    }
+    return result
+}
+
+/**
+ * 半角に変換
+ * @param {String} src
+ * @returns {string} converted source
+ */
+function conv2half(src) {
+    const prepare = new NakoPrepare() // `※`, `／/`, `／＊` といったパターン全てに対応するために必要
+    // 全角半角の統一
+    let result = ''
+    let flagStr = false
+    let flagStrClose = ''
+    for (let i = 0; i < src.length; i++) {
+        let c = src.charAt(i)
+        let cHalf = prepare.convert1ch(c)
+        if (flagStr) {
+            if (cHalf === flagStrClose) {
+                flagStr = false
+                flagStrClose = ''
+                result += cHalf
+                continue
+            }
+            result += c
+            continue
+        }
+        if (cHalf === '「') {
+            flagStr = true
+            flagStrClose = '」'
+            result += cHalf
+            continue
+        }
+        if (cHalf === '"') {
+            flagStr = true
+            flagStrClose = '"'
+            result += cHalf
+            continue
+        }
+        // 単純な置き換えはここでやってしまう
+        // 配列記号の { ... } を [ ... ] に置換
+        if (cHalf === '{') { cHalf = '[' }
+        if (cHalf === '}') { cHalf = ']' }
+        if (cHalf === '←') { cHalf = '=' }
+        result += cHalf
+    }
+    return result
+}
+
+
+module.exports = {
+    convert,
+}

package/src/nako_gen.js

@@ -703,6 +703,7 @@ try {
     const topOfFunction = '(function(){\n'
     const endOfFunction = '})'
     let variableDeclarations = ''
+    let popStack = ''
     const initialNames = new Set()
     if (this.speedMode.invalidSore === 0) {
       initialNames.add('それ')
@@ -712,6 +713,8 @@ try {
     this.varslistSet.push(this.varsSet)
     // JSの引数と引数をバインド
     variableDeclarations += '  var 引数 = arguments;\n'
+    // ローカル変数を生成
+    variableDeclarations += '  var __vars = {};\n'
     // 宣言済みの名前を保存
     const varsDeclared = Array.from(this.varsSet.names.values())
     let code = ''
@@ -749,7 +752,6 @@ try {
     // パフォーマンスモニタ:ユーザ関数のinject
     code += performanceMonitorInjectAtEnd
     // 関数の末尾に、ローカル変数をPOP
-    code += endOfFunction
 
     // 関数内で定義されたローカル変数の宣言
     let needsVarsObject = false
@@ -765,10 +767,6 @@ try {
     if (!NakoGen.isValidIdentifier('それ') && this.speedMode.invalidSore === 0) {
       needsVarsObject = true
     }
-    // 一度でも__varsを使ったら、それも宣言する。
-    if (needsVarsObject) {
-      variableDeclarations += '  var __vars = {};\n'
-    }
     if (this.speedMode.invalidSore === 0) {
       if (NakoGen.isValidIdentifier('それ')) {
         variableDeclarations += '  var それ = \'\';\n'
@@ -776,7 +774,8 @@ try {
         variableDeclarations += `  ${this.varname('それ')} = '';`
       }
     }
-    code = topOfFunction + performanceMonitorInjectAtStart + variableDeclarations + code
+    code = topOfFunction + performanceMonitorInjectAtStart + variableDeclarations + code + popStack
+    code += endOfFunction
 
     if (name) { this.nako_func[name].fn = code }
 
@@ -852,14 +851,28 @@ try {
   convLetArray (node) {
     const name = this._convGen(node.name, true)
     const list = node.index
+    let codeInit = ''
     let code = name
+    let codeArray = ''
+    // codeInit?
+    if (node.checkInit) {
+      codeInit += `\n/*配列初期化*/if (typeof(${name}) !== 'object') { ${name} = [] }; `
+      for (let i = 0; i < list.length; i++) {
+        const idx = this._convGen(list[i], true)
+        codeArray += `[${idx}]`
+        codeInit += `if (typeof(${name}${codeArray}) !== 'object') { ${name}${codeArray} = [] }; `
+      }
+      codeInit += '\n'
+    }
+    // array
     for (let i = 0; i < list.length; i++) {
       const idx = this._convGen(list[i], true)
       code += '[' + idx + ']'
     }
     const value = this._convGen(node.value, true)
     code += ' = ' + value + ';\n'
-    return this.convLineno(node, false) + code
+    // generate code
+    return this.convLineno(node, false) + codeInit + code
   }
 
   convGenLoop (node) {
@@ -888,6 +901,8 @@ try {
     // ループ条件を確認
     const kara = this._convGen(node.from, true)
     const made = this._convGen(node.to, true)
+    let inc = this._convGen(node.inc, true)
+    if (inc == null || inc == undefined || inc == 'null') { inc = 1 }
     // ループ内のブロック内容を得る
     const block = this.convGenLoop(node.block)
     // ループ条件を変数に入れる用
@@ -902,12 +917,12 @@ try {
       `const ${varFrom} = ${kara};\n` +
       `const ${varTo} = ${made};\n` +
       `if (${varFrom} <= ${varTo}) { // up\n` +
-      `  for (let ${varI} = ${varFrom}; ${varI} <= ${varTo}; ${varI}++) {\n` +
+      `  for (let ${varI} = ${varFrom}; ${varI} <= ${varTo}; ${varI}+= ${inc}) {\n` +
       `    ${sorePrefex}${word} = ${varI};\n` +
       `    ${block}\n` +
       '  };\n' +
       '} else { // down\n' +
-      `  for (let ${varI} = ${varFrom}; ${varI} >= ${varTo}; ${varI}--) {\n` +
+      `  for (let ${varI} = ${varFrom}; ${varI} >= ${varTo}; ${varI}-= ${inc}) {\n` +
       `    ${sorePrefex}${word} = ${varI};` + '\n' +
       `    ${block}\n` +
       '  };\n' +

package/src/nako_gen_async.js

@@ -18,8 +18,7 @@ const NakoGen = require('./nako_gen')
 /**
  * なでしこのインタプリタコード
  */
-const
-  NakoCodeNop = 'NOP'
+const NakoCodeNop = 'NOP'
 const NakoCodeLabel = 'LBL'
 const NakoCodeEOL = 'EOL'
 const NakoCodeJump = 'JMP' // JUMP addr
@@ -550,13 +549,15 @@ try {
       if (sys.index >= sys.codeSize || sys.index < 0) {return}
       const __v0 = sys.__v0
       try {
-        while (sys.index < sys.codeSize || sys.index < 0) {
+        sys.inLoop = true
+        while (sys.index < sys.codeSize && sys.index >= 0) {
           // console.log('@@[run]', sys.index)
           switch (sys.index) {
             // --- CODE.BEGIN ---
             ${result}
             // --- CODE.END ---
             default:
+              sys.inLoop = false
               console.log(sys.index, sys.__stack)
               throw new Error('Invalid sys.index:' + sys.index)
               break
@@ -568,8 +569,13 @@ try {
           } else {
             sys.index++
           }
-          if (sys.async) { sys.async = false; break}
+          if (sys.async) {
+            sys.__saveSysenv(sys)
+            sys.async = false
+            break
+          }
         } // end of while
+        sys.inLoop = false
       } catch (e) {
         sys.__errorAsync(e, sys)
       }
@@ -595,6 +601,12 @@ try {
       sys.nextIndex = no;
     }
     this.__return = sys => {
+      if (sys.__callstack.length === 0) {
+        sys.__destroySysenv(sys, sys.curSysenv.envid)
+        sys.index = -2
+        sys.nextIndex = -1
+        return
+      }
       const sore = sys.__vars['それ'];
       sys.__varslist.pop();
       const info = sys.__callstack.pop();
@@ -616,15 +628,22 @@ try {
     }
     this.__callNakoCode = (no, backNo, sys) => {
       this.__call(backNo, sys)
-      sys.async = true
+      sys.nextIndex = no
+      const sysenv = sys.setAsync(sys)
       setTimeout(() => {
         // console.log('//__callNakoCode, back=', backNo, 'no=', no)
-        sys.async = false
-        sys.nextIndex = -1
-        sys.index = no
-        sys.nextAsync(sys)
+        sys.compAsync(sys, sysenv)
       } ,1)
     }
+    this.__callNakoCodeEntry = (no, sys) => {
+      sys.__saveSysenv(sys)
+      sys.curSysenv = sys.__generateSysenv(sys)
+      sys.__restoreSysenv(sys)
+      sys.__vars = {"それ":""}
+      sys.__varslist.push(sys.__vars)
+      sys.index = no;
+      sys.nextAsync(sys)
+    }
     this.__callObj = (vname, curNo, sys) => {
       if (sys.__vars[vname]) {
         const fname = sys.__vars[vname]
@@ -639,7 +658,69 @@ try {
       }
       throw new Error('async error in __callObj::', vname)
     }
+    this.__generateSysenv = sys => {
+      sys.envid = ( sys.envid == null ? 0 : sys.envid ) + 1
+      const sysenv = {
+        callstack: [],
+        varstack: [],
+        varslist: [sys.__varslist[0], sys.__varslist[1], sys.__varslist[2]],
+        index: -1,
+        nextIndex: -1,
+        tryIndex: -1,
+        envid: sys.envid
+      }
+      sysenv.vars = sysenv.varslist[2]
+      if (sys.sysenvs == null) { sys.sysenvs={} }
+      sys.sysenvs[sys.envid] = sysenv
+      // console.log('generete envid '+sys.envid)
+      return sysenv
+    }
+    this.__destroySysenv = (sys, envid) => {
+      delete sys.sysenvs[envid]
+      // console.log('destroy envid '+envid)
+    }
+    this.__saveSysenv = sys => {
+      const sysenv = sys.curSysenv
+      sysenv.callstack = sys.__callstack
+      sysenv.varstack = sys.__stack
+      sysenv.varslist = sys.__varslist
+      sysenv.vars = sys.__vars
+      sysenv.index = sys.index
+      sysenv.nextIndex = sys.nextIndex
+      sysenv.tryIndex = sys.tryIndex
+    }
+    this.__restoreSysenv = sys => {
+      const sysenv = sys.curSysenv
+      sys.__callstack = sysenv.callstack
+      sys.__stack = sysenv.varstack
+      sys.__varslist = sysenv.varslist
+      sys.__vars = sysenv.vars
+      ___vars = sys.__vars
+      sys.index = sysenv.index
+      sys.nextIndex = sysenv.nextIndex
+      sys.tryIndex = sysenv.tryIndex
+    }
+    this.setAsync = sys => {
+      sys.async = true
+      return sys.curSysenv
+    }
+    this.compAsync = (sys,sysenv) => {
+      if (sys.async && sys.curSysenv != null && sysenv != null && sys.curSysenv.envid === sysenv.envid) {
+        sys.async = false
+      } else {
+        if (sys.curSysenv == null || sysenv == null || sys.curSysenv.envid !== sysenv.envid) {
+          sys.__saveSysenv(sys)
+          const envid = sys.curSysenv.envid
+          sys.curSysenv = sysenv
+          sys.__restoreSysenv(sys)
+          // console.log('switch envid '+envid+' to '+sys.curSysenv.envid)
+        }
+        sys.nextAsync(sys)
+      }
+    }
+
     this.__resetAsync(this)
+    this.curSysenv = this.__generateSysenv(this)
     this.nextAsync(this)
     //-------------------------
     `
@@ -1076,8 +1157,14 @@ try {
       josi: meta.josi,
       fn: '(function(){\n' +
         '  const sys = (arguments.length > 0) ? arguments[arguments.length-1] : {}; \n' +
+        '  if (sys.newenv) { \n' +
+        '    sys.newenv = false\n' +
+        `    sys.__callNakoCodeEntry(sys.__labels['${funcName}'], sys);` + '\n' +
+        '  } else {\n' +
         '  ' + codeCall + '\n' +
-        `  sys.__callNakoCode(sys.__labels['${funcName}'], sys.nextIndex, sys);  })`,
+        `    sys.__callNakoCode(sys.__labels['${funcName}'], sys.nextIndex, sys);` + '\n' +
+        '    if (!sys.inLoop) { sys.nextAsync(sys) }\n' +
+        '  }  })',
       type: 'func'
     }
 

package/src/nako_josi_list.js

@@ -6,7 +6,7 @@ const josiList = [
   'について', 'くらい', 'なのか', 'までを', 'までの', 'による',
   'とは', 'から', 'まで', 'だけ', 'より', 'ほど', 'など',
   'いて', 'えて', 'きて', 'けて', 'して', 'って', 'にて', 'みて',
-  'めて', 'ねて', 'では', 'には', 'は~', 'んで',
+  'めて', 'ねて', 'では', 'には', 'は~', 'んで', 'ずつ',
   'は', 'を', 'に', 'へ', 'で', 'と', 'が', 'の'
 ]