nadesiko3 3.3.4 → 3.3.7

package/src/nako_parser3.mjs

@@ -4,6 +4,7 @@
 import { opPriority, keizokuJosi } from './nako_parser_const.mjs'
 import { NakoParserBase } from './nako_parser_base.mjs'
 import { NakoSyntaxError } from './nako_errors.mjs'
+import { NakoLexer } from './nako_lexer.mjs'
 
 /**
  * @type {string[]}
@@ -12,20 +13,24 @@ const operatorList = []
 for (const key in opPriority) { operatorList.push(key) }
 
 /**
- * @typedef {import('./nako3').TokenWithSourceMap} TokenWithSourceMap
- * @typedef {import('./nako3').Ast} Ast
+ * 構文解析を行うクラス
+ * @typedef {import('./nako3.mjs').TokenWithSourceMap} TokenWithSourceMap
+ * @typedef {import('./nako3.mjs').Ast} Ast
  */
-
 // @ts-ignore
 export class NakoParser extends NakoParserBase {
   /**
+   * 構文解析を実行する
    * @param {TokenWithSourceMap[]} tokens 字句解析済みのトークンの配列
+   * @param {string} filename 解析対象のモジュール名
    * @return {Ast} AST(構文木)
    */
-  parse (tokens) {
+  parse (tokens, filename) {
     this.reset()
     /** @type {TokenWithSourceMap[]} */
     this.tokens = tokens
+    this.modName = NakoLexer.filenameToModName(filename)
+    this.modList.push(this.modName)
     // 解析開始
     return this.startParser()
   }
@@ -107,7 +112,7 @@ export class NakoParser extends NakoParserBase {
     if (this.check('逐次実行')) { return this.yTikuji() }
     if (this.accept(['抜ける'])) { return { type: 'break', josi: '', ...map, end: this.peekSourceMap() } }
     if (this.accept(['続ける'])) { return { type: 'continue', josi: '', ...map, end: this.peekSourceMap() } }
-    if (this.accept(['require', 'string', '取込'])) { return { type: 'require', value: this.y[1].value, josi: '', ...map, end: this.peekSourceMap() } }
+    if (this.accept(['require', 'string', '取込'])) { return this.yRequire() }
     if (this.accept(['not', '非同期モード'])) { return this.yASyncMode() }
     if (this.accept(['not', 'DNCLモード'])) { return this.yDNCLMode() }
     if (this.accept(['not', 'string', 'モード設定'])) { return this.ySetGenMode(this.y[1].value) }
@@ -172,6 +177,27 @@ export class NakoParser extends NakoParserBase {
     return { type: 'eol', ...map, end: this.peekSourceMap() }
   }
 
+  /** @returns {Ast} */
+  yRequire () {
+    const nameToken = this.y[1]
+    const filename = nameToken.value
+    const modName = NakoLexer.filenameToModName(filename)
+    if (this.modList.indexOf(modName) < 0) {
+      // 優先度が最も高いのは modList[0]
+      // [memo] モジュールの検索優先度は、下に書くほど高くなる
+      const modSelf = this.modList.shift()
+      this.modList.unshift(modName)
+      this.modList.unshift(modSelf)
+    }
+    return {
+      type: 'require', 
+      value: filename, 
+      josi: '', 
+      ...this.peekSourceMap(),
+      end: this.peekSourceMap() 
+    }  
+  }
+
   /** @returns {Ast} */
   yBlock () {
     const map = this.peekSourceMap()
@@ -243,9 +269,12 @@ export class NakoParser extends NakoParserBase {
     if (this.check('とは')) { this.get() }
     let block = null
     let multiline = false
+    let funcFn = false
     if (this.check('ここから')) { multiline = true }
     if (this.check('eol')) { multiline = true }
     try {
+      this.funcLevel++
+      this.usedFuncFn = false
       if (multiline) {
         this.saveStack()
         block = this.yBlock()
@@ -256,6 +285,8 @@ export class NakoParser extends NakoParserBase {
         block = this.ySentence()
         this.loadStack()
       }
+      this.funcLevel--
+      funcFn = this.usedFuncFn
     } catch (err) {
       this.logger.debug(this.nodeToStr(funcName, { depth: 0, typeName: '関数' }, true) +
         'の定義で以下のエラーがありました。\n' + err.message, def)
@@ -268,6 +299,7 @@ export class NakoParser extends NakoParserBase {
       name: funcName,
       args: defArgs,
       block,
+      funcFn,
       josi: '',
       ...map,
       end: this.peekSourceMap()
@@ -975,6 +1007,7 @@ export class NakoParser extends NakoParserBase {
     // 「,」を飛ばす
     if (this.check('comma')) { this.get() }
     // ブロックを読む
+    this.funcLevel++
     this.saveStack()
     const block = this.yBlock()
     // 末尾の「ここまで」をチェック - もしなければエラーにする #1045
@@ -983,6 +1016,7 @@ export class NakoParser extends NakoParserBase {
     }
     this.get() // skip ここまで
     this.loadStack()
+    this.funcLevel--
     return {
       type: 'func_obj',
       args,
@@ -994,7 +1028,7 @@ export class NakoParser extends NakoParserBase {
     }
   }
 
-  /** @returns {import('./nako3').Ast | null | undefined} */
+  /** @returns {import('./nako3.mjs').Ast | null | undefined} */
   yDainyu () {
     const map = this.peekSourceMap()
     const dainyu = this.get() // 代入
@@ -1017,21 +1051,21 @@ export class NakoParser extends NakoParserBase {
       };
     }
     // 一般的な変数への代入
+    const word2 = this.getVarName(word)
     return {
-      type: 'let', name: word, 
+      type: 'let', name: word2,
       value: value, josi: '', 
       ...map, end: this.peekSourceMap()
     }
   }
 
-  /** @returns {import('./nako3').Ast | null | undefined} */
+  /** @returns {import('./nako3.mjs').Ast | null | undefined} */
   ySadameru () {
     const map = this.peekSourceMap()
     const sadameru = this.get() // 定める
     if (sadameru === null) { return null }
     const word = this.popStack(['を'])
     const value = this.popStack(['へ', 'に'])
-    console.log(word)
     if (!word || (word.type !== 'word' && word.type !== 'func' && word.type !== '配列参照')) {
       throw NakoSyntaxError.fromNode('『定める』文で定数が見当たりません。『(定数名)を(値)に定める』のように使います。', sadameru)
     }
@@ -1042,7 +1076,7 @@ export class NakoParser extends NakoParserBase {
     };
   }
 
-  /** @returns {import('./nako3').Ast | null | undefined} */
+  /** @returns {import('./nako3.mjs').Ast | null | undefined} */
   yIncDec () {
     const map = this.peekSourceMap()
     const action = this.get() // (増やす|減らす)
@@ -1077,7 +1111,7 @@ export class NakoParser extends NakoParserBase {
     };
   }
 
-  /** @returns {import('./nako3').Ast | null | undefined} */
+  /** @returns {import('./nako3.mjs').Ast | null | undefined} */
   yCall () {
     if (this.isEOF()) { return null }
     
@@ -1174,6 +1208,9 @@ export class NakoParser extends NakoParserBase {
     // 最近使った関数を記録
     this.recentlyCalledFunc.push({name: t.value, ...f})
 
+    // 呼び出す関数が非同期呼び出しが必要(asyncFn)ならマーク
+    if (f && f.asyncFn) { this.usedFuncFn = true }
+
     // 関数の引数を取り出す処理
     const args = []
     let nullCount = 0
@@ -1211,9 +1248,17 @@ export class NakoParser extends NakoParserBase {
     if (nullCount >= 2 && (valueCount > 0 || t.josi === '' || keizokuJosi.indexOf(t.josi) >= 0)) { throw NakoSyntaxError.fromNode(`関数『${t.value}』の引数が不足しています。`, t) }
 
     const funcNode = { type: 'func', name: t.value, args: args, josi: t.josi, ...map, end: this.peekSourceMap() }
+    // 「プラグイン名設定」か
+    if (funcNode.name === 'プラグイン名設定') {
+      let fname = args[0].value
+      if (fname === 'メイン') { fname = args[0].file }
+      this.modName = NakoLexer.filenameToModName(fname)
+    }
+
     // 言い切りならそこで一度切る
     if (t.josi === '') { return funcNode }
 
+
     // **して、** の場合も一度切る
     if (keizokuJosi.indexOf(t.josi) >= 0) {
       funcNode.josi = 'して'
@@ -1307,10 +1352,12 @@ export class NakoParser extends NakoParserBase {
             throw new Error('値が空です。')
           }
           if (this.check('comma')) { this.get() } // skip comma (ex) name1=val1, name2=val2
+          const nameToken = this.getVarName(this.y[0])
+          const valueToken = this.y[2]
           return {
             type: 'let',
-            name: this.y[0],
-            value: this.y[2],
+            name: nameToken,
+            value: valueToken,
             ...map,
             end: this.peekSourceMap()
           }
@@ -1348,7 +1395,7 @@ export class NakoParser extends NakoParserBase {
 
     // ローカル変数定義
     if (this.accept(['word', 'とは'])) {
-      const word = this.y[0]
+      let word = this.getVarName(this.y[0])
       if (!this.checkTypes(['変数', '定数'])) {
         throw NakoSyntaxError.fromNode('ローカル変数『' + word.value + '』の定義エラー', word)
       }
@@ -1372,9 +1419,10 @@ export class NakoParser extends NakoParserBase {
     }
     // ローカル変数定義（その２）
     if (this.accept(['変数', 'word', 'eq', this.yCalc])) {
+      let word = this.getVarName(this.y[1])
       return {
         type: 'def_local_var',
-        name: this.y[1],
+        name: word,
         vartype: '変数',
         value: this.y[3],
         ...map,
@@ -1383,9 +1431,10 @@ export class NakoParser extends NakoParserBase {
     }
 
     if (this.accept(['定数', 'word', 'eq', this.yCalc])) {
+      let word = this.getVarName(this.y[1])
       return {
         type: 'def_local_var',
-        name: this.y[1],
+        name: word,
         vartype: '定数',
         value: this.y[3],
         ...map,
@@ -1406,6 +1455,7 @@ export class NakoParser extends NakoParserBase {
       } else {
         throw NakoSyntaxError.fromNode('複数定数の代入文でエラー。『定数[A,B,C]=[1,2,3]』の書式で記述してください。', this.y[0])
       }
+      names.value = this.getVarNameList(names.value)
       return {
         type: 'def_local_varlist',
         names: names.value,
@@ -1428,6 +1478,7 @@ export class NakoParser extends NakoParserBase {
       } else {
         throw NakoSyntaxError.fromNode('複数変数の代入文でエラー。『変数[A,B,C]=[1,2,3]』の書式で記述してください。', this.y[0])
       }
+      names.value = this.getVarNameList(names.value)
       return {
         type: 'def_local_varlist',
         names: names.value,
@@ -1442,9 +1493,11 @@ export class NakoParser extends NakoParserBase {
     if (this.check2(['word', 'comma', 'word'])) {
       // 2 word
       if (this.accept(['word', 'comma', 'word', 'eq', this.yCalc])) {
+        let names = [this.y[0], this.y[2]]
+        names = this.getVarNameList(names)
         return {
           type: 'def_local_varlist',
-          names: [this.y[0], this.y[2]],
+          names,
           vartype: '変数',
           value: this.y[4],
           ...map,
@@ -1453,9 +1506,11 @@ export class NakoParser extends NakoParserBase {
       }
       // 3 word
       if (this.accept(['word', 'comma', 'word', 'comma', 'word', 'eq', this.yCalc])) {
+        let names = [this.y[0], this.y[2], this.y[4]]
+        names = this.getVarNameList(names)
         return {
           type: 'def_local_varlist',
-          names: [this.y[0], this.y[2], this.y[4]],
+          names,
           vartype: '変数',
           value: this.y[6],
           ...map,
@@ -1464,9 +1519,11 @@ export class NakoParser extends NakoParserBase {
       }
       // 4 word
       if (this.accept(['word', 'comma', 'word', 'comma', 'word', 'comma', 'word', 'eq', this.yCalc])) {
+        let names = [this.y[0], this.y[2], this.y[4], this.y[6]]
+        names = this.getVarNameList(names) 
         return {
           type: 'def_local_varlist',
-          names: [this.y[0], this.y[2], this.y[4], this.y[6]],
+          names,
           vartype: '変数',
           value: this.y[8],
           ...map,
@@ -1475,9 +1532,11 @@ export class NakoParser extends NakoParserBase {
       }
       // 5 word
       if (this.accept(['word', 'comma', 'word', 'comma', 'word', 'comma', 'word', 'comma', 'word', 'eq', this.yCalc])) {
+        let names = [this.y[0], this.y[2], this.y[4], this.y[6], this.y[8]]
+        names = this.getVarNameList(names) 
         return {
           type: 'def_local_varlist',
-          names: [this.y[0], this.y[2], this.y[4], this.y[6], this.y[8]],
+          names,
           vartype: '変数',
           value: this.y[10],
           ...map,
@@ -1528,7 +1587,7 @@ export class NakoParser extends NakoParserBase {
     if (this.accept(['word', '@', this.yValue, 'eq', this.yCalc])) {
       return {
         type: 'let_array',
-        name: this.y[0],
+        name: this.getVarName(this.y[0]),
         index: [this.checkArrayIndex(this.y[2])],
         value: this.y[4],
         ...map,
@@ -1540,7 +1599,7 @@ export class NakoParser extends NakoParserBase {
     if (this.accept(['word', '@', this.yValue, '@', this.yValue, 'eq', this.yCalc])) {
       return {
         type: 'let_array',
-        name: this.y[0],
+        name: this.getVarName(this.y[0]),
         index: this.checkArrayReverse([this.checkArrayIndex(this.y[2]), this.checkArrayIndex(this.y[4])]),
         value: this.y[6],
         ...map,
@@ -1552,7 +1611,7 @@ export class NakoParser extends NakoParserBase {
     if (this.accept(['word', '@', this.yValue, '@', this.yValue, '@', this.yValue, 'eq', this.yCalc])) {
       return {
         type: 'let_array',
-        name: this.y[0],
+        name: this.getVarName(this.y[0]),
         index: this.checkArrayReverse([this.checkArrayIndex(this.y[2]), this.checkArrayIndex(this.y[4]), this.checkArrayIndex(this.y[6])]),
         value: this.y[8],
         ...map,
@@ -1564,7 +1623,7 @@ export class NakoParser extends NakoParserBase {
     if (this.accept(['word', '@', this.yValue, 'comma', this.yValue, 'eq', this.yCalc])) {
       return {
         type: 'let_array',
-        name: this.y[0],
+        name: this.getVarName(this.y[0]),
         index: this.checkArrayReverse([this.checkArrayIndex(this.y[2]), this.checkArrayIndex(this.y[4])]),
         value: this.y[6],
         ...map,
@@ -1576,7 +1635,7 @@ export class NakoParser extends NakoParserBase {
     if (this.accept(['word', '@', this.yValue, 'comma', this.yValue, 'comma', this.yValue, 'eq', this.yCalc])) {
       return {
         type: 'let_array',
-        name: this.y[0],
+        name: this.getVarName(this.y[0]),
         index: this.checkArrayReverse([this.checkArrayIndex(this.y[2]), this.checkArrayIndex(this.y[4]), this.checkArrayIndex(this.y[6])]),
         value: this.y[8],
         ...map,
@@ -1592,7 +1651,7 @@ export class NakoParser extends NakoParserBase {
     if (this.accept(['word', '[', this.yCalc, ']', 'eq', this.yCalc])) {
       return {
         type: 'let_array',
-        name: this.y[0],
+        name: this.getVarName(this.y[0]),
         index: [this.checkArrayIndex(this.y[2])],
         value: this.y[5],
         ...map,
@@ -1604,7 +1663,7 @@ export class NakoParser extends NakoParserBase {
     if (this.accept(['word', '[', this.yCalc, ']', '[', this.yCalc, ']', 'eq', this.yCalc])) {
       return {
         type: 'let_array',
-        name: this.y[0],
+        name: this.getVarName(this.y[0]),
         index: this.checkArrayReverse([this.checkArrayIndex(this.y[2]), this.checkArrayIndex(this.y[5])]),
         value: this.y[8],
         tag: '2',
@@ -1615,7 +1674,7 @@ export class NakoParser extends NakoParserBase {
     if (this.accept(['word', '[', this.yCalc, 'comma', this.yCalc, ']', 'eq', this.yCalc])) {
       return {
         type: 'let_array',
-        name: this.y[0],
+        name: this.getVarName(this.y[0]),
         index: this.checkArrayReverse([this.checkArrayIndex(this.y[2]), this.checkArrayIndex(this.y[4])]),
         value: this.y[7],
         tag: '2',
@@ -1628,7 +1687,7 @@ export class NakoParser extends NakoParserBase {
     if (this.accept(['word', '[', this.yCalc, ']', '[', this.yCalc, ']', '[', this.yCalc, ']', 'eq', this.yCalc])) {
       return {
         type: 'let_array',
-        name: this.y[0],
+        name: this.getVarName(this.y[0]),
         index: this.checkArrayReverse([this.checkArrayIndex(this.y[2]), this.checkArrayIndex(this.y[5]), this.checkArrayIndex(this.y[8])]),
         value: this.y[11],
         ...map,
@@ -1638,7 +1697,7 @@ export class NakoParser extends NakoParserBase {
     if (this.accept(['word', '[', this.yCalc, 'comma', this.yCalc, 'comma', this.yCalc, ']', 'eq', this.yCalc])) {
       return {
         type: 'let_array',
-        name: this.y[0],
+        name: this.getVarName(this.y[0]),
         index: this.checkArrayReverse([this.checkArrayIndex(this.y[2]), this.checkArrayIndex(this.y[4]), this.checkArrayIndex(this.y[6])]),
         value: this.y[9],
         ...map,
@@ -1746,7 +1805,7 @@ export class NakoParser extends NakoParserBase {
     // 一語関数
     const splitType = operatorList.concat(['eol', ')', ']', 'ならば', '回', '間', '反復', '条件分岐'])
     if (this.check2(['func', splitType])) {
-      const f = this.get()
+      const f = this.getVarNameRef(this.get())
       return {
         type: 'func',
         name: f.value,
@@ -1762,7 +1821,7 @@ export class NakoParser extends NakoParserBase {
       if (this.accept([['func', 'word'], '(', this.yGetArgParen, ')'])) {
         return {
           type: 'func',
-          name: this.y[0].value,
+          name: this.getVarNameRef(this.y[0]).value,
           args: this.y[2],
           josi: this.y[3].josi,
           ...map,
@@ -1843,7 +1902,7 @@ export class NakoParser extends NakoParserBase {
   yValueWord () {
     const map = this.peekSourceMap()
     if (this.check('word')) {
-      const word = this.get()
+      const word = this.getVarNameRef(this.get())
       if (this.skipRefArray) { return word }
 
       // word[n] || word@n
@@ -1867,6 +1926,58 @@ export class NakoParser extends NakoParserBase {
     return null
   }
 
+  /** 変数名を検索して解決する 
+   * @param {TokenWithSourceMap} word
+   * @return {TokenWithSourceMap}
+   */
+  getVarName(word) {
+    // check word name
+    const f = this.findVar(word.value)
+    if (!f) { // 変数が見つからない
+      if (this.funcLevel === 0) { // global
+        let gname = word.value
+        if (gname.indexOf('__') < 0) { gname = this.modName + '__' + word.value }
+        this.funclist[gname] = {type: 'var', value: ''}
+        word.value = gname
+      } else { // local
+        this.localvars[word.value] = {type: 'var', value: ''}
+      }
+    }
+    else if (f && f.scope === 'global') {
+      word.value = f.name
+    }
+    return word
+  }
+
+  /** 変数名を検索して解決する 
+   * @param {TokenWithSourceMap} word
+   * @return {TokenWithSourceMap}
+   */
+  getVarNameRef(word) {
+    // check word name
+    const f = this.findVar(word.value)
+    if (!f) { // 変数が見つからない
+      if (this.funcLevel === 0 && word.value.indexOf('__') < 0) {
+        word.value = this.modName + '__' + word.value
+      }
+    }
+    if (f && f.scope === 'global') {
+      word.value = f.name
+    }
+    return word
+  }
+
+  /** 複数の変数名を検索して解決する 
+   * @param {TokenWithSourceMap[]} words
+   * @return {TokenWithSourceMap[]}
+   */
+   getVarNameList(words) {
+     for (let i = 0; i < words.length; i++) {
+       words[i] = this.getVarName(words[i])
+     }
+     return words
+  }
+
   yJSONObjectValue () {
     const a = []
     const firstToken = this.peek()

package/src/nako_parser_base.mjs

@@ -3,26 +3,40 @@
  */
 export class NakoParserBase {
   /**
-   * @param {import("./nako_logger")} logger
+   * @param {import("./nako_logger.mjs")} logger
    */
   constructor (logger) {
     this.logger = logger
     /** @type any[] */
     this.stackList = [] // 関数定義の際にスタックが混乱しないように整理する
-    this.init()
-    /** @type {import('./nako3').TokenWithSourceMap[]} */
+    /** @type {import('./nako3.mjs').TokenWithSourceMap[]} */
     this.tokens = []
-    /** @type {import('./nako3').Ast[]} */
+    /** @type {import('./nako3.mjs').Ast[]} */
     this.stack = []
     this.index = 0
-    /** @type {import('./nako3').Ast[]} */
+    /** トークン出現チェック(accept関数)に利用する 
+     * @type {import('./nako3.mjs').Ast[]}
+     */
     this.y = []
+    /** モジュル名 @type {string} */
+    this.modName = 'inline'
+    /** 利用するモジュールの名前一覧 @type {Array[string]} */
+    this.modList = []
+    /** グローバル変数・関数の確認用 */
+    this.funclist = {}
+    this.funcLevel = 0
+    this.usedFuncFn = false // funcFnの呼び出しがあるかどうか
+    /** ローカル変数の確認用 */
+    this.localvars = {'それ': {type: 'var', value: ''}}
+    /** コード生成器の名前 */
     this.genMode = 'sync' // #637
     this.arrayIndexFrom = 0  // #1140
     this.flagReverseArrayIndex = false // #1140
     this.flagCheckArrayInit = false // #1140
     /** @type Object[] */
     this.recentlyCalledFunc = [] // 最近呼び出した関数(余剰エラーの報告に使う)
+
+    this.init()
   }
 
   init () {
@@ -31,7 +45,7 @@ export class NakoParserBase {
   }
 
   reset () {
-    /** @type {import('./nako3').TokenWithSourceMap[]} */
+    /** @type {import('./nako3.mjs').TokenWithSourceMap[]} */
     this.tokens = [] // 字句解析済みのトークンの一覧を保存
     this.index = 0 // tokens[] のどこまで読んだかを管理する
     this.stack = [] // 計算用のスタック ... 直接は操作せず、pushStack() popStack() を介して使う
@@ -75,6 +89,61 @@ export class NakoParserBase {
 
   loadStack () {
     this.stack = this.stackList.pop()
+    this.localvars = {'それ': {type: 'var', value: ''}}
+  }
+
+  /** 変数名を探す
+   * @param {string} name
+   * @returns {any}変数名の情報
+   */
+  findVar(name) {
+    // モジュール名を含んでいる?
+    if (name.indexOf('__') >= 0) {
+      if (this.funclist[name]) {
+        return {
+          name,
+          scope: 'global',
+          info: this.funclist[name]
+        }
+      } else { return undefined }
+    }
+    // ローカル変数？
+    if (this.localvars[name]) {
+      return {
+        name: name,
+        scope: 'local',
+        info: this.localvars[name]
+      }
+    }
+    // グローバル変数（自身）？
+    const gnameSelf = `${this.modName}__${name}`
+    if (this.funclist[gnameSelf]) {
+      return {
+        name: gnameSelf,
+        scope: 'global',
+        info: this.funclist[gnameSelf]
+      }
+    }
+    // グローバル変数（モジュールを検索）？
+    for (let mod of this.modList) {
+      const gname = `${mod}__${name}`
+      if (this.funclist[gname]) {
+        return {
+          name: gname,
+          scope: 'global',
+          info: this.funclist[gname] 
+        }
+      }
+    }
+    // システム変数 (funclistを普通に検索)
+    if (this.funclist[name]) {
+      return {
+        name,
+        scope: 'system',
+        info: this.funclist[name]
+      }
+    }
+    return undefined
   }
 
   /**

package/src/nako_version.mjs

@@ -1,7 +1,7 @@
 // なでしこバージョン
 export default {
-  version: '3.3.4',
+  version: '3.3.7',
   major: 3,
   minor: 3,
-  patch: 4
+  patch: 7
 }

package/src/plugin_system.mjs

@@ -7,9 +7,9 @@ export default {
     type: 'const',
     value: {
       pluginName: 'plugin_system', // プラグインの名前
-      pluginVersion: '3.2.24', // プラグインのバージョン
+      pluginVersion: '3.3.4', // プラグインのバージョン
       nakoRuntime: ['wnako', 'cnako', 'phpnako'], // 対象ランタイム
-      nakoVersion: '^3.2.24' // 要求なでしこバージョン
+      nakoVersion: '^3.3.4' // 要求なでしこバージョン
     }
   },
   '初期化': {
@@ -22,9 +22,11 @@ export default {
       sys.__findVar = function (nameStr, def) {
         if (typeof nameStr === 'function') { return nameStr }
         if (sys.__locals[nameStr]) { return sys.__locals[nameStr] }
+        let modName = (typeof(sys.__modName) !== 'undefined') ? sys.__modName : 'inline'
+        let gname = (nameStr.indexOf('__') >= 0) ? nameStr : modName + '__' + nameStr
         for (let i = 2; i >= 0; i--) {
           const scope = sys.__varslist[i]
-          if (scope[nameStr]) { return scope[nameStr] }
+          if (scope[gname]) { return scope[gname] }
         }
         return def
       }
@@ -558,10 +560,10 @@ export default {
         throw new Error('非同期モードでは「ナデシコ」は利用できません。')
       }
       sys.__varslist[0]['表示ログ'] = ''
-      sys.__self.runEx(code, 'immediate-code.nako3', { resetEnv: false, resetLog: true })
+      sys.__self.runEx(code, sys.__modName, { resetEnv: false, resetLog: true })
       const out = sys.__varslist[0]['表示ログ'] + ''
       if (out) {
-        sys.logger.send('stdout', out)
+        sys.logger.trace(out)
       }
       return out
     }
@@ -573,10 +575,10 @@ export default {
       if (sys.__genMode === '非同期モード') {
         throw new Error('非同期モードでは「ナデシコ続」は利用できません。')
       }
-      sys.__self.runEx(code, 'immediate-code.nako3', { resetEnv: false, resetLog: false })
+      sys.__self.runEx(code, sys.__modName, { resetEnv: false, resetLog: false })
       const out = sys.__varslist[0]['表示ログ'] + ''
       if (out) {
-        sys.logger.send('stdout', out)
+        sys.logger.trace(out)
       }
       return out
     }
@@ -2479,6 +2481,21 @@ export default {
       throw new Error(s)
     }
   },
+  'グローバル関数一覧取得': { // @グローバル変数にある関数一覧を取得 // @ぐろーばるかんすういちらんしゅとく
+    type: 'func',
+    josi: [],
+    pure: true,
+    fn: function (sys) {
+      console.log(sys.__varslist[2])
+      const f = []
+      for (const key in sys.__varslist[1]) {
+        if (sys.__v0.hasOwnProperty(key)) {
+          f.push(key)
+        }
+      }
+      return f
+    }
+  },
   'システム関数一覧取得': { // @システム関数の一覧を取得 // @しすてむかんすういちらんしゅとく
     type: 'func',
     josi: [],
@@ -2486,8 +2503,9 @@ export default {
     fn: function (sys) {
       const f = []
       for (const key in sys.__v0) {
-        const ff = sys.__v0[key]
-        if (typeof ff === 'function') { f.push(key) }
+        if (sys.__v0.hasOwnProperty(key)) {
+          f.push(key)
+        }
       }
       return f
     }