This commit is contained in:
Jeremy Ruston
2013-07-05 22:37:55 +01:00
parent 68a87f368a
commit b51fb9cfa9
15 changed files with 21 additions and 20 deletions

View File

@@ -160,7 +160,7 @@ exports.parseMacroParameter = function(source,pos) {
var node = {
type: "macro-parameter",
start: pos
}
};
// Define our regexp
var reMacroParameter = /(?:([A-Za-z0-9\-_]+)\s*:)?(?:\s*(?:"([^"]*)"|'([^']*)'|\[\[([^\]]*)\]\]|([^\s>"'=]+)))/g;
// Skip whitespace
@@ -197,7 +197,7 @@ exports.parseMacroInvocation = function(source,pos) {
type: "macrocall",
start: pos,
params: []
}
};
// Define our regexps
var reMacroName = /([^\s>"'=]+)/g;
// Skip whitespace