nadesiko3 3.3.3 → 3.3.6

package/src/nako_lexer.mjs

@@ -3,7 +3,8 @@
 import { opPriority } from './nako_parser_const.mjs'
 
 // 予約語句
-// (memo)「回」「間」「繰返」「反復」「抜」「続」「戻」「代入」などは replaceWord で word から変換
+// (memo)「回」「間」「繰返」「反復」「抜」「続」「戻」「代入」などは _replaceWord で word から変換
+/** @types {Record<string, string>} */
 import reservedWords from './nako_reserved_words.mjs'
 
 // 助詞の一覧
@@ -15,7 +16,7 @@ import { rules, unitRE } from './nako_lex_rules.mjs'
 import { NakoLexerError, InternalLexerError } from './nako_errors.mjs'
 
 /**
- * @typedef {import('./nako3').TokenWithSourceMap} TokenWithSourceMap
+ * @typedef {import('./nako3.mjs').TokenWithSourceMap} TokenWithSourceMap
  * @typedef {{
  *   type: string;
  *   value: unknown;
@@ -40,37 +41,43 @@ import { NakoLexerError, InternalLexerError } from './nako_errors.mjs'
   *         value: unknown
   *    }
   * )>} FuncList
- */
+  */
 
 export class NakoLexer {
   /**
-   * @param {import("./nako_logger")} logger
+   * @param {import("./nako_logger.mjs").NakoLogger} logger
    */
   constructor (logger) {
+    /* @type {import("./nako_logger.mjs").NakoLogger} */
     this.logger = logger
-    /** @type {FuncList} */
+    /** 字句解析した際,確認された関数の一覧 @type {FuncList} */
     this.funclist = {}
+    /** 字句解析した際,取り込むモジュール一覧 
+     * nako3::lex で更新される
+     * @type {Array<string>} 
+     */
+    this.modList = []
     /** @type {TokenWithSourceMap[]} */
     this.result = []
+    /** モジュール名 */
+    this.modName = 'inline'
   }
 
   setFuncList (listObj) {
     this.funclist = listObj
   }
 
-  setInput (code, line, filename) {
-    // 最初に全部を区切ってしまう
-    return this.tokenize(code, line, filename)
-  }
-
   /**
    * @param {TokenWithSourceMap[]} tokens
+   * @param {boolean} isFirst
+   * @param {string} filename
    */
-  setInput2 (tokens, isFirst) {
+  replaceTokens (tokens, isFirst, filename) {
     this.result = tokens
+    this.modName = NakoLexer.filenameToModName(filename)
     // 関数の定義があれば funclist を更新
     NakoLexer.preDefineFunc(tokens, this.logger, this.funclist)
-    this.replaceWord(this.result)
+    this._replaceWord(this.result)
 
     if (isFirst) {
       if (this.result.length > 0) {
@@ -129,7 +136,7 @@ export class NakoLexer {
    * ファイル内で定義されている関数名を列挙する。結果はfunclistに書き込む。その他のトークンの置換処理も行う。
    * シンタックスハイライトの処理から呼び出すためにstaticメソッドにしている。
    * @param {TokenWithSourceMap[]} tokens
-   * @param {import('./nako_logger')} logger
+   * @param {import('./nako_logger.mjs').NakoLogger} logger
    * @param {FuncList} funclist
    */
   static preDefineFunc (tokens, logger, funclist) {
@@ -144,7 +151,9 @@ export class NakoLexer {
       while (tokens[i]) {
         const t = tokens[i]
         i++
-        if (t.type === ')') { break } else if (t.type === 'func') { isFuncPointer = true } else if (t.type !== '|' && t.type !== 'comma') {
+        if (t.type === ')') { break }
+        if (t.type === 'func') { isFuncPointer = true }
+        else if (t.type !== '|' && t.type !== 'comma') {
           if (isFuncPointer) {
             t.funcPointer = true
             isFuncPointer = false
@@ -186,7 +195,7 @@ export class NakoLexer {
       // N回をN|回に置換
       if (t.type === 'word' && t.josi === '' && t.value.length >= 2) {
         if (t.value.match(/回$/)) {
-          t.value = t.value.substr(0, t.value.length - 1)
+          t.value = t.value.substring(0, t.value.length - 1)
           tokens.splice(i + 1, 0, { type: '回', value: '回', line: t.line, column: t.column, file: t.file, josi: '', startOffset: t.endOffset - 1, endOffset: t.endOffset, rawJosi: '' })
           t.endOffset--
           i++
@@ -214,12 +223,14 @@ export class NakoLexer {
       let varnames = []
       let funcPointers = []
       let funcName = ''
+      let funcNameToken
       // 関数名の前に引数定義
       if (tokens[i] && tokens[i].type === '(') { [josi, varnames, funcPointers] = readArgs() }
 
       // 関数名を得る
       if (!isMumei && tokens[i] && tokens[i].type === 'word') {
-        funcName = tokens[i++].value
+        funcNameToken = tokens[i++]
+        funcName = funcNameToken.value
       }
 
       // 関数名の後で引数定義
@@ -228,9 +239,12 @@ export class NakoLexer {
       // 名前のある関数定義ならば関数テーブルに関数名を登録
       // 無名関数は登録しないように気をつける
       if (funcName !== '') {
+        const modName = NakoLexer.filenameToModName(t.file)
+        funcName = modName + '__' + funcName
         if (funcName in funclist) { // 関数の二重定義を警告
           logger.warn(`関数『${funcName}』は既に定義されています。`, defToken)
         }
+        funcNameToken.value = funcName
         funclist[funcName] = {
           type: 'func',
           josi,
@@ -240,7 +254,6 @@ export class NakoLexer {
           funcPointers
         }
       }
-
       // 無名関数のために
       defToken.meta = { josi, varnames, funcPointers }
     }
@@ -273,22 +286,47 @@ export class NakoLexer {
   /**
    * @param {TokenWithSourceMap[]} tokens
    */
-  replaceWord (tokens) {
+  _replaceWord (tokens) {
     let comment = []
     let i = 0
     const getLastType = () => {
       if (i <= 0) { return 'eol' }
       return tokens[i - 1].type
     }
+    const modSelf = (tokens.length > 0) ? NakoLexer.filenameToModName(tokens[0].file) : 'inline'
     while (i < tokens.length) {
       const t = tokens[i]
+      // 関数を強制的に置換( word => func )
       if (t.type === 'word' && t.value !== 'それ') {
         // 関数を変換
-        const fo = this.funclist[t.value]
+        const funcName = t.value
+        if (funcName.indexOf('__') < 0) {
+          // 自身のモジュール名を検索
+          const gname1 = `${modSelf}__${funcName}`
+          const gfo1 = this.funclist[gname1]
+          if (gfo1 && gfo1.type === 'func') {
+            t.type = 'func'
+            t.meta = gfo1
+            t.value = gname1
+            continue
+          }
+          // モジュール関数を置換
+          for (let mod of this.modList) {
+            const gname = `${mod}__${funcName}`
+            const gfo = this.funclist[gname]
+            if (gfo && gfo.type === 'func') {
+              t.type = 'func'
+              t.meta = gfo
+              t.value = gname
+              break
+            }
+          }
+          if (t.type === 'func') { continue }
+        }
+        const fo = this.funclist[funcName]
         if (fo && fo.type === 'func') {
           t.type = 'func'
           t.meta = fo
-          continue
         }
       }
       // 数字につくマイナス記号を判定
@@ -406,7 +444,7 @@ export class NakoLexer {
         // 空白ならスキップ
         if (rule.name === 'space') {
           column += m[0].length
-          src = src.substr(m[0].length)
+          src = src.substring(m[0].length)
           continue
         }
         // マッチしたルールがコールバックを持つなら
@@ -562,7 +600,7 @@ export class NakoLexer {
         break
       }
       if (!ok) {
-        throw new InternalLexerError('未知の語句: ' + src.substr(0, 3) + '...',
+        throw new InternalLexerError('未知の語句: ' + src.substring(0, 3) + '...',
           srcLength - src.length,
           srcLength - srcLength + 3,
           line
@@ -571,4 +609,27 @@ export class NakoLexer {
     }
     return result
   }
+  // トークン配列をtype文字列に変換
+  static tokensToTypeStr(tokens, sep) {
+    const a = tokens.map((v) => {
+      return v.type
+    })
+    return a.join(sep)
+  }
+  /**
+   * ファイル名からモジュール名へ変換
+   * @param {string} filename 
+   * @returns {string}
+   */
+  static filenameToModName(filename) {
+    if (!filename) { return 'inline' }
+    // パスがあればパスを削除
+    filename = filename.replace(/[\\:]/g, '/') // Windowsのpath記号を/に置換
+    if (filename.indexOf('/') >= 0) {
+      const a = filename.split('/')
+      filename = a[a.length - 1]
+    }
+    filename = filename.replace(/\.nako3?$/, '')
+    return filename
+  }
 }

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,
@@ -1031,7 +1065,6 @@ export class NakoParser extends NakoParserBase {
     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)
     }
@@ -1174,6 +1207,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 +1247,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 +1351,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 +1394,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 +1418,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 +1430,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 +1454,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 +1477,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 +1492,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 +1505,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 +1518,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 +1531,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 +1586,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 +1598,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 +1610,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 +1622,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 +1634,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 +1650,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 +1662,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 +1673,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 +1686,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 +1696,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 +1804,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 +1820,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 +1901,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 +1925,57 @@ 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 && word.value.indexOf('__') < 0) {
+        const gname = this.modName + '__' + word.value
+        word.value = gname
+        this.funclist[gname] = {type: 'var', value: ''}
+      } else {
+        this.localvars[word.value] = {type: 'var', value: ''}
+      }
+    }
+    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()