thomas/card-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug in template handling

Browse Source
This commit is contained in:
Thomas Lovén 2019-02-27 20:53:45 +01:00
parent a89860815f
commit 2c4271c9f4
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
card-tools.js
View File

@ -230,16 +230,29 @@ class {
str = str.substr(str.indexOf('(')+1); str = str.substr(str.indexOf('(')+1);
while(str) { while(str) {
let index = 0; let index = 0;
let stack = []; let parens = 0;
let quote = false;
while(str[index]) { while(str[index]) {
if(",)".includes(str[index]) && !stack.length) break; let c = str[index++];
if(str[index] == '(') stack.push(')');
if(stack[stack.length - 1] === str[index]) stack.pop(); if(c === quote && index > 1 && str[index-2] !== "\\")
else if(`"'`.includes(str[index])) stack.push(str[index]); quote = false;
index = index + 1; else if(`"'`.includes(c))
quote = c;
if(quote) continue;
if(c === '(')
parens = parens + 1;
else if(c === ')') {
parens = parens - 1;
continue
} }
args.push(str.substr(0, index).trim()); if(parens > 0) continue;
str = str.substr(index+1);
if(",)".includes(c)) break;
}
args.push(str.substr(0, index-1).trim());
str = str.substr(index);
} }
return args; return args;
}; };