Merge branch 'Stypox:master' into de-de

Author: sl1txdvd

gradle.properties

@@ -6,10 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx1536m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
-

notes.md

@@ -0,0 +1,36 @@
+Modalità:
+- [x] durata relativa: fra due secondi, in mezz'ora, settimana scorsa, quest'anno (?)
+- [x] giorno/i relativo: giovedì prossimo, fra due lunedì
+- [x] mese relativo: settembre scorso, ad ottobre (non due settembri fa)
+- [x] giorno speciale: domani, l'altro ieri, ieri l'altro, dopo domani pomeriggio, oggi
+- [x] ora: alle 18, le sedici in punto, alle tre (solo num interi 0<=.<=24)
+- [x] ora speciale: mezzanotte, mezzogiorno
+- [x] momento giornata: mattino, di pomeriggio, alla sera, questa notte (anche "prossima notte"?)
+- [x] minuto: cinquantanove, e diciotto minuti
+- [x] minuto speciale: e mezza, un quarto
+- [x] secondo
+- [x] p.m. a.m.
+- [x] giorno settimana: sabato
+- [ ] giorno: 6, il sette (solo num interi 0<=.<=31)
+- [x] nome mese: gennaio, a novembre ...
+- [ ] mese: 12
+- [ ] anno: millenovecento, duemilasedici
+- [x] bc: avanti cristo, dopo cristo, ...
+
+GIORNO? MESE|(mese prossimo|scorso)|(prossimo|scorso mese)? ANNO|(anno prossimo|scorso)|(prossimo|scorso anno)? <ora>? -- nel millenovecentosettantaquattro, il due maggio, a giugno 2021, a novembre dell'anno prossimo
+
+
+ora: alle|all? ORE :? MINUTI? (in punto)? (sera|mattina|am|pm)? (GIORNO_DELLA_SETTIMANA prossimo|scorso?)|(dopo? domani)|(altro? ieri)|(ieri altro) sera|mattina? -- alle diciassette e quarantacinque, alle sei di sera, 6:30 di domani mattina
+ora: mezzanotte|mezzogiorno|... --
+
+
+
+Componenti:
+- anno -> nel 1976, fra due anni, anno prossimo
+- mese -> ad ottobre, in tre mesi, mese scorso
+- settimana -> settimana prossima, due settimane fa
+- giorno -> mercoledì, fra due giorni, ieri
+- momento della giornata -> di mattina, al pomeriggio, sera, notte
+- ora -> alle 18, a mezzogiorno, alle tre in punto, fra due ore
+- minuto -> :45 (dopo ora), e ventisei (dopo ora), due minuti fa, un quarto d'ora prima di
+- secondo -> in un paio di secondi, :19 (dopo minuto), e quattordici (dopo minuto)

…dicio/numbers/NumberParserFormatter.java …a/org/dicio/numbers/ParserFormatter.javanumbers/src/main/java/org/dicio/numbers/NumberParserFormatter.java renamed to numbers/src/main/java/org/dicio/numbers/ParserFormatter.java numbers/src/main/java/org/dicio/numbers/NumberParserFormatter.java renamed to numbers/src/main/java/org/dicio/numbers/ParserFormatter.java

@@ -1,55 +1,57 @@
 package org.dicio.numbers;
 
-import org.dicio.numbers.formatter.NumberFormatter;
+import org.dicio.numbers.formatter.Formatter;
 import org.dicio.numbers.formatter.param.NiceDateParameters;
 import org.dicio.numbers.formatter.param.NiceDateTimeParameters;
 import org.dicio.numbers.formatter.param.NiceDurationParameters;
 import org.dicio.numbers.formatter.param.NiceNumberParameters;
 import org.dicio.numbers.formatter.param.NiceTimeParameters;
 import org.dicio.numbers.formatter.param.NiceYearParameters;
 import org.dicio.numbers.formatter.param.PronounceNumberParameters;
-import org.dicio.numbers.parser.NumberParser;
+import org.dicio.numbers.parser.Parser;
+import org.dicio.numbers.parser.lexer.TokenStream;
+import org.dicio.numbers.parser.param.ExtractDateTimeParams;
 import org.dicio.numbers.parser.param.ExtractDurationParams;
-import org.dicio.numbers.parser.param.ExtractNumbersParams;
-import org.dicio.numbers.util.MixedFraction;
+import org.dicio.numbers.parser.param.ExtractNumberParams;
+import org.dicio.numbers.unit.Duration;
+import org.dicio.numbers.unit.MixedFraction;
 
-import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Locale;
 
 /**
- * A class that wraps a {@link NumberFormatter} and a {@link NumberParser} for a particular language
+ * A class that wraps a {@link Formatter} and a {@link Parser} for a particular language
  * and provides convenience methods to call the available functions without having to provide all of
  * the default parameters.
  */
