1 files changed, 20 insertions, 5 deletions
diff --git a/src/intertyper.js b/src/intertyper.js
index 09bdaa33..ac9a365f 100644
--- a/src/intertyper.js
+++ b/src/intertyper.js
@@ -5,6 +5,11 @@
 
 var fastPaths = 0, slowPaths = 0;
 
+var tokenCache = {};
+['=', 'i32', 'label', ';', '4', '0', '1', '2', '255', 'align', 'i8*', 'i8', 'i16', 'getelementptr', 'inbounds', 'unnamed_addr', 'x', 'load', 'preds', 'br', 'i32*', 'i1', 'store', '<label>', 'constant', 'c', 'private', 'null', 'internal', 'to', 'bitcast', 'define', 'nounwind', 'nocapture', '%this', 'call', '...'].forEach(function(text) { tokenCache[text] = { text: text } });
+
+//var tokenCacheMisses = {};
+
 // Line tokenizer
 function tokenizer(item, inner) {
   //assert(item.lineNum != 40000);
@@ -12,7 +17,6 @@ function tokenizer(item, inner) {
   var tokens = [];
   var quotes = 0;
   var lastToken = null;
-  var CHUNKSIZE = 64; // How much forward to peek forward. Too much means too many string segments copied
   // Note: '{' is not an encloser, as its use in functions is split over many lines
   var enclosers = {
     '[': 0,
@@ -31,6 +35,15 @@ function tokenizer(item, inner) {
       return;
     }
 
+    var cached = tokenCache[text];
+    if (cached) {
+      //assert(cached.text === text);
+      tokens.push(cached);
+      lastToken = cached;
+      return;
+    }
+    //tokenCacheMisses[text] = (misses[text] || 0) + 1;
+
     var token = {
       text: text
     };
@@ -42,6 +55,10 @@ function tokenizer(item, inner) {
     }
     // merge certain tokens
     if (lastToken && isType(lastToken.text) && isFunctionDef(token)) {
+      if (lastToken.text in tokenCache) {
+        // create a copy of the cached value
+        lastToken = tokens[tokens.length-1] = { text: lastToken.text };
+      }
       lastToken.text += ' ' + text;
     } else if (lastToken && text[0] == '}') { // }, }*, etc.
       var openBrace = tokens.length-1;
@@ -766,15 +783,13 @@ function intertyper(lines, sidePass, baseLineNums) {
     return item;
   }
   // 'alloca'
-  var allocaPossibleVars = ['allocatedNum'];
   function allocaHandler(item) {
     item.intertype = 'alloca';
     item.allocatedType = item.tokens[1].text;
     if (item.tokens.length > 3 && Runtime.isNumberType(item.tokens[3].text)) {
-      item.allocatedNum = toNiceIdent(item.tokens[4].text);
-      item.possibleVars = allocaPossibleVars;
+      item.ident = toNiceIdent(item.tokens[4].text);
     } else {
-      item.allocatedNum = 1;
+      item.ident = 1;
     }
     item.type = addPointing(item.tokens[1].text); // type of pointer we will get
     Types.needAnalysis[item.type] = 0;