aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorJames Ahlborn <jtahlborn@yahoo.com>2019-01-19 06:03:37 +0000
committerJames Ahlborn <jtahlborn@yahoo.com>2019-01-19 06:03:37 +0000
commit85c0657595d331299da4fe9175bf882746688608 (patch)
treef148807de9be24a375685b200073809e6d0c0301 /src/main
parent4b4a0bbb4fdc75676015a73f68e7a28101416ef4 (diff)
downloadjackcess-85c0657595d331299da4fe9175bf882746688608.tar.gz
jackcess-85c0657595d331299da4fe9175bf882746688608.zip
fix parsing of escaped double quote; implement euro format; implement most custom formatting
git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/branches/jdk8@1265 f203690c-595d-4dc9-a70b-905162fa7fd2
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/healthmarketscience/jackcess/expr/NumericConfig.java8
-rw-r--r--src/main/java/com/healthmarketscience/jackcess/impl/expr/DefaultDateFunctions.java2
-rw-r--r--src/main/java/com/healthmarketscience/jackcess/impl/expr/ExpressionTokenizer.java27
-rw-r--r--src/main/java/com/healthmarketscience/jackcess/impl/expr/FormatUtil.java1096
4 files changed, 1038 insertions, 95 deletions
diff --git a/src/main/java/com/healthmarketscience/jackcess/expr/NumericConfig.java b/src/main/java/com/healthmarketscience/jackcess/expr/NumericConfig.java
index 74dd06e..d231522 100644
--- a/src/main/java/com/healthmarketscience/jackcess/expr/NumericConfig.java
+++ b/src/main/java/com/healthmarketscience/jackcess/expr/NumericConfig.java
@@ -35,7 +35,7 @@ public class NumericConfig
2, true, false, true, 3, Locale.US);
public enum Type {
- CURRENCY, FIXED, STANDARD, PERCENT, SCIENTIFIC;
+ CURRENCY, FIXED, STANDARD, PERCENT, SCIENTIFIC, EURO;
}
private final int _numDecDigits;
@@ -49,6 +49,7 @@ public class NumericConfig
private final String _standardFormat;
private final String _percentFormat;
private final String _scientificFormat;
+ private final String _euroFormat;
public NumericConfig(int numDecDigits, boolean incLeadingDigit,
boolean useNegParens, boolean useNegCurrencyParens,
@@ -75,6 +76,9 @@ public class NumericConfig
_scientificFormat = FormatUtil.createNumberFormatPattern(
FormatUtil.NumPatternType.SCIENTIFIC, _numDecDigits, true,
false, 0);
+ _euroFormat = FormatUtil.createNumberFormatPattern(
+ FormatUtil.NumPatternType.EURO, _numDecDigits, _incLeadingDigit,
+ _useNegCurrencyParens, _numGroupDigits);
}
public int getNumDecimalDigits() {
@@ -109,6 +113,8 @@ public class NumericConfig
return _percentFormat;
case SCIENTIFIC:
return _scientificFormat;
+ case EURO:
+ return _euroFormat;
default:
throw new IllegalArgumentException("unknown number type " + type);
}
diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/expr/DefaultDateFunctions.java b/src/main/java/com/healthmarketscience/jackcess/impl/expr/DefaultDateFunctions.java
index 2ac67d2..31d919b 100644
--- a/src/main/java/com/healthmarketscience/jackcess/impl/expr/DefaultDateFunctions.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/expr/DefaultDateFunctions.java
@@ -505,7 +505,7 @@ public class DefaultDateFunctions
return getOptionalIntParam(ctx, params, idx, 1, 0);
}
- private static WeekFields weekFields(int firstDay, int firstWeekType) {
+ static WeekFields weekFields(int firstDay, int firstWeekType) {
int minDays = 1;
switch(firstWeekType) {
diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/expr/ExpressionTokenizer.java b/src/main/java/com/healthmarketscience/jackcess/impl/expr/ExpressionTokenizer.java
index 4db436a..39f7050 100644
--- a/src/main/java/com/healthmarketscience/jackcess/impl/expr/ExpressionTokenizer.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/expr/ExpressionTokenizer.java
@@ -239,29 +239,34 @@ class ExpressionTokenizer
}
private static String parseQuotedString(ExprBuf buf, char quoteChar) {
- return parseStringUntil(buf, quoteChar, null, true);
+ return parseStringUntil(buf, null, quoteChar, true);
}
private static String parseObjNameString(ExprBuf buf) {
- return parseStringUntil(buf, OBJ_NAME_END_CHAR, OBJ_NAME_START_CHAR, false);
+ return parseStringUntil(buf, OBJ_NAME_START_CHAR, OBJ_NAME_END_CHAR, false);
}
private static String parseDateLiteralString(ExprBuf buf) {
- return parseStringUntil(buf, DATE_LIT_QUOTE_CHAR, null, false);
+ return parseStringUntil(buf, null, DATE_LIT_QUOTE_CHAR, false);
}
- private static String parseStringUntil(ExprBuf buf, char endChar,
- Character startChar,
- boolean allowDoubledEscape)
+ static String parseStringUntil(ExprBuf buf, Character startChar,
+ char endChar, boolean allowDoubledEscape)
{
- StringBuilder sb = buf.getScratchBuffer();
+ return parseStringUntil(buf, startChar, endChar, allowDoubledEscape,
+ buf.getScratchBuffer())
+ .toString();
+ }
+ static StringBuilder parseStringUntil(
+ ExprBuf buf, Character startChar, char endChar, boolean allowDoubledEscape,
+ StringBuilder sb)
+ {
boolean complete = false;
while(buf.hasNext()) {
char c = buf.next();
if(c == endChar) {
if(allowDoubledEscape && (buf.peekNext() == endChar)) {
- sb.append(endChar);
buf.next();
} else {
complete = true;
@@ -281,7 +286,7 @@ class ExpressionTokenizer
"' for quoted string " + buf);
}
- return sb.toString();
+ return sb;
}
private static Token parseDateLiteral(ExprBuf buf)
@@ -451,7 +456,7 @@ class ExpressionTokenizer
return new AbstractMap.SimpleImmutableEntry<K,V>(a, b);
}
- private static final class ExprBuf
+ static final class ExprBuf
{
private final String _str;
private final ParseContext _ctx;
@@ -461,7 +466,7 @@ class ExpressionTokenizer
TemporalConfig.Type.class);
private final StringBuilder _scratch = new StringBuilder();
- private ExprBuf(String str, ParseContext ctx) {
+ ExprBuf(String str, ParseContext ctx) {
_str = str;
_ctx = ctx;
}
diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/expr/FormatUtil.java b/src/main/java/com/healthmarketscience/jackcess/impl/expr/FormatUtil.java
index a21cd88..1cd7b3c 100644
--- a/src/main/java/com/healthmarketscience/jackcess/impl/expr/FormatUtil.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/expr/FormatUtil.java
@@ -17,16 +17,30 @@ limitations under the License.
package com.healthmarketscience.jackcess.impl.expr;
import java.math.BigDecimal;
-import java.text.DecimalFormat;
import java.text.NumberFormat;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalField;
+import java.time.temporal.WeekFields;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.function.BiConsumer;
import com.healthmarketscience.jackcess.expr.EvalContext;
+import com.healthmarketscience.jackcess.expr.EvalException;
import com.healthmarketscience.jackcess.expr.NumericConfig;
import com.healthmarketscience.jackcess.expr.TemporalConfig;
import com.healthmarketscience.jackcess.expr.Value;
+import static com.healthmarketscience.jackcess.impl.expr.ExpressionTokenizer.ExprBuf;
/**
*
@@ -35,10 +49,21 @@ import com.healthmarketscience.jackcess.expr.Value;
public class FormatUtil
{
public enum NumPatternType {
- GENERAL, CURRENCY {
+ GENERAL,
+ CURRENCY {
@Override
protected void appendPrefix(StringBuilder fmt) {
- fmt.append("\u00A4");
+ fmt.append('\u00A4');
+ }
+ @Override
+ protected boolean useParensForNegatives(NumericConfig cfg) {
+ return cfg.useParensForCurrencyNegatives();
+ }
+ },
+ EURO {
+ @Override
+ protected void appendPrefix(StringBuilder fmt) {
+ fmt.append('\u20AC');
}
@Override
protected boolean useParensForNegatives(NumericConfig cfg) {
@@ -48,7 +73,7 @@ public class FormatUtil
PERCENT {
@Override
protected void appendSuffix(StringBuilder fmt) {
- fmt.append("%");
+ fmt.append('%');
}
},
SCIENTIFIC {
@@ -67,10 +92,29 @@ public class FormatUtil
}
}
+ private enum TextCase {
+ NONE,
+ UPPER {
+ @Override public char apply(char c) {
+ return Character.toUpperCase(c);
+ }
+ },
+ LOWER {
+ @Override public char apply(char c) {
+ return Character.toLowerCase(c);
+ }
+ };
+
+ public char apply(char c) {
+ return c;
+ }
+ }
+
private static final Map<String,Fmt> PREDEF_FMTS = new HashMap<String,Fmt>();
static {
- PREDEF_FMTS.put("General Date", new GenPredefDateFmt());
+ PREDEF_FMTS.put("General Date", args -> ValueSupport.toValue(
+ args.coerceToDateTimeValue().getAsString()));
PREDEF_FMTS.put("Long Date",
new PredefDateFmt(TemporalConfig.Type.LONG_DATE));
PREDEF_FMTS.put("Medium Date",
@@ -84,12 +128,11 @@ public class FormatUtil
PREDEF_FMTS.put("Short Time",
new PredefDateFmt(TemporalConfig.Type.SHORT_TIME));
- PREDEF_FMTS.put("General Number", new GenPredefNumberFmt());
+ PREDEF_FMTS.put("General Number", args -> ValueSupport.toValue(
+ args.coerceToNumberValue().getAsString()));
PREDEF_FMTS.put("Currency",
new PredefNumberFmt(NumericConfig.Type.CURRENCY));
- // FIXME ?
- // PREDEF_FMTS.put("Euro",
- // new PredefNumberFmt(???));
+ PREDEF_FMTS.put("Euro", new PredefNumberFmt(NumericConfig.Type.EURO));
PREDEF_FMTS.put("Fixed",
new PredefNumberFmt(NumericConfig.Type.FIXED));
PREDEF_FMTS.put("Standard",
@@ -103,25 +146,703 @@ public class FormatUtil
PREDEF_FMTS.put("On/Off", new PredefBoolFmt("On", "Off"));
}
+ private static final Fmt NULL_FMT = args -> ValueSupport.EMPTY_STR_VAL;
+
+ private static final char QUOTE_CHAR = '"';
+ private static final char ESCAPE_CHAR = '\\';
+ private static final char LEFT_ALIGN_CHAR = '!';
+ private static final char START_COLOR_CHAR = '[';
+ private static final char END_COLOR_CHAR = ']';
+ private static final char CHOICE_SEP_CHAR = ';';
+ // this only seems to be useful if you have fixed length string fields which
+ // isn't a normal thing in ms access
+ private static final char FILL_ESCAPE_CHAR = '*';
+ private static final char REQ_PLACEHOLDER_CHAR = '@';
+ private static final char OPT_PLACEHOLDER_CHAR = '&';
+ private static final char TO_UPPER_CHAR = '>';
+ private static final char TO_LOWER_CHAR = '<';
+ private static final char DT_LIT_COLON_CHAR = ':';
+ private static final char DT_LIT_SLASH_CHAR = '/';
+ private static final int NO_CHAR = -1;
+
+ private static final byte FCT_UNKNOWN = 0;
+ private static final byte FCT_LITERAL = 1;
+ private static final byte FCT_GENERAL = 2;
+ private static final byte FCT_DATE = 3;
+ private static final byte FCT_NUMBER = 4;
+ private static final byte FCT_TEXT = 5;
+
+ private static final byte[] FORMAT_CODE_TYPES = new byte[127];
+ static {
+ setFormatCodeTypes(" $+-()", FCT_LITERAL);
+ setFormatCodeTypes("\"!*\\[];", FCT_GENERAL);
+ setFormatCodeTypes(":/cdwmqyhnstampmAMPM", FCT_DATE);
+ setFormatCodeTypes(".,0#%Ee", FCT_NUMBER);
+ setFormatCodeTypes("@&<>", FCT_TEXT);
+ }
+
+ @FunctionalInterface
+ interface Fmt {
+ public Value format(Args args);
+ }
+
+ @FunctionalInterface
+ interface DateFormatBuilder {
+ public void build(DateTimeFormatterBuilder dtfb, Args args);
+ }
+
+ private static final DateFormatBuilder PARTIAL_PREFIX =
+ (dtfb, args) -> {
+ throw new UnsupportedOperationException();
+ };
+
+ private static final Map<String,DateFormatBuilder> DATE_FMT_BUILDERS =
+ new HashMap<>();
+ static {
+ DATE_FMT_BUILDERS.put("c",
+ (dtfb, args) ->
+ dtfb.append(ValueSupport.getDateFormatForType(
+ args._ctx, args._expr.getType())));
+ DATE_FMT_BUILDERS.put("d", new SimpleDFB("d"));
+ DATE_FMT_BUILDERS.put("dd", new SimpleDFB("dd"));
+ DATE_FMT_BUILDERS.put("ddd", new SimpleDFB("eee"));
+ DATE_FMT_BUILDERS.put("dddd", new SimpleDFB("eeee"));
+ DATE_FMT_BUILDERS.put("ddddd", new PredefDFB(TemporalConfig.Type.SHORT_DATE));
+ DATE_FMT_BUILDERS.put("dddddd", new PredefDFB(TemporalConfig.Type.LONG_DATE));
+ DATE_FMT_BUILDERS.put("w", new WeekBasedDFB() {
+ @Override
+ protected TemporalField getField(WeekFields weekFields) {
+ return weekFields.dayOfWeek();
+ }
+ });
+ DATE_FMT_BUILDERS.put("ww", new WeekBasedDFB() {
+ @Override
+ protected TemporalField getField(WeekFields weekFields) {
+ return weekFields.weekOfWeekBasedYear();
+ }
+ });
+ DATE_FMT_BUILDERS.put("m", new SimpleDFB("M"));
+ DATE_FMT_BUILDERS.put("mm", new SimpleDFB("MM"));
+ DATE_FMT_BUILDERS.put("mmm", new SimpleDFB("LLL"));
+ DATE_FMT_BUILDERS.put("mmmm", new SimpleDFB("LLLL"));
+ DATE_FMT_BUILDERS.put("q", new SimpleDFB("Q"));
+ DATE_FMT_BUILDERS.put("y", new SimpleDFB("D"));
+ DATE_FMT_BUILDERS.put("yy", new SimpleDFB("yy"));
+ DATE_FMT_BUILDERS.put("yyyy", new SimpleDFB("yyyy"));
+ DATE_FMT_BUILDERS.put("h", new SimpleDFB("H"));
+ DATE_FMT_BUILDERS.put("hh", new SimpleDFB("HH"));
+ DATE_FMT_BUILDERS.put("n", new SimpleDFB("m"));
+ DATE_FMT_BUILDERS.put("nn", new SimpleDFB("mm"));
+ DATE_FMT_BUILDERS.put("s", new SimpleDFB("s"));
+ DATE_FMT_BUILDERS.put("ss", new SimpleDFB("ss"));
+ DATE_FMT_BUILDERS.put("ttttt", new PredefDFB(TemporalConfig.Type.LONG_TIME));
+ DATE_FMT_BUILDERS.put("AM/PM", new AmPmDFB("AM", "PM"));
+ DATE_FMT_BUILDERS.put("am/pm", new AmPmDFB("am", "pm"));
+ DATE_FMT_BUILDERS.put("A/P", new AmPmDFB("A", "P"));
+ DATE_FMT_BUILDERS.put("a/p", new AmPmDFB("a", "p"));
+ DATE_FMT_BUILDERS.put("AMPM",
+ (dtfb, args) -> {
+ String[] amPmStrs = args._ctx.getTemporalConfig().getAmPmStrings();
+ new AmPmDFB(amPmStrs[0], amPmStrs[1]).build(dtfb, args);
+ }
+ );
+ fillInPartialPrefixes();
+ }
+
+ private static final int NF_POS_IDX = 0;
+ private static final int NF_NEG_IDX = 1;
+ private static final int NF_ZERO_IDX = 2;
+ private static final int NF_NULL_IDX = 3;
+ private static final int NUM_NF_FMTS = 4;
+
+ private static final class Args
+ {
+ private final EvalContext _ctx;
+ private Value _expr;
+ private final int _firstDay;
+ private final int _firstWeekType;
+
+ private Args(EvalContext ctx, Value expr, int firstDay, int firstWeekType) {
+ _ctx = ctx;
+ _expr = expr;
+ _firstDay = firstDay;
+ _firstWeekType = firstWeekType;
+ }
+
+ public Args coerceToDateTimeValue() {
+ if(!_expr.getType().isTemporal()) {
+
+ // format coerces boolean strings to numbers
+ Value boolExpr = null;
+ if(_expr.getType().isString() &&
+ ((boolExpr = maybeGetStringAsBooleanValue()) != null)) {
+ _expr = boolExpr;
+ }
+
+ // StringValue already handles most String -> Number -> Date/Time, so
+ // most other convertions work here
+ _expr = _expr.getAsDateTimeValue(_ctx);
+ }
+ return this;
+ }
+
+ public Args coerceToNumberValue() {
+ if(!_expr.getType().isNumeric()) {
+ if(_expr.getType().isString()) {
+
+ // format coerces "true"/"false" to boolean values
+ Value boolExpr = maybeGetStringAsBooleanValue();
+
+ if(boolExpr != null) {
+ _expr = boolExpr;
+ } else {
+ BigDecimal bd = DefaultFunctions.maybeGetAsBigDecimal(_ctx, _expr);
+ if(bd != null) {
+ _expr = ValueSupport.toValue(bd);
+ } else {
+ // convert to date to number. this doesn't happen as part of the
+ // default value coercion behavior, but the format method tries
+ // harder
+ Value maybe = DefaultFunctions.maybeGetAsDateTimeValue(
+ _ctx, _expr);
+ if(maybe != null) {
+ _expr = ValueSupport.toValue(maybe.getAsDouble(_ctx));
+ }
+ }
+ }
+ } else {
+ // convert date to number
+ _expr = ValueSupport.toValue(_expr.getAsDouble(_ctx));
+ }
+ }
+ return this;
+ }
+
+ private Value maybeGetStringAsBooleanValue() {
+ // format coerces "true"/"false" to boolean values
+ String val = _expr.getAsString(_ctx);
+ if("true".equalsIgnoreCase(val)) {
+ return ValueSupport.TRUE_VAL;
+ }
+ if("false".equalsIgnoreCase(val)) {
+ return ValueSupport.FALSE_VAL;
+ }
+ return null;
+ }
+
+ public BigDecimal getAsBigDecimal() {
+ coerceToNumberValue();
+ return _expr.getAsBigDecimal(_ctx);
+ }
+
+ public LocalDateTime getAsLocalDateTime() {
+ coerceToDateTimeValue();
+ return _expr.getAsLocalDateTime(_ctx);
+ }
+
+ public String getAsString() {
+ return _expr.getAsString(_ctx);
+ }
+ }
+
private FormatUtil() {}
public static Value format(EvalContext ctx, Value expr, String fmtStr,
int firstDay, int firstWeekType) {
- Fmt predefFmt = PREDEF_FMTS.get(fmtStr);
- if(predefFmt != null) {
- if(expr.isNull()) {
- // predefined formats return null for null
- return ValueSupport.NULL_VAL;
+ try {
+
+ Args args = new Args(ctx, expr, firstDay, firstWeekType);
+
+ Fmt predefFmt = PREDEF_FMTS.get(fmtStr);
+ if(predefFmt != null) {
+ if(expr.isNull()) {
+ // predefined formats return empty string for null
+ return ValueSupport.EMPTY_STR_VAL;
+ }
+ return predefFmt.format(args);
+ }
+
+ return parseCustomFormat(fmtStr, args).format(args);
+
+ } catch(EvalException ee) {
+ // values which cannot be formatted as the target type are just
+ // returned "as is"
+ return expr;
+ }
+ }
+
+ private static Fmt parseCustomFormat(String fmtStr, Args args) {
+
+ ExprBuf buf = new ExprBuf(fmtStr, null);
+
+ // do partial pass to determine what type of format this is
+ byte curFormatType = determineFormatType(buf);
+
+ // reset buffer for real parse
+ buf.reset(0);
+
+ switch(curFormatType) {
+ case FCT_GENERAL:
+ return parseCustomGeneralFormat(buf, args);
+ case FCT_DATE:
+ return parseCustomDateFormat(buf, args);
+ case FCT_NUMBER:
+ return parseCustomNumberFormat(buf, args);
+ case FCT_TEXT:
+ return parseCustomTextFormat(buf, args);
+ default:
+ throw new EvalException("Invalid format type " + curFormatType);
+ }
+ }
+
+ private static byte determineFormatType(ExprBuf buf) {
+
+ while(buf.hasNext()) {
+ char c = buf.next();
+ byte fmtType = getFormatCodeType(c);
+ switch(fmtType) {
+ case FCT_UNKNOWN:
+ case FCT_LITERAL:
+ // meaningless, ignore for now
+ break;
+ case FCT_GENERAL:
+ switch(c) {
+ case QUOTE_CHAR:
+ parseQuotedString(buf);
+ break;
+ case START_COLOR_CHAR:
+ parseColorString(buf);
+ break;
+ case ESCAPE_CHAR:
+ case FILL_ESCAPE_CHAR:
+ if(buf.hasNext()) {
+ buf.next();
+ }
+ break;
+ default:
+ // meaningless, ignore for now
+ }
+ break;
+ case FCT_DATE:
+ case FCT_NUMBER:
+ case FCT_TEXT:
+ // found specific type
+ return fmtType;
+ default:
+ throw new EvalException("Invalid format type " + fmtType);
}
- return predefFmt.format(ctx, expr, null, firstDay, firstWeekType);
}
- // FIXME,
+ // no specific type
+ return FCT_GENERAL;
+ }
+
+ private static Fmt parseCustomGeneralFormat(ExprBuf buf, Args args) {
+
+ // a "general" format is actually a "yes/no" format which functions almost
+ // exactly like a number format (without any number format specific chars)
+ if(!args._expr.isNull()) {
+ args.coerceToNumberValue();
+ }
+
+ StringBuilder sb = new StringBuilder();
+ String[] fmtStrs = new String[NUM_NF_FMTS];
+ int fmtIdx = 0;
+
+ BUF_LOOP:
+ while(buf.hasNext()) {
+ char c = buf.next();
+ int fmtType = getFormatCodeType(c);
+ switch(fmtType) {
+ case FCT_GENERAL:
+ switch(c) {
+ case LEFT_ALIGN_CHAR:
+ // no effect
+ break;
+ case QUOTE_CHAR:
+ parseQuotedString(buf, sb);
+ break;
+ case START_COLOR_CHAR:
+ // color strings seem to be ignored
+ parseColorString(buf);
+ break;
+ case ESCAPE_CHAR:
+ if(buf.hasNext()) {
+ sb.append(buf.next());
+ }
+ break;
+ case FILL_ESCAPE_CHAR:
+ // unclear what this actually does. online examples don't seem to
+ // match with experimental results. for now, ignore
+ if(buf.hasNext()) {
+ buf.next();
+ }
+ break;
+ case CHOICE_SEP_CHAR:
+ // yes/no (number) format supports up to 4 formats: pos, neg, zero,
+ // null. after that, ignore the rest
+ if(fmtIdx == (NUM_NF_FMTS - 1)) {
+ // last possible format, ignore remaining
+ break BUF_LOOP;
+ }
+ addCustomGeneralFormat(fmtStrs, fmtIdx++, sb);
+ break;
+ default:
+ sb.append(c);
+ }
+ break;
+ default:
+ sb.append(c);
+ }
+ }
+
+ // fill in remaining formats
+ while(fmtIdx < NUM_NF_FMTS) {
+ addCustomGeneralFormat(fmtStrs, fmtIdx++, sb);
+ }
+
+ return new CustomNumberFmt(
+ createCustomLiteralFormat(fmtStrs[NF_POS_IDX]),
+ createCustomLiteralFormat(fmtStrs[NF_NEG_IDX]),
+ createCustomLiteralFormat(fmtStrs[NF_ZERO_IDX]),
+ createCustomLiteralFormat(fmtStrs[NF_NULL_IDX]));
+ }
+
+ private static void addCustomGeneralFormat(String[] fmtStrs, int fmtIdx,
+ StringBuilder sb)
+ {
+ if(sb.length() == 0) {
+ // do special empty format handling on a per-format-type basis
+ switch(fmtIdx) {
+ case NF_NEG_IDX:
+ // re-use "pos" format with '-' prepended
+ sb.append('-').append(fmtStrs[NF_POS_IDX]);
+ break;
+ case NF_ZERO_IDX:
+ // re-use "pos" format
+ sb.append(fmtStrs[NF_POS_IDX]);
+ break;
+ default:
+ // use empty string result
+ }
+ }
+
+ fmtStrs[fmtIdx] = sb.toString();
+ sb.setLength(0);
+ }
+
+ private static Fmt createCustomLiteralFormat(String str) {
+ Value literal = ValueSupport.toValue(str);
+ return args -> literal;
+ }
+
+ private static Fmt parseCustomDateFormat(ExprBuf buf, Args args) {
+
+ // custom date formats don't have special null handling
+ if(args._expr.isNull()) {
+ return NULL_FMT;
+ }
+
+ // force to temporal value before proceeding (this will throw if we don't
+ // have a date/time and therefore don't need to proceed with the rest of
+ // the format translation work)
+ args.coerceToDateTimeValue();
+
+ DateTimeFormatterBuilder dtfb = new DateTimeFormatterBuilder();
+
+ BUF_LOOP:
+ while(buf.hasNext()) {
+ char c = buf.next();
+ int fmtType = getFormatCodeType(c);
+ switch(fmtType) {
+ case FCT_GENERAL:
+ switch(c) {
+ case QUOTE_CHAR:
+ dtfb.appendLiteral(parseQuotedString(buf));
+ break;
+ case START_COLOR_CHAR:
+ // color strings seem to be ignored
+ parseColorString(buf);
+ break;
+ case ESCAPE_CHAR:
+ if(buf.hasNext()) {
+ dtfb.appendLiteral(buf.next());
+ }
+ break;
+ case FILL_ESCAPE_CHAR:
+ // unclear what this actually does. online examples don't seem to
+ // match with experimental results. for now, ignore
+ if(buf.hasNext()) {
+ buf.next();
+ }
+ break;
+ case CHOICE_SEP_CHAR:
+ // date/time doesn't use multiple pattern choices, but it does
+ // respect the char. ignore everything after the first choice
+ break BUF_LOOP;
+ default:
+ dtfb.appendLiteral(c);
+ }
+ break;
+ case FCT_DATE:
+ parseCustomDateFormatPattern(c, buf, dtfb, args);
+ break;
+ default:
+ dtfb.appendLiteral(c);
+ }
+ }
+
+ DateTimeFormatter dtf = dtfb.toFormatter(
+ args._ctx.getTemporalConfig().getLocale());
+
+ return argsParam -> ValueSupport.toValue(
+ dtf.format(argsParam.getAsLocalDateTime()));
+ }
+
+ private static Fmt parseCustomNumberFormat(ExprBuf buf, Args args) {
+
+
+ // force to number value before proceeding (this will throw if we don't
+ // have a number and therefore don't need to proceed with the rest of
+ // the format translation work)
+ if(!args._expr.isNull()) {
+ args.coerceToNumberValue();
+ }
+
+ StringBuilder sb = new StringBuilder();
+ String[] fmtStrs = new String[NUM_NF_FMTS];
+ int fmtIdx = 0;
+
+ BUF_LOOP:
+ while(buf.hasNext()) {
+ char c = buf.next();
+ int fmtType = getFormatCodeType(c);
+ switch(fmtType) {
+ case FCT_GENERAL:
+ switch(c) {
+ case LEFT_ALIGN_CHAR:
+ // no effect
+ break;
+ case QUOTE_CHAR:
+ parseQuotedString(buf, sb);
+ break;
+ case START_COLOR_CHAR:
+ // color strings seem to be ignored
+ parseColorString(buf);
+ break;
+ case ESCAPE_CHAR:
+ if(buf.hasNext()) {
+ sb.append(buf.next());
+ }
+ break;
+ case FILL_ESCAPE_CHAR:
+ // unclear what this actually does. online examples don't seem to
+ // match with experimental results. for now, ignore
+ if(buf.hasNext()) {
+ buf.next();
+ }
+ break;
+ case CHOICE_SEP_CHAR:
+ // yes/no (number) format supports up to 4 formats: pos, neg, zero,
+ // null. after that, ignore the rest
+ if(fmtIdx == (NUM_NF_FMTS - 1)) {
+ // last possible format, ignore remaining
+ break BUF_LOOP;
+ }
+ addCustomGeneralFormat(fmtStrs, fmtIdx++, sb);
+ break;
+ default:
+ sb.append(c);
+ }
+ break;
+ default:
+ sb.append(c);
+ }
+ }
+
+ // fill in remaining formats
+ while(fmtIdx < NUM_NF_FMTS) {
+ addCustomGeneralFormat(fmtStrs, fmtIdx++, sb);
+ }
+
+ // FIXME writeme
throw new UnsupportedOperationException();
}
+ private static Fmt parseCustomTextFormat(ExprBuf buf, Args args) {
+
+ Fmt fmt = null;
+ Fmt emptyFmt = null;
+
+ List<BiConsumer<StringBuilder,CharSource>> subFmts = new ArrayList<>();
+ int numPlaceholders = 0;
+ boolean rightAligned = true;
+ TextCase textCase = TextCase.NONE;
+ StringBuilder pendingLiteral = new StringBuilder();
+ boolean hasFmtChars = false;
+
+ BUF_LOOP:
+ while(buf.hasNext()) {
+ char c = buf.next();
+ hasFmtChars = true;
+ int fmtType = getFormatCodeType(c);
+ switch(fmtType) {
+ case FCT_GENERAL:
+ switch(c) {
+ case LEFT_ALIGN_CHAR:
+ rightAligned = false;
+ break;
+ case QUOTE_CHAR:
+ parseQuotedString(buf, pendingLiteral);
+ break;
+ case START_COLOR_CHAR:
+ // color strings seem to be ignored
+ parseColorString(buf);
+ break;
+ case ESCAPE_CHAR:
+ if(buf.hasNext()) {
+ pendingLiteral.append(buf.next());
+ }
+ break;
+ case FILL_ESCAPE_CHAR:
+ // unclear what this actually does. online examples don't seem to
+ // match with experimental results. for now, ignore
+ if(buf.hasNext()) {
+ buf.next();
+ }
+ break;
+ case CHOICE_SEP_CHAR:
+ // text format supports up to 2 formats: normal and empty/null.
+ // after that, ignore the rest
+ if(fmt != null) {
+ // ignore remaining format
+ break BUF_LOOP;
+ }
+ flushPendingTextLiteral(pendingLiteral, subFmts);
+ fmt = new CharSourceFmt(subFmts, numPlaceholders, rightAligned,
+ textCase);
+ // reset for next format
+ subFmts = new ArrayList<>();
+ numPlaceholders = 0;
+ rightAligned = true;
+ textCase = TextCase.NONE;
+ hasFmtChars = false;
+ break;
+ default:
+ pendingLiteral.append(c);
+ }
+ break;
+ case FCT_TEXT:
+ switch(c) {
+ case REQ_PLACEHOLDER_CHAR:
+ flushPendingTextLiteral(pendingLiteral, subFmts);
+ ++numPlaceholders;
+ subFmts.add((sb,cs) -> {
+ int tmp = cs.next();
+ sb.append((tmp != NO_CHAR) ? (char)tmp : ' ');
+ });
+ break;
+ case OPT_PLACEHOLDER_CHAR:
+ flushPendingTextLiteral(pendingLiteral, subFmts);
+ ++numPlaceholders;
+ subFmts.add((sb,cs) -> {
+ int tmp = cs.next();
+ if(tmp != NO_CHAR) {
+ sb.append((char)tmp);
+ }
+ });
+ break;
+ case TO_UPPER_CHAR:
+ // an uppper and lower symbol cancel each other out
+ textCase = ((textCase == TextCase.LOWER) ?
+ TextCase.NONE : TextCase.UPPER);
+ break;
+ case TO_LOWER_CHAR:
+ // an uppper and lower symbol cancel each other out
+ textCase = ((textCase == TextCase.UPPER) ?
+ TextCase.NONE : TextCase.LOWER);
+ break;
+ default:
+ pendingLiteral.append(c);
+ }
+ break;
+ default:
+ pendingLiteral.append(c);
+ }
+ }
+
+ flushPendingTextLiteral(pendingLiteral, subFmts);
+
+ if(fmt == null) {
+ fmt = new CharSourceFmt(subFmts, numPlaceholders, rightAligned,
+ textCase);
+ emptyFmt = NULL_FMT;
+ } else if(emptyFmt == null) {
+ emptyFmt = (hasFmtChars ?
+ new CharSourceFmt(subFmts, numPlaceholders, rightAligned,
+ textCase) :
+ NULL_FMT);
+ }
+
+ return new CustomTextFmt(fmt, emptyFmt);
+ }
+
+ private static void flushPendingTextLiteral(
+ StringBuilder pendingLiteral,
+ List<BiConsumer<StringBuilder,CharSource>> subFmts) {
+ if(pendingLiteral.length() == 0) {
+ return;
+ }
+
+ String literal = pendingLiteral.toString();
+ pendingLiteral.setLength(0);
+ subFmts.add((sb, cs) -> sb.append(literal));
+ }
+
+ private static void parseCustomDateFormatPattern(
+ char c, ExprBuf buf, DateTimeFormatterBuilder dtfb, Args args) {
+
+ if((c == DT_LIT_COLON_CHAR) || (c == DT_LIT_SLASH_CHAR)) {
+ // date/time literal char, nothing more to do
+ dtfb.appendLiteral(c);
+ return;
+ }
+
+ StringBuilder sb = buf.getScratchBuffer();
+ sb.append(c);
+
+ char firstChar = c;
+ int firstPos = buf.curPos();
+
+ DateFormatBuilder bestMatch = DATE_FMT_BUILDERS.get(sb.toString());
+ int bestPos = firstPos;
+ while(buf.hasNext()) {
+ sb.append(buf.next());
+ DateFormatBuilder dfb = DATE_FMT_BUILDERS.get(sb.toString());
+ if(dfb == null) {
+ // no more possible matches
+ break;
+ }
+ if(dfb != PARTIAL_PREFIX) {
+ // this is the longest, valid pattern we have seen so far
+ bestMatch = dfb;
+ bestPos = buf.curPos();
+ }
+ }
+
+ if(bestMatch != PARTIAL_PREFIX) {
+ // apply valid pattern
+ buf.reset(bestPos);
+ bestMatch.build(dtfb, args);
+ } else {
+ // just consume the first char
+ buf.reset(firstPos);
+ dtfb.appendLiteral(firstChar);
+ }
+ }
+
public static String createNumberFormatPattern(
NumPatternType numPatType, int numDecDigits, boolean incLeadDigit,
boolean negParens, int numGroupDigits) {
@@ -153,16 +874,45 @@ public class FormatUtil
return fmt.toString();
}
+ private static byte getFormatCodeType(char c) {
+ if((c >= 0) && (c < 127)) {
+ return FORMAT_CODE_TYPES[c];
+ }
+ return FCT_UNKNOWN;
+ }
+
+ private static void setFormatCodeTypes(String chars, byte type) {
+ for(char c : chars.toCharArray()) {
+ FORMAT_CODE_TYPES[c] = type;
+ }
+ }
- private static abstract class Fmt
- {
- // FIXME, no null
- // FIXME, need fmtStr?
- public abstract Value format(EvalContext ctx, Value expr, String fmtStr,
- int firstDay, int firstWeekType);
+ private static String parseQuotedString(ExprBuf buf) {
+ return ExpressionTokenizer.parseStringUntil(buf, null, QUOTE_CHAR, true);
+ }
+
+ private static void parseQuotedString(ExprBuf buf, StringBuilder sb) {
+ ExpressionTokenizer.parseStringUntil(buf, null, QUOTE_CHAR, true, sb);
+ }
+
+ private static String parseColorString(ExprBuf buf) {
+ return ExpressionTokenizer.parseStringUntil(
+ buf, END_COLOR_CHAR, START_COLOR_CHAR, false);
}
- private static class PredefDateFmt extends Fmt
+ private static void fillInPartialPrefixes() {
+ List<String> validPrefixes = new ArrayList<>(DATE_FMT_BUILDERS.keySet());
+ for(String validPrefix : validPrefixes) {
+ int len = validPrefix.length();
+ while(len > 1) {
+ --len;
+ validPrefix = validPrefix.substring(0, len);
+ DATE_FMT_BUILDERS.putIfAbsent(validPrefix, PARTIAL_PREFIX);
+ }
+ }
+ }
+
+ private static final class PredefDateFmt implements Fmt
{
private final TemporalConfig.Type _type;
@@ -171,31 +921,14 @@ public class FormatUtil
}
@Override
- public Value format(EvalContext ctx, Value expr, String fmtStr,
- int firstDay, int firstWeekType) {
- DateTimeFormatter dtf = ctx.createDateFormatter(
- ctx.getTemporalConfig().getDateTimeFormat(_type));
- return ValueSupport.toValue(dtf.format(expr.getAsLocalDateTime(ctx)));
- }
- }
-
- private static class GenPredefDateFmt extends Fmt
- {
- @Override
- public Value format(EvalContext ctx, Value expr, String fmtStr,
- int firstDay, int firstWeekType) {
- Value tempExpr = expr;
- if(!expr.getType().isTemporal()) {
- Value maybe = DefaultFunctions.maybeGetAsDateTimeValue(ctx, expr);
- if(maybe != null) {
- tempExpr = maybe;
- }
- }
- return ValueSupport.toValue(tempExpr.getAsString(ctx));
+ public Value format(Args args) {
+ DateTimeFormatter dtf = args._ctx.createDateFormatter(
+ args._ctx.getTemporalConfig().getDateTimeFormat(_type));
+ return ValueSupport.toValue(dtf.format(args.getAsLocalDateTime()));
}
}
- private static class PredefBoolFmt extends Fmt
+ private static final class PredefBoolFmt implements Fmt
{
private final Value _trueVal;
private final Value _falseVal;
@@ -206,13 +939,23 @@ public class FormatUtil
}
@Override
- public Value format(EvalContext ctx, Value expr, String fmtStr,
- int firstDay, int firstWeekType) {
- return(expr.getAsBoolean(ctx) ? _trueVal : _falseVal);
+ public Value format(Args args) {
+ return(args._expr.getAsBoolean(args._ctx) ? _trueVal : _falseVal);
}
}
- private static class PredefNumberFmt extends Fmt
+ private static abstract class BaseNumberFmt implements Fmt
+ {
+ @Override
+ public Value format(Args args) {
+ NumberFormat df = getNumberFormat(args);
+ return ValueSupport.toValue(df.format(args.getAsBigDecimal()));
+ }
+
+ protected abstract NumberFormat getNumberFormat(Args args);
+ }
+
+ private static final class PredefNumberFmt extends BaseNumberFmt
{
private final NumericConfig.Type _type;
@@ -221,51 +964,240 @@ public class FormatUtil
}
@Override
- public Value format(EvalContext ctx, Value expr, String fmtStr,
- int firstDay, int firstWeekType) {
- DecimalFormat df = ctx.createDecimalFormat(
- ctx.getNumericConfig().getNumberFormat(_type));
- return ValueSupport.toValue(df.format(expr.getAsBigDecimal(ctx)));
+ protected NumberFormat getNumberFormat(Args args) {
+ return args._ctx.createDecimalFormat(
+ args._ctx.getNumericConfig().getNumberFormat(_type));
}
}
- private static class GenPredefNumberFmt extends Fmt
+ private static final class ScientificPredefNumberFmt extends BaseNumberFmt
{
@Override
- public Value format(EvalContext ctx, Value expr, String fmtStr,
- int firstDay, int firstWeekType) {
- Value numExpr = expr;
- if(!expr.getType().isNumeric()) {
- if(expr.getType().isString()) {
- BigDecimal bd = DefaultFunctions.maybeGetAsBigDecimal(ctx, expr);
- if(bd != null) {
- numExpr = ValueSupport.toValue(bd);
- } else {
- // convert to date to number
- Value maybe = DefaultFunctions.maybeGetAsDateTimeValue(ctx, expr);
- if(maybe != null) {
- numExpr = ValueSupport.toValue(maybe.getAsDouble(ctx));
- }
- }
- } else {
- // convert date to number
- numExpr = ValueSupport.toValue(expr.getAsDouble(ctx));
+ protected NumberFormat getNumberFormat(Args args) {
+ NumberFormat df = args._ctx.createDecimalFormat(
+ args._ctx.getNumericConfig().getNumberFormat(
+ NumericConfig.Type.SCIENTIFIC));
+ df = new NumberFormatter.ScientificFormat(df);
+ return df;
+ }
+ }
+
+ private static final class NumberFmt extends BaseNumberFmt
+ {
+ private final NumberFormat _df;
+
+ private NumberFmt(NumberFormat df) {
+ _df = df;
+ }
+
+ @Override
+ protected NumberFormat getNumberFormat(Args args) {
+ return _df;
+ }
+ }
+
+ private static final class SimpleDFB implements DateFormatBuilder
+ {
+ private final String _pat;
+
+ private SimpleDFB(String pat) {
+ _pat = pat;
+ }
+ @Override
+ public void build(DateTimeFormatterBuilder dtfb, Args args) {
+ dtfb.appendPattern(_pat);
+ }
+ }
+
+ private static final class PredefDFB implements DateFormatBuilder
+ {
+ private final TemporalConfig.Type _type;
+
+ private PredefDFB(TemporalConfig.Type type) {
+ _type = type;
+ }
+ @Override
+ public void build(DateTimeFormatterBuilder dtfb, Args args) {
+ dtfb.appendPattern(args._ctx.getTemporalConfig().getDateTimeFormat(_type));
+ }
+ }
+
+ private static abstract class WeekBasedDFB implements DateFormatBuilder
+ {
+ @Override
+ public void build(DateTimeFormatterBuilder dtfb, Args args) {
+ dtfb.appendValue(getField(DefaultDateFunctions.weekFields(
+ args._firstDay, args._firstWeekType)));
+ }
+
+ protected abstract TemporalField getField(WeekFields weekFields);
+ }
+
+ private static final class AmPmDFB extends AbstractMap<Long,String>
+ implements DateFormatBuilder
+ {
+ private static final Long ZERO_KEY = 0L;
+ private final String _am;
+ private final String _pm;
+
+ private AmPmDFB(String am, String pm) {
+ _am = am;
+ _pm = pm;
+ }
+ @Override
+ public void build(DateTimeFormatterBuilder dtfb, Args args) {
+ dtfb.appendText(ChronoField.AMPM_OF_DAY, this);
+ }
+ @Override
+ public int size() {
+ return 2;
+ }
+ @Override
+ public String get(Object key) {
+ return(ZERO_KEY.equals(key) ? _am : _pm);
+ }
+ @Override
+ public Set<Map.Entry<Long,String>> entrySet() {
+ return new AbstractSet<Map.Entry<Long,String>>() {
+ @Override
+ public int size() {
+ return 2;
}
+ @Override
+ public Iterator<Map.Entry<Long,String>> iterator() {
+ return Arrays.<Map.Entry<Long,String>>asList(
+ new AbstractMap.SimpleImmutableEntry<Long,String>(0L, _am),
+ new AbstractMap.SimpleImmutableEntry<Long,String>(1L, _pm))
+ .iterator();
+ }
+ };
+ }
+ }
+
+ private static final class CustomTextFmt implements Fmt
+ {
+ private final Fmt _fmt;
+ private final Fmt _emptyFmt;
+
+ private CustomTextFmt(Fmt fmt, Fmt emptyFmt) {
+ _fmt = fmt;
+ _emptyFmt = emptyFmt;
+ }
+
+ private static boolean isEmptyString(Args args) {
+ // only a string value could ever be an empty string
+ return (args._expr.getType().isString() && args.getAsString().isEmpty());
+ }
+
+ @Override
+ public Value format(Args args) {
+ Fmt fmt = _fmt;
+ if(args._expr.isNull() || isEmptyString(args)) {
+ fmt = _emptyFmt;
+ // ensure that we have a non-null value when formatting (null acts
+ // like empty string in this case)
+ args._expr = ValueSupport.EMPTY_STR_VAL;
}
- return ValueSupport.toValue(numExpr.getAsString(ctx));
+ return fmt.format(args);
}
}
- private static class ScientificPredefNumberFmt extends Fmt
+ private static final class CharSourceFmt implements Fmt
{
+ private final List<BiConsumer<StringBuilder,CharSource>> _subFmts;
+ private final int _numPlaceholders;
+ private final boolean _rightAligned;
+ private final TextCase _textCase;
+
+ private CharSourceFmt(List<BiConsumer<StringBuilder,CharSource>> subFmts,
+ int numPlaceholders, boolean rightAligned, TextCase textCase) {
+ _subFmts = subFmts;
+ _numPlaceholders = numPlaceholders;
+ _rightAligned = rightAligned;
+ _textCase = textCase;
+ }
+
@Override
- public Value format(EvalContext ctx, Value expr, String fmtStr,
- int firstDay, int firstWeekType) {
- NumberFormat df = ctx.createDecimalFormat(
- ctx.getNumericConfig().getNumberFormat(
- NumericConfig.Type.SCIENTIFIC));
- df = new NumberFormatter.ScientificFormat(df);
- return ValueSupport.toValue(df.format(expr.getAsBigDecimal(ctx)));
+ public Value format(Args args) {
+ CharSource cs = new CharSource(args.getAsString(), _numPlaceholders, _rightAligned,
+ _textCase);
+ StringBuilder sb = new StringBuilder();
+ _subFmts.stream().forEach(fmt -> fmt.accept(sb, cs));
+ cs.appendRemaining(sb);
+ return ValueSupport.toValue(sb.toString());
+ }
+ }
+
+ private static final class CharSource
+ {
+ private int _prefLen;
+ private final String _str;
+ private int _strPos;
+ private final TextCase _textCase;
+
+ private CharSource(String str, int len, boolean rightAligned,
+ TextCase textCase) {
+ _str = str;
+ _textCase = textCase;
+ int strLen = str.length();
+ if(len > strLen) {
+ if(rightAligned) {
+ _prefLen = len - strLen;
+ }
+ } else if(len < strLen) {
+ // it doesn't make sense to me, but the meaning of "right aligned"
+ // seems to flip when the string is longer than the format length
+ if(!rightAligned) {
+ _strPos = strLen - len;
+ }
+ }
+ }
+
+ public int next() {
+ if(_prefLen > 0) {
+ --_prefLen;
+ return NO_CHAR;
+ }
+ if(_strPos < _str.length()) {
+ return _textCase.apply(_str.charAt(_strPos++));
+ }
+ return NO_CHAR;
+ }
+
+ public void appendRemaining(StringBuilder sb) {
+ int strLen = _str.length();
+ while(_strPos < strLen) {
+ sb.append(_textCase.apply(_str.charAt(_strPos++)));
+ }
+ }
+ }
+
+ private static final class CustomNumberFmt implements Fmt
+ {
+ private final Fmt _posFmt;
+ private final Fmt _negFmt;
+ private final Fmt _zeroFmt;
+ private final Fmt _nullFmt;
+
+ private CustomNumberFmt(Fmt posFmt, Fmt negFmt, Fmt zeroFmt, Fmt nullFmt) {
+ _posFmt = posFmt;
+ _negFmt = negFmt;
+ _zeroFmt = zeroFmt;
+ _nullFmt = nullFmt;
+ }
+
+ @Override
+ public Value format(Args args) {
+ if(args._expr.isNull()) {
+ return _nullFmt.format(args);
+ }
+ BigDecimal bd = args.getAsBigDecimal();
+ int cmp = BigDecimal.ZERO.compareTo(bd);
+ Fmt fmt = ((cmp < 0) ? _posFmt :
+ ((cmp > 0) ? _negFmt : _zeroFmt));
+ return fmt.format(args);
}
}
+
+
}