summaryrefslogtreecommitdiff
path: root/base/data
diff options
context:
space:
mode:
authorBenjamin J. Culkin <bjculkin@mix.wvu.edu>2018-09-16 21:12:35 -0300
committerBenjamin J. Culkin <bjculkin@mix.wvu.edu>2018-09-16 21:12:35 -0300
commit2f96f49c2d2c8679841c790e9dd7d9f1b6f3fed1 (patch)
tree23cfb315743bbb5c1c8fa749e75aba8a54e3a2f7 /base/data
parent92c56c5918a0858aad32cc9ee0fb3eee99ebd007 (diff)
Large update
A large update, this contains much debugging of the CL FORMAT routines, as well as a few other minor changes.
Diffstat (limited to 'base/data')
-rw-r--r--base/data/regexes.sprop8
1 files changed, 4 insertions, 4 deletions
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 (?:(?<name>[\S&&[^/]])|(?:/(?<funcname>[\S&&[^/]]+)/))
##############################################
# Miscellaneous validation regular expressions
##############################################
-intLiteral \A[+\-]\d+\Z \ No newline at end of file
+intLiteral \A[+\-]\d+\Z