Add get_dirname and fix toBoolean

rafi16jan · rafi16jan · commit 890d0b36f1ac · 2021-05-19T18:09:15.000+07:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/bin/compile.js b/bin/compile.js
@@ -90,7 +90,7 @@ if (process.argv[2] && process.argv[2].indexOf('.py') !== -1) {
     if (filename.startsWith(file + '.')) fs.copyFileSync(path.join(directory, filename), path.join(process.cwd(), filename));
   }
   try {
-    fs.appendFileSync(path.join(process.cwd(), file + '.js' ), '\n' + deserialize_rpython_json.toString() + '\nModule.wasmMemory = wasmMemory;\nvar rpyGlobalArg = {"Module": Module, "deserialize_rpython_json": deserialize_rpython_json};\nrpyGlobalArg.global = rpyGlobalArg;\n if (typeof window !== "undefined") rpyGlobalArg.window = window;\n if (typeof require !== "undefined") rpyGlobalArg.require = require;\n if (typeof self !== "undefined") rpyGlobalArg.self = self;');
+    fs.appendFileSync(path.join(process.cwd(), file + '.js' ), '\n' + deserialize_rpython_json.toString() + '\nModule.wasmMemory = wasmMemory;\nvar rpyGlobalArg = {"Module": Module, "deserialize_rpython_json": deserialize_rpython_json, "get_dirname": function () {return __dirname;}};\nrpyGlobalArg.global = rpyGlobalArg;\n if (typeof window !== "undefined") rpyGlobalArg.window = window;\n if (typeof require !== "undefined") rpyGlobalArg.require = require;\n if (typeof self !== "undefined") rpyGlobalArg.self = self;');
     if (source_flag) {
       var source_map = JSON.parse(require('fs').readFileSync(path.join(directory, file + '.wasm.map')));
       source_map.sources.forEach(function (filename, index) {
diff --git a/javascript/emscripten.py b/javascript/emscripten.py
@@ -893,7 +893,12 @@ def toBoolean(self):
         self._update()
         if self.type == 'boolean':
            return True if 'true' == self.toString() else False
-        return True if 'true' == get_boolean(self.variable) else False
+        #return True if 'true' == get_boolean(self.variable) else False
+        elif self.type in ['array', 'object']: return True
+        elif self.type == 'string': return self['length'].toBoolean()
+        elif self.type == 'number': return self.toInteger() != 0
+        elif self.type in ['null', 'undefined']: return False
+        return True
 
     def toBool(self): return self.toBoolean()
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ if (process.argv[2] && process.argv[2].indexOf('.py') !== -1) {`
`90`	`90`	`if (filename.startsWith(file + '.')) fs.copyFileSync(path.join(directory, filename), path.join(process.cwd(), filename));`
`91`	`91`	`}`
`92`	`92`	`try {`
`93`		`- fs.appendFileSync(path.join(process.cwd(), file + '.js' ), '\n' + deserialize_rpython_json.toString() + '\nModule.wasmMemory = wasmMemory;\nvar rpyGlobalArg = {"Module": Module, "deserialize_rpython_json": deserialize_rpython_json};\nrpyGlobalArg.global = rpyGlobalArg;\n if (typeof window !== "undefined") rpyGlobalArg.window = window;\n if (typeof require !== "undefined") rpyGlobalArg.require = require;\n if (typeof self !== "undefined") rpyGlobalArg.self = self;');`
	`93`	+ fs.appendFileSync(path.join(process.cwd(), file + '.js' ), '\n' + deserialize_rpython_json.toString() + '\nModule.wasmMemory = wasmMemory;\nvar rpyGlobalArg = {"Module": Module, "deserialize_rpython_json": deserialize_rpython_json, "get_dirname": function () {return __dirname;}};\nrpyGlobalArg.global = rpyGlobalArg;\n if (typeof window !== "undefined") rpyGlobalArg.window = window;\n if (typeof require !== "undefined") rpyGlobalArg.require = require;\n if (typeof self !== "undefined") rpyGlobalArg.self = self;');
`94`	`94`	`if (source_flag) {`
`95`	`95`	`var source_map = JSON.parse(require('fs').readFileSync(path.join(directory, file + '.wasm.map')));`
`96`	`96`	`source_map.sources.forEach(function (filename, index) {`