From abe96dceeed6b0ffb0a132b15fbbe7942fec7f58 Mon Sep 17 00:00:00 2001 From: Benjamin Culkin Date: Thu, 14 Sep 2017 19:18:21 -0700 Subject: Update directive matching to support function calls. --- BJC-Utils2/src/main/java/bjc/utils/ioutils/CLFormatter.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/ioutils/CLFormatter.java') diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/CLFormatter.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/CLFormatter.java index f9ae49a..f0f0e73 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/CLFormatter.java +++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/CLFormatter.java @@ -31,7 +31,9 @@ public class CLFormatter { private static final String prefixList = applyFormat("delimSeparatedList", prefixParam, ","); - private static final String formatDirective = applyFormat("clFormatDirective", prefixList, formatMod); + private static final String directiveName = getRegex("clFormatName"); + + private static final String formatDirective = applyFormat("clFormatDirective", prefixList, formatMod, directiveName); private static final Pattern pFormatDirective = Pattern.compile(formatDirective); private Map extraDirectives; @@ -53,6 +55,7 @@ public class CLFormatter { dirMatcher.appendReplacement(sb, ""); String dirName = dirMatcher.group("name"); + String dirFunc = dirMatcher.group("funcname"); String dirMods = dirMatcher.group("modifiers"); String dirParams = dirMatcher.group("params"); @@ -65,6 +68,13 @@ public class CLFormatter { colonMod = dirMods.contains(":"); } + if(dirName == null && dirFunc != null) { + /* + * @TODO implement user-called functions. + */ + continue; + } + switch(dirName) { case "C": handleCDirective(sb, tParams.item(), atMod, colonMod); -- cgit v1.2.3