From 2f96f49c2d2c8679841c790e9dd7d9f1b6f3fed1 Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Sun, 16 Sep 2018 21:12:35 -0300 Subject: Large update A large update, this contains much debugging of the CL FORMAT routines, as well as a few other minor changes. --- base/data/regexes.sprop | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'base/data/regexes.sprop') diff --git a/base/data/regexes.sprop b/base/data/regexes.sprop index 89c5b4f..fed984a 100644 --- a/base/data/regexes.sprop +++ b/base/data/regexes.sprop @@ -44,11 +44,11 @@ fpLeader [\x00-\x20]*[+-]?(?:NaN|Infinity| ## * A single character preceded by a single quote ## * The letter V (or v) ## * The character # -clFormatPrefix (?:[-+]?\d+|'\S|[Vv]|#) +clFormatPrefix (?:(?:[-+]?\d+|'.|[Vv]|#|%)?) ## Match a format string modifier -## A modifier is either : or @, or both in either order -clFormatModifier (?:@|:|@:|:@) +## A modifier is any combination of $, :, * and @; duplicates don't matter though +clFormatModifier (?:[@$:*]+) ## Matches a directive name. ## A directive name is either @@ -58,4 +58,4 @@ clFormatName (?:(?[\S&&[^/]])|(?:/(?[\S&&[^/]]+)/)) ############################################## # Miscellaneous validation regular expressions ############################################## -intLiteral \A[+\-]\d+\Z \ No newline at end of file +intLiteral \A[+\-]\d+\Z -- cgit v1.2.3