Make SICP compact and resolve conflict (#1011)

* make sicp compact

* Fix sicp-prepare.ts

* fix format

Author: hungkhoaitay

scripts/build_sicp_package.sh

@@ -32,47 +32,23 @@ write() {
     echo "\"use strict\";" >> $SICPJSPATH
     echo "Object.defineProperty(exports, \"__esModule\", { value: true });" >> $SICPJSPATH
     echo "const createContext_1 = require(\"./createContext\");" >> $SICPJSPATH
-    echo "createContext_1.default(4);" >> $SICPJSPATH
-    echo "const dict = createContext_1.dict;" >> $SICPJSPATH
+    echo "const dict = createContext_1.default(4).nativeStorage.globals.variables;" >> $SICPJSPATH
 
     cat sicp_publish/prelude.txt >> $SICPJSPATH
 
-    # Write Prelude
-    COUNT=0
 
+    #Write prelude names
     while read -r CURRENT_LINE
     do 
-        IFS=' ' read -r -a array <<< "$CURRENT_LINE"
-
-        if [ "${array[0]}" == "function" ]
-        then
-            if [ $COUNT -le 0 ]
-            then
-                IFS='(' read -r -a name <<< "${array[1]}"
-                echo "global.${name[0]} = ${name[0]};" >> $SICPJSPATH
-            fi
-        fi
-
-        if [ ${#array[@]} != 0 ]
-        then
-            if [ "${array[${#array[@]} - 1]}" == "{" ]
-            then 
-            ((COUNT++))
-            fi
-        fi
-
-        if [ "${array[0]}" == "}" ]
-        then
-            ((COUNT--))
-        fi
-    done < "sicp_publish/prelude.txt"
+        echo "global.$CURRENT_LINE = $CURRENT_LINE;" >> $SICPJSPATH
+    done < "sicp_publish/prelude_names.txt"
 
     #Write Functions
     while read -r CURRENT_LINE
     do 
         if [ "$CURRENT_LINE" != "undefined" -a "$CURRENT_LINE" != "NaN" -a "$CURRENT_LINE" != "Infinity" ]
         then
-            echo "global.$CURRENT_LINE = dict[\"$CURRENT_LINE\"];" >> $SICPJSPATH
+            echo "global.$CURRENT_LINE = dict.get(\"$CURRENT_LINE\").getValue();" >> $SICPJSPATH
         fi
     done < "sicp_publish/names.txt"
 }

sicp_publish/.gitignore

@@ -1,3 +1,4 @@
 names.txt
 prelude.txt
+prelude_names.txt
 package-lock.json

sicp_publish/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sicp",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "license": "Apache-2.0",
   "description": "module to run programs of SICP JS in node.js",
   "keywords": [
@@ -26,10 +26,5 @@
   "types": "dist/sicp",
   "files": [
     "dist"
-  ],
-  "author": {
-    "name": "Source Academy",
-    "url": "https://github.com/source-academy/"
-  },
-  "license": "Apache-2.0"
+  ]
 }

src/createContext.ts

@@ -162,11 +162,7 @@ export const ensureGlobalEnvironmentExist = (context: Context) => {
   }
 }
 
-export const dict = {}
-
 export const defineSymbol = (context: Context, name: string, value: Value) => {
-  dict[name] = value
-
   const globalEnvironment = context.runtime.environments[0]
   Object.defineProperty(globalEnvironment.head, name, {
     value,

src/sicp-prepare.ts

@@ -1,22 +1,26 @@
-import { dict, default as createContext } from './createContext'
+import { default as createContext } from './createContext'
 import * as fs from 'fs'
+import { Program, FunctionDeclaration } from 'estree'
+import { parse } from 'acorn'
 
 const context = createContext(4)
 
-const a = Object.getOwnPropertyNames(dict)
+// Generate names.txt
+const a = context.nativeStorage.builtins.keys()
 
 const names_file = fs.createWriteStream('sicp_publish/names.txt')
 
 names_file.on('error', function (e: Error) {
   console.log(e)
 })
 
-a.forEach(function (v) {
-  names_file.write(v + '\n')
-})
+for (const name of a) {
+  names_file.write(name + '\n')
+}
 
 names_file.end()
 
+// Generate prelude.txt
 const prelude_file = fs.createWriteStream('sicp_publish/prelude.txt')
 
 prelude_file.on('error', function (e: Error) {
@@ -26,3 +30,18 @@ prelude_file.on('error', function (e: Error) {
 prelude_file.write(context.prelude)
 
 prelude_file.end()
+
+// Generate prelude_names.txt
+const b = parse(context.prelude || '', { ecmaVersion: 2020 }) as unknown as Program
+
+const prelude_names = fs.createWriteStream('sicp_publish/prelude_names.txt')
+
+prelude_names.on('error', function (e: Error) {
+  console.log(e)
+})
+
+b.body
+  .map(node => (node as FunctionDeclaration).id?.name)
+  .map(name => prelude_names.write(name + '\n'))
+
+prelude_names.end()