- Fixed makefile glitches

source/analysis/spstf.js

@@ -155,7 +155,7 @@ SPSTFUseSet.empty = new SPSTFUseSet();
 */
 function SPSTFLiveMap()
 {
-    HashMap.call(this, undefined, undefined, 3);
+    HashMap.call(this, undefined, undefined, 11);
 }
 SPSTFLiveMap.prototype = Object.create(HashMap.prototype);
 
@@ -178,18 +178,6 @@ SPSTFLiveMap.prototype.toString = function ()
     return str;
 }
 
-/**
-Add a use for a given value
-*/
-SPSTFLiveMap.prototype.addLive = function (value, use)
-{
-    var origSet = this.get(value);
-
-    var newSet = origSet.add(use);
-
-    this.set(value, newSet);
-}
-
 /**
 Get the use set for a given value
 */

source/makefile

@@ -49,10 +49,7 @@ JSVMPROG = d8
 JSVMPROG64 = d8_64
 
 #JavaScript VM command options
-JSVMOPTS = --allow_natives_syntax --nocollect_maps
-
-#JavaScript VM command options when debugging
-JSVMOPTSDEBUG = $(JSVMOPTS) --noopt
+JSVMOPTS = --allow_natives_syntax --nocollect_maps --harmony --harmony-collections
 
 #JavaScript VM command
 JSVM = $(JSVMPROG) $(JSVMOPTS)
@@ -201,11 +198,11 @@ ALL_SRCS =                              \
 all: tachyon tachyon64 compiler/sources.js
 
 tachyon: makefile tachyon.in compiler/sources.js
-	sed -e "s:@JSVMPROG@:$(JSVMPROG):g" -e "s:@ROOT_DIR@:$(ROOT_DIR):g" -e "s:@SOURCE_DIR@:$(ROOT_DIR)/source:g" -e "s:@RUN_SRCS@:$(RUN_SRCS):g" tachyon.in > tachyon
+	sed -e "s:@JSVM@:$(JSVM):g" -e "s:@ROOT_DIR@:$(ROOT_DIR):g" -e "s:@SOURCE_DIR@:$(ROOT_DIR)/source:g" -e "s:@RUN_SRCS@:$(RUN_SRCS):g" tachyon.in > tachyon
 	chmod +x tachyon
 
 tachyon64: makefile tachyon.in compiler/sources.js
-	sed -e "s:@JSVMPROG@:$(JSVMPROG64):g" -e "s:@ROOT_DIR@:$(ROOT_DIR):g" -e "s:@SOURCE_DIR@:$(ROOT_DIR)/source:g" -e "s:@RUN_SRCS@:$(RUN_SRCS):g" tachyon.in > tachyon64
+	sed -e "s:@JSVM@:$(JSVM64):g" -e "s:@ROOT_DIR@:$(ROOT_DIR):g" -e "s:@SOURCE_DIR@:$(ROOT_DIR)/source:g" -e "s:@RUN_SRCS@:$(RUN_SRCS):g" tachyon.in > tachyon64
 	chmod +x tachyon64
 
 compiler/sources.js: makefile compiler/sources.js.in

source/tachyon.in

@@ -57,7 +57,7 @@
 
 # Which host VM is to be used.
 
-TACHYON_JSVMPROG="${TACHYON_JSVMPROG:-@JSVMPROG@}"
+TACHYON_JSVM="${TACHYON_JSVM:-@JSVM@}"
 
 # Set the root directory of the Tachyon installation.
 
@@ -72,6 +72,6 @@ TACHYON_RUN_SRCS_ABS=`echo " ${TACHYON_RUN_SRCS}" | sed "s: : ${TACHYON_SOURCE_D
 
 #==============================================================================
 
-rlwrap "${TACHYON_JSVMPROG}" ${TACHYON_RUN_SRCS_ABS} -- "$@"
+rlwrap ${TACHYON_JSVM} ${TACHYON_RUN_SRCS_ABS} -- "$@"
 
 #==============================================================================