fixed the use of de in Chi Adv

This commit is contained in:
Aarne Ranta
2018-05-27 10:11:46 +02:00
parent 8ae61cc1a8
commit b3eeee54ce
7 changed files with 42 additions and 36 deletions
+9 -9
View File
@@ -36,16 +36,16 @@ lincat
Month = N ;
Year = NP ;
lin
weekdayPunctualAdv w = lin Adv {s = w.s ; advType = timeAdvType} ;
weekdayHabitualAdv w = lin Adv {s = w.s ; advType = timeAdvType} ;
weekdayNextAdv w = lin Adv {s = "下" ++ w.s ; advType = timeAdvType} ;
weekdayLastAdv w = lin Adv {s = "上" ++ w.s ; advType = timeAdvType} ;
weekdayPunctualAdv w = lin Adv {s = w.s ; advType = timeAdvType ; hasDe = False} ;
weekdayHabitualAdv w = lin Adv {s = w.s ; advType = timeAdvType ; hasDe = False} ;
weekdayNextAdv w = lin Adv {s = "下" ++ w.s ; advType = timeAdvType ; hasDe = False} ;
weekdayLastAdv w = lin Adv {s = "上" ++ w.s ; advType = timeAdvType ; hasDe = False} ;
monthAdv m = lin Adv {s = m.s ; advType = timeAdvType} ;
yearAdv y = lin Adv {s = y.s ++ "年" ; advType = timeAdvType} ;
dayMonthAdv d m = lin Adv {s = m.s ++ d.s ++ "日" ; advType = timeAdvType} ;
monthYearAdv m y = lin Adv {s = y.s ++ "年" ++ m.s ; advType = timeAdvType} ;
dayMonthYearAdv d m y = lin Adv {s = y.s ++ "年" ++ m.s ++ d.s ++ "日" ; advType = timeAdvType} ;
monthAdv m = lin Adv {s = m.s ; advType = timeAdvType ; hasDe = False} ;
yearAdv y = lin Adv {s = y.s ++ "年" ; advType = timeAdvType ; hasDe = False} ;
dayMonthAdv d m = lin Adv {s = m.s ++ d.s ++ "日" ; advType = timeAdvType ; hasDe = False} ;
monthYearAdv m y = lin Adv {s = y.s ++ "年" ++ m.s ; advType = timeAdvType ; hasDe = False} ;
dayMonthYearAdv d m y = lin Adv {s = y.s ++ "年" ++ m.s ++ d.s ++ "日" ; advType = timeAdvType ; hasDe = False} ;
intYear i = lin NP i ;
intMonthday i = lin NP i ;