增加次日 = 明天

XiaoMi · Jul 12, 2024 · 9d31df3 · 9d31df3
1 parent 788ae5b
commit 9d31df3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/Rules.scala b/duckling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/Rules.scala
@@ -575,23 +575,13 @@ trait Rules extends DimRules {
     }
   )
 
-  val tomorrow = Rule(
-    name = "次日|第二天",
-    pattern = List("次日|第二天".regex),
-    prod = tokens {
-      case Token(RegexMatch, GroupMatch(s :: _)) :: _ =>
-        tt(cycleNthThis(1, Day, Day, Year))
-    }
-  )
-
   def openInterval(td: TimeData, direction: IntervalDirection): Option[Token] = {
     val pred = SequencePredicate(List(td, TimeData(TimeOpenIntervalPredicate(direction), timeGrain = Grain.NoGrain)))
     tt(TimeData(pred, timeGrain = td.timeGrain, hint = Hint.Sequence))
   }
 
   val composite = List(
     ruleRecentTime,
-    tomorrow,
     ruleNthTimeOfTime,
     ruleNthTimeOfTime2,
     ruleIntersect,

diff --git a/...ling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/date/Rules.scala b/...ling-fork-chinese/core/src/main/scala/com/xiaomi/duckling/dimension/time/date/Rules.scala
@@ -28,7 +28,7 @@ import com.xiaomi.duckling.dimension.matcher.{GroupMatch, RegexMatch}
 import com.xiaomi.duckling.dimension.matcher.Prods.{regexMatch, singleRegexMatch}
 import com.xiaomi.duckling.dimension.numeral.Predicates.{getIntValue, isIntegerBetween}
 import com.xiaomi.duckling.dimension.numeral.seq.{DigitSequence, DigitSequenceData}
-import com.xiaomi.duckling.dimension.time.Prods.intersectDOM
+import com.xiaomi.duckling.dimension.time.Prods.{intersectDOM, tt}
 import com.xiaomi.duckling.dimension.time.duration.{isADecade, Duration, DurationData}
 import com.xiaomi.duckling.dimension.time.enums.Grain._
 import com.xiaomi.duckling.dimension.time.enums.Hint.{NoHint, RecentNominal, YearMonth}
@@ -229,6 +229,15 @@ trait Rules extends DimRules {
     }
   )
 
+  val tomorrow = Rule(
+    name = "次日",
+    pattern = List("次日".regex),
+    prod = tokens {
+      case Token(RegexMatch, GroupMatch(s :: _)) :: _ =>
+        tt(cycleNthThis(1, Day, Day, Year))
+    }
+  )
+
   val ruleDecade = Rule(
     name = "date: tens of decade",
     pattern = List(isADecade.predicate, "年代".regex),