Nakoワーカーを名前空間と文字列定数プールへの対応。

src/plugin_webworker.mjs

@@ -210,7 +210,7 @@ const PluginWebWorker = {
     fn: function (work, data, sys) {
       const msg = {
         type: 'run',
-        data: sys.__modName + '__' + data
+        data: data
       }
       work.postMessage(msg)
     },
@@ -291,10 +291,25 @@ const PluginWebWorker = {
     pure: false,
     fn: function (datas, work, sys) {
       if (typeof sys === 'undefined') { sys = work; work = self }
+      const modNameList = []
       const obj = []
       if (typeof datas === 'string') { datas = [datas] }
       datas.forEach(data => {
-        data = sys.__modName + '__' + data
+        if (data.indexOf('__') === -1) {
+          for (const modname of sys.__modList) {
+            const varname = modname + '__' + data
+            if (typeof sys.__varslist[2][varname] !== 'undefined' || typeof sys.__varslist[1][varname] !== 'undefined') {
+              data = varname
+              break
+            }
+          }
+        }
+        if (data.indexOf('__') > -1) {
+          const modname = data.split('__')[0]
+          if (modNameList.indexOf(modname) === -1) {
+            modNameList.push(modname)
+          }
+        }
         if (typeof sys.__varslist[2][data] !== 'undefined') {
           obj.push({
             type: 'val',
@@ -317,6 +332,28 @@ const PluginWebWorker = {
         }
       })
       if (obj.length > 0) {
+        const modInfoList = []
+        for (const modname of modNameList) {
+          modInfoList.push({
+            name: modname,
+            export: sys.compiler.moduleExport[modname]
+          })
+        }
+        obj.push({
+          type: 'env',
+          name: 'modlist',
+          content: modInfoList
+        })
+        obj.push({
+          type: 'env',
+          name: 'constPools',
+          content: sys.constPools
+        })
+        obj.push({
+          type: 'env',
+          name: 'constPoolsTemplate',
+          content: sys.constPoolsTemplate
+        })
         const msg = {
           type: 'trans',
           data: obj

src/wnako3webworker.mjs

@@ -54,6 +54,23 @@ if (typeof (navigator) === 'object' && self && self instanceof WorkerGlobalScope
             nako3Compiler.__varslist[1][o.name] = () => {}
           } else if (o.type === 'val') {
             nako3Compiler.__varslist[2][o.name] = o.content
+          } else if (o.type === 'env') {
+            if (o.name === 'modlist') {
+              for (const modInfo of o.content) {
+                if (nako3Compiler.lexer.modList.indexOf(modInfo.name) < 0) {
+                  nako3Compiler.lexer.modList.push(modInfo.name)
+                }
+                if (modInfo.export != null && !nako3Compiler.moduleExport.hasOwnProperty(modInfo.name)) {
+                  nako3Compiler.moduleExport[modInfo.name] = modInfo.export
+                }
+              }
+            } else if (o.name === 'constPools') {
+              nako3Compiler.constPools = o.content
+            } else if (o.name === 'constPoolsTemplate') {
+              nako3Compiler.constPoolsTemplate = o.content
+            } else if (o.name === 'chk') {
+              nako3Compiler.chk = o.content
+            }
           }
         })
         break