From 5167bf10340f80d40b9f23886ba8797568104791 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Wed, 28 Oct 2020 23:42:55 +0900
Subject: [PATCH] reverting new js eval impl

---
 assets/JS_INIT.js       |  4 ++--
 assets/bios1.js         |  4 ++--
 assets/evaltest.js      |  5 +++++
 assets/serialtest.js    |  2 +-
 assets/tbas/basic.js    |  2 +-
 assets/tvdos/command.js | 10 +++++-----
 6 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 assets/evaltest.js

diff --git a/assets/JS_INIT.js b/assets/JS_INIT.js
index 5ae677e..1babea0 100644
--- a/assets/JS_INIT.js
+++ b/assets/JS_INIT.js
@@ -278,9 +278,9 @@ load = undefined;
 loadWithNewGlobal = undefined;
 exit = undefined;
 quit = undefined;
-var eval = function(s) { // installing new eval function
+/*var eval = function(s) { // this impl is flawed; it does not return any, and cannot alter Global which may not you actually want
     return Function('"use strict";return(function(){'+s+'}())')();
-}
+}*/
 //
 function javaArrayToJs(jarr) {
     if (!jarr.toString.startsWith("[")) return jarr;
diff --git a/assets/bios1.js b/assets/bios1.js
index 1d8b1c9..f00dd4d 100644
--- a/assets/bios1.js
+++ b/assets/bios1.js
@@ -1,8 +1,8 @@
 println("TERRAN Megatrends inc.");
 //println("Main RAM:"+(system.maxmem() >> 10)+" KBytes");
 
-var memptr = 0;
-var memtestptn = [
+let memptr = 0;
+const memtestptn = [
     // Overclockers will LOVE this!
     //[0x00,0x00,0x00,0x00 , 0xFF,0xFF,0xFF,0xFF , 0x00,0x00,0x00,0x00 , 0xFF,0xFF,0xFF,0xFF],
 
diff --git a/assets/evaltest.js b/assets/evaltest.js
new file mode 100644
index 0000000..241a9f0
--- /dev/null
+++ b/assets/evaltest.js
@@ -0,0 +1,5 @@
+let src = "var tObj = {}; tObj.testvalue = 'hai'; tObj;"
+
+var testGlobalObject = eval(src);
+
+serial.println(testGlobalObject.testvalue);
\ No newline at end of file
diff --git a/assets/serialtest.js b/assets/serialtest.js
index d7f0d0c..274f83a 100644
--- a/assets/serialtest.js
+++ b/assets/serialtest.js
@@ -22,7 +22,7 @@ println(ba);
 
 serial.println(getStatusMessage(1));
 
-com.sendMessage(1, "OPENR\"basic.js\"");
+com.sendMessage(1, "OPENR\"fsh.js\"");
 
 println("Status code: "+com.getStatusCode(1));
 
diff --git a/assets/tbas/basic.js b/assets/tbas/basic.js
index 7a96849..4e88369 100644
--- a/assets/tbas/basic.js
+++ b/assets/tbas/basic.js
@@ -1422,4 +1422,4 @@ while (!tbasexit) {
     }
 }
 
-return 0;
\ No newline at end of file
+0;
\ No newline at end of file
diff --git a/assets/tvdos/command.js b/assets/tvdos/command.js
index fbcb7d1..9a39845 100644
--- a/assets/tvdos/command.js
+++ b/assets/tvdos/command.js
@@ -1,10 +1,10 @@
-var DOS_VERSION = "1.0";
-var PROMPT_TEXT = ">";
-var CURRENT_DRIVE = "A";
+const DOS_VERSION = "1.0";
+const PROMPT_TEXT = ">";
+let CURRENT_DRIVE = "A";
 
-var shell_pwd = [""];
+let shell_pwd = [""];
 
-var welcome_text = "TSVM Disk Operating System, version " + DOS_VERSION;
+const welcome_text = "TSVM Disk Operating System, version " + DOS_VERSION;
 
 function get_prompt_text() {
     return CURRENT_DRIVE + ":\\" + shell_pwd.join("\\") + PROMPT_TEXT;