computerscare-vcv-modules

commit 2667d05557061077f47701a69bc2d7c0cd50ad0d
parent bbeb552440816d3af448d37a0a1479d1da83a5fe
Author: Adam M <[email protected]>
Date:   Tue,  1 Jan 2019 16:39:57 -0600

tokenwise at expand for Laundry

Diffstat:
M
src/dtpulse.cpp
 | 
77
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
M
src/dtpulse.hpp
 | 
2
+-

2 files changed, 58 insertions(+), 21 deletions(-)
diff --git a/src/dtpulse.cpp b/src/dtpulse.cpp
@@ -798,10 +798,10 @@ void Parser::ParseAtExpand(Token t, std::vector<std::string> whitelist, bool lau
 		}
 		atNum = ParseAtPart(t);
     if(laundryMode) {
-      
+      proposedTokens = atExpandTokens(tokenVec,atNum);
     }
     else {
-		  proposedTokens = countExpandTokens(tokenVec,atNum); 
+		  proposedTokens = countExpandTokens(tokenVec,atNum);
     }
 		tokenStack.insert(tokenStack.end(),proposedTokens.begin(),proposedTokens.end());
 	}
@@ -833,28 +833,65 @@ void Parser::ParseSquareBrackets(Token t) {
 		}
 	}
 }
-std::vector<Token> Parser::countExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum) {
-  return countExpandTokens(tokenVecVec,atNum,false);
+std::vector<Token> Parser::atExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum) {
+  std::vector<Token> output = {};
+  Token thisToken = Token("error","error");
+  int sum = 0;
+  int thisLength=0;
+  int innerDex = 0;
+  std::string thisVal;
+  for(unsigned int i = 0; i < tokenVecVec.size(); i++) {
+    int sectionSize = (int) tokenVecVec[i].size();
+    innerDex = 0;
+    if(atNum > -1) {
+      while(sum < atNum) {
+        thisToken = tokenVecVec[i][innerDex % sectionSize];
+        if(thisToken.type=="Digit" || thisToken.type=="Letter") {
+          thisLength = b64lookup.find(thisToken.value)+1;
+        }
+        else if(thisToken.type=="Integer" || thisToken.type=="ChanceOfInteger") {
+          thisLength = std::stoi(thisToken.value);
+        }
+
+        if((atNum - sum) < thisLength) {
+          thisLength = (atNum-sum);
+        }
+
+        sum += thisLength;
+        output.push_back(Token(thisToken.type,std::to_string(thisLength)));
+        innerDex++;
+      }
+    }
+    else {
+      output.insert( output.end(), tokenVecVec[i].begin(), tokenVecVec[i].end() );
+    }
+  }
+  return output;
 }
-std::vector<Token> Parser::countExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum, bool laundryMode) {
+std::vector<Token> Parser::countExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum) {
 	std::vector<Token> output;	
   printTokenVector(tokenVecVec);
 	for(unsigned int i=0; i < tokenVecVec.size(); i++) { 
-		int sizeMod = (int) tokenVecVec[i].size();
-		atNum = atNum==-1 ? sizeMod : atNum;
-		if(sizeMod > 0 ) {
-			for(int j = 0; j < atNum; j++) {
-				if(tokenVecVec[i].size()) {
-					output.push_back(tokenVecVec[i][j % sizeMod]);
-				}
-				else { //tokenVecVec[i].size()==0
-					//output.push_back(Token("Zero",""));
-				}
-			}
-		}
-		else { //sizeMod <= 0
-			output.push_back(Token("Zero",""));
-		}
+    if(atNum > -1) {
+  		int sizeMod = (int) tokenVecVec[i].size();
+  		atNum = atNum==-1 ? sizeMod : atNum;
+  		if(sizeMod > 0 ) {
+  			for(int j = 0; j < atNum; j++) {
+  				if(tokenVecVec[i].size()) {
+  					output.push_back(tokenVecVec[i][j % sizeMod]);
+  				}
+  				else { //tokenVecVec[i].size()==0
+  					//output.push_back(Token("Zero",""));
+  				}
+  			}
+  		}
+  		else { //sizeMod <= 0
+  			output.push_back(Token("Zero",""));
+  		}
+    }
+    else {
+      output.insert( output.end(), tokenVecVec[i].begin(), tokenVecVec[i].end() );
+    }
 	}
 	return output;
 }
diff --git a/src/dtpulse.hpp b/src/dtpulse.hpp
@@ -53,8 +53,8 @@ class Parser {
 		std::vector<Token> tokenStack;
 		std::vector<float> exactFloats;
 		std::vector<std::vector<Token>> randomVector;
+		std::vector<Token> atExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum);
 		std::vector<Token> countExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum);
-		std::vector<Token> countExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum, bool laundryMode);
 	private:
 		int currentIndex;
 		void ParseExactValue(Token t);