comments + clean up compiler.js

1 files changed, 16 insertions, 15 deletions

diff --git a/src/compiler.js b/src/compiler.js
index 1cdc0002..92c9a4d9 100644
--- a/src/compiler.js
+++ b/src/compiler.js
@@ -8,20 +8,9 @@ if (!this['read']) {
   read = function(f) { snarf(f) };
 }
 
-load('settings.js');
+// Load settings, can be overridden by commandline
 
-load('utility.js');
-load('framework.js');
-load('parseTools.js');
-load('intertyper.js');
-load('analyzer.js');
-load('jsifier.js');
-
-//===============================
-// Main
-//===============================
-
-// Override settings.js
+load('settings.js');
 
 var settings = JSON.parse(readline());
 for (setting in settings) {
@@ -29,12 +18,25 @@ for (setting in settings) {
 }
 var CONSTANTS = { 'QUANTUM_SIZE': QUANTUM_SIZE };
 
+// Load compiler code
+
+load('utility.js');
+load('framework.js');
+load('parseTools.js');
+load('intertyper.js');
+load('analyzer.js');
+load('jsifier.js');
 load('runtime.js');
+eval(preprocess(read('library.js'), CONSTANTS));
 
-// Sanity of settings
+// Sanity checks
 
 assert(!(USE_TYPED_ARRAYS && SAFE_HEAP));
 
+//===============================
+// Main
+//===============================
+
 // Read llvm
 
 var lines = [];
@@ -47,6 +49,5 @@ do {
 
 // Do it
 
-eval(preprocess(read('library.js'), CONSTANTS));
 print(JSify(analyzer(intertyper(lines))));