Test changes and migration back to S$

ExpoSEJS · Aug 10, 2018 · 4c825f2 · 4c825f2
1 parent b7f536a
commit 4c825f2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Analyser/src/Analyser.js b/Analyser/src/Analyser.js
@@ -36,7 +36,7 @@ const input = process.argv[process.argv.length - 1];
 Log.logHigh('Built with VERY logging enabled');
 Log.logMid('Built with FINE logging enabled');
 Log.log('Built with BASE logging enabled');
-Log.log('Intial Input' + input);
+Log.log('Intial Input ' + input + '<' + JSON.stringify(input));
 
 process.title = 'ExpoSE Play ' + input;
 

diff --git a/Analyser/src/SymbolicState.js b/Analyser/src/SymbolicState.js
@@ -9,9 +9,8 @@ import Config from './Config';
 import SymbolicHelper from './SymbolicHelper';
 import { SymbolicObject } from './Values/SymbolicObject';
 import { WrappedValue, ConcolicValue } from './Values/WrappedValue';
-
-const Stats = require('Stats');
-const Z3 = require('z3javascript');
+import Z3 from 'z3javascript';
+import Stats from 'Stats';
 
 function BuildUnaryJumpTable(state) {
     const ctx = state.ctx;

diff --git a/Distributor/src/Spawn.js b/Distributor/src/Spawn.js
@@ -143,6 +143,7 @@ class Spawn {
         this._startTime = (new Date()).getTime();
 
 	try {
+        console.log(this.script, JSON.stringify(this.args));
 		const prc = spawn(this.script, this.args, {
 		    env: this.env,
 		    disconnected: false

diff --git a/scripts/play b/scripts/play
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 if [ -z ${DEBUG} ]; then
-	(cd Analyser && node ./node_modules/jalangi2/src/js/commands/jalangi.js --inlineIID --inlineSource --analysis bin/bundle.js "${@:1}")
+	(cd Analyser && node ./node_modules/jalangi2/src/js/commands/jalangi.js --inlineIID --inlineSource --analysis bin/Analyser.js "${@:1}")
 else
-	(cd Analyser && node --inspect --debug-brk ./node_modules/jalangi2/src/js/commands/jalangi.js --inlineIID --inlineSource --analysis bin/bundle.js "${@:1}")
-fi
+	(cd Analyser && node --inspect --debug-brk ./node_modules/jalangi2/src/js/commands/jalangi.js --inlineIID --inlineSource --analysis bin/Analyser.js "${@:1}")
+fi