computerscare-vcv-modules

commit 2fbb2248c131089c2bfd6a4cd7e0c0d3fca38a74
parent 424b7b149669f08f8a4ee330cc4c66a5ca5c8bc5
Author: Adam Malone <1319733+freddyz@users.noreply.github.com>
Date:   Fri, 14 Dec 2018 17:15:27 -0600

minor attempt to fix countExpandTokens putting a superfluous Zero at the end

Diffstat:
M
src/dtpulse.cpp
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/dtpulse.cpp b/src/dtpulse.cpp
@@ -683,13 +683,13 @@ void Parser::ParseAtExpand(Token t) {
 					}
 					t=skipAndPeekToken();
 	}
-			
 		insideOfBracketsTokens = countExpandTokens(insideOfBrackets,-1);
   	proposedTokens.insert(proposedTokens.end(),insideOfBracketsTokens.begin(),insideOfBracketsTokens.end());
   	tokenStack.insert(tokenStack.end(),proposedTokens.begin(),proposedTokens.end());
 }
 std::vector<Token> Parser::countExpandTokens(std::vector<std::vector<Token>> tokenVecVec, int atNum) {
 	std::vector<Token> output;	
+	printf("-----countExpand %i\n",atNum);
   printTokenVector(tokenVecVec);
 	for(unsigned int i=0; i < tokenVecVec.size(); i++) { 
 		int sizeMod = (int) tokenVecVec[i].size();
@@ -699,12 +699,12 @@ std::vector<Token> Parser::countExpandTokens(std::vector<std::vector<Token>> tok
 				if(tokenVecVec[i].size()) {
 					output.push_back(tokenVecVec[i][j % sizeMod]);
 				}
-				else {
-					output.push_back(Token("Zero",""));
+				else { //tokenVecVec[i].size()==0
+					//output.push_back(Token("Zero",""));
 				}
 			}
 		}
-		else {
+		else { //sizeMod <= 0
 			output.push_back(Token("Zero",""));
 		}
 	}