Add named parameters

You can now use named prefix parameters in FORMAT strings.

Well, none of the directives support them yet, but they are accepted in
the directives, and it'll be easy enough to add the support

1 files changed, 17 insertions, 2 deletions

diff --git a/clformat/data/formats.sprop b/clformat/data/formats.sprop
index b6eac35..a32ca2e 100644
--- a/clformat/data/formats.sprop
+++ b/clformat/data/formats.sprop
@@ -19,10 +19,25 @@ clFormatDirective ~(?<params>%1$s)?(?<modifiers>%2$s?)(?:%3$s)
 ## * A single character preceded by a single quote
 ## * The letter V (or v)
 ## * The character #
-clFormatPrefix (?:(?:[-+]?\d+|'.|[Vv]|#|%|".*?(?<!\\)")?)
+## * The character %
+## * A double-quoted string
+clFormatPrefixParam (?:(?:[-+]?\d+|'.|[Vv]|#|%|".*?(?<!\\)")?)
+
+## Matches a (possibly named) format string prefix parameter
+## 
+## Parameters are seperated by ','
+## 
+## Named parameters are indicated by a preceeding #, which is followed by a
+## parameter name (any sequence of non-space, non-seperator (',', ':', ';')
+## printing characters), a seperator (: or ;), then the value of the parameter
+clFormatPrefix (?:(?:#[\S&&[^,:;]][:;]%1$s)|%1$s)
 
 ## Match a format string modifier
-## A modifier is any combination of $, :, * and @; duplicates don't matter though
+## A modifier is any combination of the following characters
+##  * '$'	 * ':'
+##  * '*'	 * '@'
+##
+## Duplicates have no effect
 clFormatModifier (?:[@$:*]+)
 
 ## Matches a directive name.