From 3aa8a7cbdc35a03ed87f0f1ff2134d2f630267e0 Mon Sep 17 00:00:00 2001 From: Vasyl Khrystiuk Date: Wed, 18 Dec 2024 03:22:59 +0200 Subject: [PATCH] [WIP] --- src/main/java/liqp/filters/date/fuzzy/Part.java | 6 +++--- .../java/liqp/filters/date/fuzzy/PartRecognizer.java | 2 +- .../date/fuzzy/extractors/PartExtractorResult.java | 12 ++++++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/liqp/filters/date/fuzzy/Part.java b/src/main/java/liqp/filters/date/fuzzy/Part.java index c118d4ef..f0c5a87f 100644 --- a/src/main/java/liqp/filters/date/fuzzy/Part.java +++ b/src/main/java/liqp/filters/date/fuzzy/Part.java @@ -102,12 +102,12 @@ public String toString() { class RecognizedPart implements Part { final int start; final int end; - private final String pattern; + private final List patterns; - RecognizedPart(int start, int end, String pattern) { + RecognizedPart(int start, int end, List patterns) { this.start = start; this.end = end; - this.pattern = pattern; + this.patterns = patterns; } @Override diff --git a/src/main/java/liqp/filters/date/fuzzy/PartRecognizer.java b/src/main/java/liqp/filters/date/fuzzy/PartRecognizer.java index 81f9b892..fcf77706 100644 --- a/src/main/java/liqp/filters/date/fuzzy/PartRecognizer.java +++ b/src/main/java/liqp/filters/date/fuzzy/PartRecognizer.java @@ -133,7 +133,7 @@ private LookupResult lookup(List parts, PartExtractor partExtractor) { parts.add(i, after); } - RecognizedPart recognized = new RecognizedPart(part.start() + per.start, part.start() + per.end, per.formatterPattern); + RecognizedPart recognized = new RecognizedPart(part.start() + per.start, part.start() + per.end, per.formatterPatterns); parts.add(i, recognized); if (per.start != 0) { diff --git a/src/main/java/liqp/filters/date/fuzzy/extractors/PartExtractorResult.java b/src/main/java/liqp/filters/date/fuzzy/extractors/PartExtractorResult.java index f65c540a..a6c01aa9 100644 --- a/src/main/java/liqp/filters/date/fuzzy/extractors/PartExtractorResult.java +++ b/src/main/java/liqp/filters/date/fuzzy/extractors/PartExtractorResult.java @@ -1,12 +1,20 @@ package liqp.filters.date.fuzzy.extractors; +import java.util.ArrayList; +import java.util.List; + public class PartExtractorResult { public PartExtractorResult(){} + public PartExtractorResult(List formatterPatterns){ + this.formatterPatterns = formatterPatterns; + } public PartExtractorResult(String formatterPattern){ - this.formatterPattern = formatterPattern; + this.formatterPatterns = new ArrayList<>(); + this.formatterPatterns.add(formatterPattern); } + public boolean found; public int start; public int end; - public String formatterPattern; + public List formatterPatterns; }