Merge branch 'incoming'

1 files changed, 7 insertions, 1 deletions

diff --git a/src/modules.js b/src/modules.js
index 9ef87691..fd0ec35e 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -174,7 +174,10 @@ var PreProcessor = {
 };
 
 var Variables = {
-  globals: {}
+  globals: {},
+  indexedGlobals: {}, // for indexed globals, ident ==> index
+  // Used in calculation of indexed globals
+  nextIndexedOffset: 0
 };
 
 var Types = {
@@ -263,6 +266,7 @@ var Functions = {
 
 var LibraryManager = {
   library: null,
+  loaded: false,
 
   load: function() {
     assert(!this.library);
@@ -271,6 +275,8 @@ var LibraryManager = {
     for (var i = 0; i < libraries.length; i++) {
       eval(processMacros(preprocess(read(libraries[i]))));
     }
+
+    this.loaded = true;
   },
 
   // Given an ident, see if it is an alias for something, and so forth, returning