Support create variables on the filter line.

This commit is contained in:
ChenL
2017-03-16 18:26:10 +08:00
parent 8231727428
commit 4fc977268f
4 changed files with 11 additions and 2 deletions
+3 -1
View File
@@ -36,7 +36,9 @@ module.exports = function(options) {
var args = [];
while(match = valueRE.exec(argList.trim())){
args.push(match[0]);
var v = match[0];
var re = new RegExp(`${v}\\s*:`, 'g');
re.test(match.input) ? args.push(`'${v}'`) : args.push(v);
}
this.name = name;
+1 -1
View File
@@ -37,7 +37,7 @@ var rangeLine = new RegExp(`^${rangeCapture.source}$`);
var integerLine = new RegExp(`^${integer.source}$`);
// filter related
var valueList = new RegExp(`${value.source}(\\s*,\\s*${value.source})*`);
var valueList = new RegExp(`${value.source}(\\s*,?:?\\s*${value.source})*`);
var filter = new RegExp(`${identifier.source}(?:\\s*:\\s*${valueList.source})?`, 'g');
var filterCapture = new RegExp(`(${identifier.source})(?:\\s*:\\s*(${valueList.source}))?`);
var filterLine = new RegExp(`^${filterCapture.source}$`);