refactors hadnling of classes and structs

Dnld · Dnld · commit 30d454440a01 · 2015-10-31T11:14:11.000-04:00
diff --git a/transpiler/lexer/lexer.js b/transpiler/lexer/lexer.js
@@ -317,63 +317,17 @@ module.exports = function(code) {
       continue;
     }
     
-    /////////////////////////////////////////////
-    //                                         // 
-    //      classes and structures handling    //
-    //                                         //
-    ///////////////////////////////////////////////////////////////////////////
-
     // handles inheritance operators
     if (tokens.length > 2 && tokens[tokens.length - 2].value === ':' && 
       CLASS_NAMES[lastToken.value] && CLASS_NAMES[tokens[tokens.length - 3].value]) {
       tokens[tokens.length - 2].type = 'INHERITANCE_OPERATOR';      
     }
-    if (insideClass.length && insideClass[insideClass.length - 1].curly === 0 &&
-      chunk === '{') {
-      lexerFunctions.checkFor('CLASS_DEFINITION', chunk, tokens);
-      insideClass[insideClass.length - 1].curly++;
-      advanceAndClear(1);
-      continue;
-    }
-    if (insideClass.length && insideClass[insideClass.length - 1].curly === 1 &&
-      chunk === '}') {
-      lexerFunctions.checkFor('CLASS_DEFINITION', chunk, tokens);
-      insideClass.pop();
-      advanceAndClear(1);
-      lexerFunctions.handleEndOfFile(nextCol, tokens);
-      continue;
-    }
-    if (insideStruct.length && insideStruct[insideStruct.length - 1].curly === 0 &&
-      chunk === '{') {
-      lexerFunctions.checkFor('STRUCT_DEFINITION', chunk, tokens);
-      insideStruct[insideStruct.length - 1].curly++;
-      advanceAndClear(1);
-      continue;
-    }
-    if (insideStruct.length && insideStruct[insideStruct.length - 1].curly === 1 &&
-      chunk === '}') {
-      lexerFunctions.checkFor('STRUCT_DEFINITION', chunk, tokens);
-      insideStruct.pop();
-      advanceAndClear(1);
-      lexerFunctions.handleEndOfFile(nextCol, tokens);
-      continue;
-    }
-    if (tokens.length && (CLASS_NAMES[lastToken.value] || 
-      STRUCT_NAMES[lastToken.value]) && chunk === '(') {
-      lexerFunctions.checkFor('INITIALIZATION', chunk, tokens)
-      var temp = {};
-      temp.status = true;
-      temp.parens = 1;
-      insideInitialization.push(temp);
-      advanceAndClear(1);
-      continue;
-    }
-    if (chunk === ')' && insideInitialization.length && 
-      insideInitialization[insideInitialization.length - 1].parens === 1) {
-      lexerFunctions.checkFor('INITIALIZATION', chunk, tokens);
-      insideInitialization.pop();
+    
+    // handles classes and structs
+    if (lexerFunctions.handleClassOrStruct(insideClass, insideStruct, 
+                        insideInitialization, chunk, tokens, lastToken, 
+                        nextCol, CLASS_NAMES, STRUCT_NAMES)) {
       advanceAndClear(1);
-      lexerFunctions.handleEndOfFile(nextCol, tokens);
       continue;
     }
     
@@ -396,8 +350,6 @@ module.exports = function(code) {
       continue;
     }
     
-    ///////////////////////////////////////////////////////////////////////////
-
     // main evaluation block
     if (!insideString.status && !insideNumber.status &&
       lexerFunctions.checkForEvaluationPoint(currCol, nextCol)) {
diff --git a/transpiler/lexer/lexerFunctions.js b/transpiler/lexer/lexerFunctions.js
@@ -250,7 +250,59 @@ module.exports = {
       return true;
     }
   },
-
+  
+  
+  // handles classes and structures
+  handleClassOrStruct: function(insideClass, insideStruct, insideInitialization,
+                                chunk, tokens, lastToken, nextCol, CLASS_NAMES,
+                                STRUCT_NAMES) {
+    if (insideClass.length && insideClass[insideClass.length - 1].curly === 0 &&
+      chunk === '{') {
+      module.exports.checkFor('CLASS_DEFINITION', chunk, tokens);
+      insideClass[insideClass.length - 1].curly++;
+      return true;
+    }
+    if (insideClass.length && insideClass[insideClass.length - 1].curly === 1 &&
+      chunk === '}') {
+      module.exports.checkFor('CLASS_DEFINITION', chunk, tokens);
+      insideClass.pop();
+      module.exports.handleEndOfFile(nextCol, tokens);
+      return true;
+    }
+    if (insideStruct.length && insideStruct[insideStruct.length - 1].curly === 0 &&
+      chunk === '{') {
+      module.exports.checkFor('STRUCT_DEFINITION', chunk, tokens);
+      insideStruct[insideStruct.length - 1].curly++;
+      return true;
+    }
+    if (insideStruct.length && insideStruct[insideStruct.length - 1].curly === 1 &&
+      chunk === '}') {
+      module.exports.checkFor('STRUCT_DEFINITION', chunk, tokens);
+      insideStruct.pop();
+      module.exports.handleEndOfFile(nextCol, tokens);
+      return true;
+    }
+    if (tokens.length && (CLASS_NAMES[lastToken.value] || 
+      STRUCT_NAMES[lastToken.value]) && chunk === '(') {
+      module.exports.checkFor('INITIALIZATION', chunk, tokens)
+      var temp = {};
+      temp.status = true;
+      temp.parens = 1;
+      insideInitialization.push(temp);
+      return true;
+    }
+    if (chunk === ')' && insideInitialization.length && 
+      insideInitialization[insideInitialization.length - 1].parens === 1) {
+      module.exports.checkFor('INITIALIZATION', chunk, tokens);
+      insideInitialization.pop();
+      module.exports.handleEndOfFile(nextCol, tokens);
+      return true;
+    }
+    
+    return false;
+    
+  },
+  
   checkForTupleStart: function(insideTuple, chunk, tokens, lastToken,
                                currCol, nextCol, nextNextCol, cb) {
     if (!insideTuple.status && currCol === '(' && (lastToken.value === '=' ||
@@ -337,7 +389,6 @@ module.exports = {
         insideStruct.push(temp);
         STRUCT_NAMES[chunk] = true;
       }
-      
       return true;
     }
     return false;
