aboutsummaryrefslogtreecommitdiff
path: root/src/compiler.js
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-11-09 16:28:02 -0800
committerAlon Zakai <alonzakai@gmail.com>2012-11-09 16:28:02 -0800
commita0979a4bf7db9e53b6ffe26077406b14db8afa06 (patch)
treeaa8890e7d8a893e4746d2c63de0bdccdc0862676 /src/compiler.js
parentadc36358d3efd4efaf09defff7d090ba71ea6003 (diff)
parentd27357b5fea169eb7a61e46e609381083834f704 (diff)
Merge branch 'relooper2' into incoming
Diffstat (limited to 'src/compiler.js')
-rw-r--r--src/compiler.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler.js b/src/compiler.js
index 3220c977..3ce53b1e 100644
--- a/src/compiler.js
+++ b/src/compiler.js
@@ -13,7 +13,7 @@ try {
// *** Environment setup code ***
var arguments_ = [];
-var ENVIRONMENT_IS_NODE = typeof process === 'object';
+var ENVIRONMENT_IS_NODE = typeof process === 'object' && typeof require === 'function';
var ENVIRONMENT_IS_WEB = typeof window === 'object';
var ENVIRONMENT_IS_WORKER = typeof importScripts === 'function';
var ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER;
@@ -194,6 +194,7 @@ load('parseTools.js');
load('intertyper.js');
load('analyzer.js');
load('jsifier.js');
+if (RELOOP) load('relooper.js')
globalEval(processMacros(preprocess(read('runtime.js'))));
Runtime.QUANTUM_SIZE = QUANTUM_SIZE;