From 186e053697c28c35ecf424096c935daa8c4c36a7 Mon Sep 17 00:00:00 2001 From: Kevin Schaaf Date: Fri, 20 Nov 2015 11:52:57 -0800 Subject: [PATCH] Simplify more. --- src/lib/annotations/annotations.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/annotations/annotations.html b/src/lib/annotations/annotations.html index f661e1cccb..b07ee515a9 100644 --- a/src/lib/annotations/annotations.html +++ b/src/lib/annotations/annotations.html @@ -90,18 +90,18 @@ }, _bindingRegex: (function() { - var IDENT = '(?:' + '[a-zA-Z_$][a-zA-Z0-9_.:$-]*' + '\\s*' + ')'; - var NUMBER = '(?:' + '[-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?' + '\\s*' + ')'; - var SQUOTE_STRING = '(?:' + '\'(?:[^\'\\\\]|\\\\.)*\'' + '\\s*' + ')'; - var DQUOTE_STRING = '(?:' + '"(?:[^"\\\\]|\\\\.)*"' + '\\s*' + ')'; + var IDENT = '(?:' + '[a-zA-Z_$][\\w.:$-]*' + ')'; + var NUMBER = '(?:' + '[-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?' + ')'; + var SQUOTE_STRING = '(?:' + '\'(?:[^\'\\\\]|\\\\.)*\'' + ')'; + var DQUOTE_STRING = '(?:' + '"(?:[^"\\\\]|\\\\.)*"' + ')'; var STRING = '(?:' + SQUOTE_STRING + '|' + DQUOTE_STRING + ')'; - var ARGUMENT = '(?:' + IDENT + '|' + NUMBER + '|' + STRING + ')'; + var ARGUMENT = '(?:' + IDENT + '|' + NUMBER + '|' + STRING + '\\s*' + ')'; var ARGUMENTS = '(?:' + ARGUMENT + '(?:,\\s*' + ARGUMENT + ')*' + ')'; var ARGUMENT_LIST = '(?:' + '\\(\\s*' + '(?:' + ARGUMENTS + '?' + ')' + '\\)\\s*' + ')'; - var BINDING = '(' + IDENT + ARGUMENT_LIST + '?' + ')'; // Group 3 - var OPEN_BRACKET = '(\\[\\[|{{)' + '\\s*'; + var BINDING = '(' + IDENT + '\\s*' + ARGUMENT_LIST + '?' + ')'; // Group 3 + var OPEN_BRACKET = '(\\[\\[|{{)' + '\\s*'; var CLOSE_BRACKET = '(?:]]|}})'; var NEGATE = '(?:(!)\\s*)?'; // Group 2 var EXPRESSION = OPEN_BRACKET + NEGATE + BINDING + CLOSE_BRACKET;