avoid eval() so as to not break minifiers

kripken · Aug 3, 2011 · 4be8d01 · 4be8d01
1 parent a8afd4d
commit 4be8d01
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/speak.full.js b/speak.full.js
@@ -18939,7 +18939,7 @@ var _llvm_dbg_declare; // stub for _llvm_dbg_declare
 
   var _stdout=0;
 
-  var _stderr=0;var FS={"root":{"read":true,"write":false,"isFolder":true,"isDevice":false,"timestamp":"2011-08-02T20:49:28.477Z","inodeNumber":1,"contents":{}},"currentPath":"/","nextInode":2,"cmask":511,"streams":[null],"ignorePermissions":true, absolutePath: function (relative, base) {
+  var _stderr=0;var FS={"root":{"read":true,"write":false,"isFolder":true,"isDevice":false,"timestamp":"2011-08-02T23:43:58.401Z","inodeNumber":1,"contents":{}},"currentPath":"/","nextInode":2,"cmask":511,"streams":[null],"ignorePermissions":true, absolutePath: function (relative, base) {
         if (typeof relative !== 'string') return null;
         if (base === undefined) base = FS.currentPath;
         if (relative && relative[0] == '/') base = '';
@@ -120047,8 +120047,10 @@ if (!Module['noInitialRun']) {
 
 
   FS.createPath('/', 'espeak/espeak-data', true, false);
-  ['phontab', 'phonindex', 'phondata', 'intonations', 'en_dict'].forEach(function(datafile) {
-    eval("FS.createDataFile('/espeak/espeak-data', datafile, " + datafile + ", true, false);");
+  [['phontab', phontab], ['phonindex', phonindex], ['phondata', phondata], ['intonations', intonations], ['en_dict', en_dict]].forEach(function(pair) {
+    var id = pair[0];
+    var data = pair[1];
+    FS.createDataFile('/espeak/espeak-data', id, data, true, false);
   });
 
   FS.createPath('/', 'espeak/espeak-data/voices/en', true, false);

diff --git a/src/post.js b/src/post.js
@@ -1,7 +1,9 @@
 
   FS.createPath('/', 'espeak/espeak-data', true, false);
-  ['phontab', 'phonindex', 'phondata', 'intonations', 'en_dict'].forEach(function(datafile) {
-    eval("FS.createDataFile('/espeak/espeak-data', datafile, " + datafile + ", true, false);");
+  [['phontab', phontab], ['phonindex', phonindex], ['phondata', phondata], ['intonations', intonations], ['en_dict', en_dict]].forEach(function(pair) {
+    var id = pair[0];
+    var data = pair[1];
+    FS.createDataFile('/espeak/espeak-data', id, data, true, false);
   });
 
   FS.createPath('/', 'espeak/espeak-data/voices/en', true, false);