-public final class NumberParserFormatter {
-    private final NumberFormatter formatter;
-    private final NumberParser parser;
+public final class ParserFormatter {
+    private final Formatter formatter;
+    private final Parser parser;
 
     /**
-     * Constructs a {@link NumberParserFormatter} that wraps the provided {@link NumberFormatter}
-     * and {@link NumberParser}. Note: do not use this manually, prefer
-     * {@link NumberParserFormatter}. This is mostly used for tests.
+     * Constructs a {@link ParserFormatter} that wraps the provided {@link Formatter}
+     * and {@link Parser}. Note: do not use this manually, prefer
+     * {@link ParserFormatter}. This is mostly used for tests.
      *
      * @param formatter the formatter to wrap
      * @param parser the parser to wrap
      */
-    public NumberParserFormatter(final NumberFormatter formatter, final NumberParser parser) {
+    public ParserFormatter(final Formatter formatter, final Parser parser) {
         this.formatter = formatter;
         this.parser = parser;
     }
 
     /**
-     * Constructs a {@link NumberParserFormatter} for the language of the provided locale.
+     * Constructs a {@link ParserFormatter} for the language of the provided locale.
      *
      * @param locale the locale containing the language to use
      * @throws IllegalArgumentException if the provided locale is not supported
      */
-    public NumberParserFormatter(final Locale locale) throws IllegalArgumentException {
-        final NumberParserFormatterBuilder.ParserFormatterPair parserFormatterPair
-                = NumberParserFormatterBuilder.parserFormatterPairForLocale(locale);
+    public ParserFormatter(final Locale locale) throws IllegalArgumentException {
+        final ParserFormatterBuilder.ParserFormatterPair parserFormatterPair
+                = ParserFormatterBuilder.parserFormatterPairForLocale(locale);
         this.formatter = parserFormatterPair.formatter;
         this.parser = parserFormatterPair.parser;
     }
@@ -62,10 +64,10 @@ public NumberParserFormatter(final Locale locale) throws IllegalArgumentExceptio
      *
      * @param number the number to format
      * @return an instance of a utility class that enables customizing various parameters before
-     *         calling {@link NumberFormatter#niceNumber(MixedFraction, boolean)}. See
+     *         calling {@link Formatter#niceNumber(MixedFraction, boolean)}. See
      *         {@link NiceNumberParameters}.
      */
-    public final NiceNumberParameters niceNumber(final double number) {
+    public NiceNumberParameters niceNumber(final double number) {
         return new NiceNumberParameters(formatter, number);
     }
 
@@ -75,10 +77,10 @@ public final NiceNumberParameters niceNumber(final double number) {
      *
      * @param number the number to format
      * @return an instance of a utility class that enables customizing various parameters before
-     *         calling {@link NumberFormatter#pronounceNumber(double, int, boolean, boolean,
+     *         calling {@link Formatter#pronounceNumber(double, int, boolean, boolean,
      *         boolean)}. See {@link PronounceNumberParameters}.
      */
-    public final PronounceNumberParameters pronounceNumber(final double number) {
+    public PronounceNumberParameters pronounceNumber(final double number) {
         return new PronounceNumberParameters(formatter, number);
     }
 
@@ -88,10 +90,10 @@ public final PronounceNumberParameters pronounceNumber(final double number) {
      *
      * @param date the date to format (assumes already in local timezone)
      * @return an instance of a utility class that enables customizing various parameters before
-     *         calling {@link NumberFormatter#niceDate(LocalDate, LocalDate)}. See {@link
+     *         calling {@link Formatter#niceDate(LocalDate, LocalDate)}. See {@link
      *         NiceDateParameters}.
      */
-    public final NiceDateParameters niceDate(final LocalDate date) {
+    public NiceDateParameters niceDate(final LocalDate date) {
         return new NiceDateParameters(formatter, date);
     }
 
@@ -101,9 +103,9 @@ public final NiceDateParameters niceDate(final LocalDate date) {
      *
      * @param date the date containing the year to format (assumes already in local timezone)
      * @return an instance of a utility class that enables customizing various parameters before
-     *         calling {@link NumberFormatter#niceYear(LocalDate)}. See {@link NiceYearParameters}.
+     *         calling {@link Formatter#niceYear(LocalDate)}. See {@link NiceYearParameters}.
      */
-    public final NiceYearParameters niceYear(final LocalDate date) {
+    public NiceYearParameters niceYear(final LocalDate date) {
         // note: useless encapsulation, since niceYear has only the mandatory date parameter, but
         // keep for consistency
         return new NiceYearParameters(formatter, date);
@@ -115,10 +117,10 @@ public final NiceYearParameters niceYear(final LocalDate date) {
      *
      * @param time the time to format (assumes already in local timezone)
      * @return an instance of a utility class that enables customizing various parameters before
-     *         calling {@link NumberFormatter#niceTime(LocalTime, boolean, boolean, boolean)}. See
+     *         calling {@link Formatter#niceTime(LocalTime, boolean, boolean, boolean)}. See
      *         {@link NiceTimeParameters}.
      */
-    public final NiceTimeParameters niceTime(final LocalTime time) {
+    public NiceTimeParameters niceTime(final LocalTime time) {
         return new NiceTimeParameters(formatter, time);
     }
 
@@ -129,10 +131,10 @@ public final NiceTimeParameters niceTime(final LocalTime time) {
      *
      * @param dateTime the date time to format (assumes already in local timezone)
      * @return an instance of a utility class that enables customizing various parameters before
-     *         calling {@link NumberFormatter#niceDateTime(LocalDate, LocalDate, LocalTime, boolean,
+     *         calling {@link Formatter#niceDateTime(LocalDate, LocalDate, LocalTime, boolean,
      *         boolean)}. See {@link NiceDateTimeParameters}.
      */
-    public final NiceDateTimeParameters niceDateTime(final LocalDateTime dateTime) {
+    public NiceDateTimeParameters niceDateTime(final LocalDateTime dateTime) {
         return new NiceDateTimeParameters(formatter, dateTime);
     }
 
@@ -142,10 +144,10 @@ public final NiceDateTimeParameters niceDateTime(final LocalDateTime dateTime) {
      *
      * @param duration the duration to format
      * @return an instance of a utility class that enables customizing various parameters before
-     *         calling {@link NumberFormatter#niceDuration(Duration, boolean)}. See {@link
+     *         calling {@link Formatter#niceDuration(Duration, boolean)}. See {@link
      *         NiceDurationParameters}.
      */
-    public final NiceDurationParameters niceDuration(final Duration duration) {
+    public NiceDurationParameters niceDuration(final Duration duration) {
         return new NiceDurationParameters(formatter, duration);
     }
 
@@ -154,26 +156,37 @@ public final NiceDurationParameters niceDuration(final Duration duration) {
      * parsed as "I am ", 23, " years old".
      *
      * @param utterance the text to extract numbers from
-     * @return an instance of a utility class that enables customizing various parameters before
-     *         calling {@link NumberParser#extractNumbers(String, boolean, boolean)}. See {@link
-     *         ExtractNumbersParams}.
+     * @return an instance of a utility class that enables customizing various parameters and then
+     *         allows calling {@link Parser#extractNumber(TokenStream, boolean, boolean)} in
+     *         multiple ways. See {@link ExtractNumberParams}.
      */
-    public final ExtractNumbersParams extractNumbers(final String utterance) {
-        return new ExtractNumbersParams(parser, utterance);
+    public ExtractNumberParams extractNumber(final String utterance) {
+        return new ExtractNumberParams(parser, utterance);
     }
 
     /**
      * Used to extract a duration from a string. For example, "Set a timer for three minutes and
-     * five seconds" would be parsed as 185 seconds. If the user said multiple durations not next to
-     * one another inside the string, only the first one will be returned. For example, "400 days
-     * are more than one year" would be parsed only as 365 days.
+     * five seconds" would be parsed as "Set a timer for ", 185 seconds.
      *
      * @param utterance the text to extract a duration from
-     * @return an instance of a utility class that enables customizing various parameters before
-     *         calling {@link NumberParser#extractDuration(String, boolean)}. See {@link
-     *         ExtractDurationParams}.
+     * @return an instance of a utility class that enables customizing various parameters and then
+     *         allows calling {@link Parser#extractDuration(TokenStream, boolean)} in multiple
+     *         ways. See {@link ExtractDurationParams}.
      */
-    public final ExtractDurationParams extractDuration(final String utterance) {
+    public ExtractDurationParams extractDuration(final String utterance) {
         return new ExtractDurationParams(parser, utterance);
     }
+
+    /**
+     * Used to extract a date&time from a string. For example, "Set an alarm at five p.m." would be
+     * parsed as "Set an alarm ", today at 5 PM.
+     *
+     * @param utterance the text to extract a date&time from
+     * @return an instance of a utility class that enables customizing various parameters and then
+     *         allows calling {@link Parser#extractDateTime(TokenStream, LocalDateTime)} in
+     *         multiple ways. See {@link ExtractDateTimeParams}.
+     */
+    public ExtractDateTimeParams extractDateTime(final String utterance) {
+        return new ExtractDateTimeParams(parser, utterance);
+    }
 }

…umbers/NumberParserFormatterBuilder.java …icio/numbers/ParserFormatterBuilder.javanumbers/src/main/java/org/dicio/numbers/NumberParserFormatterBuilder.java renamed to numbers/src/main/java/org/dicio/numbers/ParserFormatterBuilder.java numbers/src/main/java/org/dicio/numbers/NumberParserFormatterBuilder.java renamed to numbers/src/main/java/org/dicio/numbers/ParserFormatterBuilder.java

@@ -1,35 +1,35 @@
 package org.dicio.numbers;
 
-import org.dicio.numbers.formatter.NumberFormatter;
+import org.dicio.numbers.formatter.Formatter;
 import org.dicio.numbers.lang.en.EnglishFormatter;
 import org.dicio.numbers.lang.en.EnglishParser;
 import org.dicio.numbers.lang.it.ItalianFormatter;
 import org.dicio.numbers.lang.it.ItalianParser;
-import org.dicio.numbers.parser.NumberParser;
+import org.dicio.numbers.parser.Parser;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-class NumberParserFormatterBuilder {
+class ParserFormatterBuilder {
 
     private static class ParserFormatterClasses {
-        final Class<? extends NumberFormatter> formatter;
-        final Class<? extends NumberParser> parser;
+        final Class<? extends Formatter> formatter;
+        final Class<? extends Parser> parser;
 
-        private ParserFormatterClasses(final Class<? extends NumberFormatter> formatter,
-                                       final Class<? extends NumberParser> parser) {
+        private ParserFormatterClasses(final Class<? extends Formatter> formatter,
+                                       final Class<? extends Parser> parser) {
             this.parser = parser;
             this.formatter = formatter;
         }
     }
 
     static class ParserFormatterPair {
-        final NumberFormatter formatter;
-        final NumberParser parser;
+        final Formatter formatter;
+        final Parser parser;
 
-        ParserFormatterPair(final NumberFormatter formatter, final NumberParser parser) {
+        ParserFormatterPair(final Formatter formatter, final Parser parser) {
             this.parser = parser;
             this.formatter = formatter;
         }
@@ -42,7 +42,7 @@ static class ParserFormatterPair {
     }};
 
 
-    private NumberParserFormatterBuilder() {
+    private ParserFormatterBuilder() {
     }
 
 

…o/numbers/formatter/NumberFormatter.java …g/dicio/numbers/formatter/Formatter.javanumbers/src/main/java/org/dicio/numbers/formatter/NumberFormatter.java renamed to numbers/src/main/java/org/dicio/numbers/formatter/Formatter.java numbers/src/main/java/org/dicio/numbers/formatter/NumberFormatter.java renamed to numbers/src/main/java/org/dicio/numbers/formatter/Formatter.java

@@ -3,21 +3,21 @@
 import org.dicio.numbers.formatter.datetime.DateTimeConfig;
 import org.dicio.numbers.formatter.datetime.FormatString;
 import org.dicio.numbers.formatter.datetime.NiceYearSubstitutionTableBuilder;
-import org.dicio.numbers.util.MixedFraction;
+import org.dicio.numbers.unit.Duration;
+import org.dicio.numbers.unit.MixedFraction;
 import org.dicio.numbers.util.Utils;
 
-import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.Period;
 import java.util.HashMap;
 import java.util.Map;
 
-public abstract class NumberFormatter {
+public abstract class Formatter {
 
     protected final DateTimeConfig config;
 
-    protected NumberFormatter(final String configFolder) {
+    protected Formatter(final String configFolder) {
         config = new DateTimeConfig(configFolder);
     }
 
@@ -185,10 +185,11 @@ public String niceDateTime(final LocalDate date,
      * @return the formatted time span string
      */
     public String niceDuration(final Duration duration, final boolean speech) {
-        final long days = duration.toDays();
-        final long hours = duration.toHours() % 24;
-        final long minutes = duration.toMinutes() % 60;
-        final long seconds = duration.getSeconds() % 60;
+        final java.time.Duration javaDuration = duration.toJavaDuration();
+        final long days = javaDuration.toDays();
+        final long hours = javaDuration.toHours() % 24;
+        final long minutes = javaDuration.toMinutes() % 60;
+        final long seconds = javaDuration.getSeconds() % 60;
 
         final StringBuilder result = new StringBuilder();
         if (speech) {
@@ -217,7 +218,7 @@ public String niceDuration(final Duration duration, final boolean speech) {
             }
 
             // if the duration is zero also write "zero seconds"
-            if (seconds > 0 || duration.getSeconds() == 0) {
+            if (seconds > 0 || javaDuration.getSeconds() == 0) {
                 if (result.length() != 0) {
                     result.append(" ");
                 }