From 9020cb3a0c5c8bd89b594c28b73181b69dd40fe3 Mon Sep 17 00:00:00 2001
From: "Benjamin J. Culkin" <bjculkin@mix.wvu.edu>
Date: Mon, 22 Apr 2019 19:36:12 -0300
Subject: Fix named params.

Fix using named parameters. Previously they just did not work
---
 clformat/data/formats.sprop                                      | 2 +-
 clformat/src/main/java/bjc/utils/ioutils/format/CLTokenizer.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'clformat')

diff --git a/clformat/data/formats.sprop b/clformat/data/formats.sprop
index a32ca2e..ba1e83c 100644
--- a/clformat/data/formats.sprop
+++ b/clformat/data/formats.sprop
@@ -30,7 +30,7 @@ clFormatPrefixParam (?:(?:[-+]?\d+|'.|[Vv]|#|%|".*?(?<!\\)")?)
 ## 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)
+clFormatPrefix (?:(?:#[\S&&[^,:;]]+[:;]%1$s)|%1$s)
 
 ## Match a format string modifier
 ## A modifier is any combination of the following characters
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLTokenizer.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLTokenizer.java
index 64f45c0..8c1857f 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/CLTokenizer.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLTokenizer.java
@@ -24,7 +24,7 @@ public class CLTokenizer implements Iterator<String> {
 	@Override
 	public String next() {
 		String tk = getNext();
-		System.out.printf("\tToken: %s\n", tk);
+		// System.out.printf("\tToken: %s\n", tk);
 
 		return tk;
 	}
-- 
cgit v1.2.3