mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-09 04:59:31 -06:00
time adverb word order in Chi ; mkDet in MakeStructural Swe
This commit is contained in:
@@ -249,7 +249,7 @@ lose_V2 = mkV2 "丢" ;
|
||||
love_V2 = mkV2 "爱" ;
|
||||
music_N = mkN "音乐" [] ; -- [mark] usually without classifier
|
||||
newspaper_N = mkN "报纸" "张"; --[mark] "报" --> "报纸"
|
||||
now_Adv = mkAdv "现在" ;
|
||||
now_Adv = mkAdv "现在" timeAdvType ;
|
||||
number_N = mkN "号码" ; -- [mark] "号" --> "号码"
|
||||
open_V2 = mkV2 "开" ;
|
||||
paint_V2A = mkV2A (mkV "画") ;
|
||||
@@ -281,7 +281,7 @@ talk_V3 = mkV3 "说" ;
|
||||
teach_V2 = mkV2 "教" ;
|
||||
teacher_N = mkN "老师" "名";
|
||||
television_N = mkN "电视" "台";
|
||||
today_Adv = mkAdv "今天" ;
|
||||
today_Adv = mkAdv "今天" timeAdvType ;
|
||||
train_N = mkN "火车" "辆";
|
||||
travel_V = mkV "旅行" ;
|
||||
understand_V2 = mkV2 "懂" ;
|
||||
|
||||
@@ -175,6 +175,11 @@ oper
|
||||
compl = vp.compl ;
|
||||
prePart = adv.s ++ vp.prePart
|
||||
} ;
|
||||
insertAdvPost : SS -> VP -> VP = \adv,vp -> {
|
||||
verb = vp.verb ;
|
||||
compl = vp.compl ;
|
||||
prePart = vp.prePart ++ adv.s
|
||||
} ;
|
||||
|
||||
insertPP : SS -> VP -> VP = \pp,vp -> {
|
||||
verb = vp.verb ;
|
||||
|
||||
@@ -43,9 +43,10 @@ concrete VerbChi of Verb = CatChi ** open ResChi, Prelude in {
|
||||
(insertObj (mkNP (infVP vp)) (predV v v.part)) ** {c2 = vp.c2 ; isPre = vp.isPre} ;
|
||||
|
||||
AdvVP vp adv = case adv.advType of {
|
||||
ATManner => insertObj (ss (deVAdv_s ++ adv.s)) vp ; -- he sleeps well
|
||||
ATPlace True => insertAdv adv vp ; -- he sleeps on the table (zai - shang)
|
||||
_ => insertAdv (ss (zai_V.s ++ adv.s)) vp -- he sleeps in the house / today
|
||||
ATManner => insertObj (ss (deVAdv_s ++ adv.s)) vp ; -- he sleeps *well*
|
||||
ATPlace True => insertAdvPost adv vp ; -- he today *in the house* sleeps
|
||||
ATPlace False => insertAdvPost (ss (zai_V.s ++ adv.s)) vp ; -- he today *here* sleeps
|
||||
_ => insertAdv adv vp -- he *today* here sleeps
|
||||
} ;
|
||||
|
||||
AdVVP adv vp = insertAdv adv vp ;
|
||||
|
||||
@@ -175,6 +175,11 @@ oper
|
||||
compl = vp.compl ;
|
||||
prePart = adv.s ++ vp.prePart
|
||||
} ;
|
||||
insertAdvPost : SS -> VP -> VP = \adv,vp -> {
|
||||
verb = vp.verb ;
|
||||
compl = vp.compl ;
|
||||
prePart = vp.prePart ++ adv.s
|
||||
} ;
|
||||
|
||||
insertPP : SS -> VP -> VP = \pp,vp -> {
|
||||
verb = vp.verb ;
|
||||
|
||||
@@ -13,6 +13,9 @@ oper
|
||||
[table (P.Gender) [vilken;vilket] ; table (P.Gender) [vilka;vilka]] ;
|
||||
det = d ; lock_IQuant = <>} ;
|
||||
|
||||
mkDet : Str -> P.Number -> Det = \s,n ->
|
||||
lin Det {s,sp = \\_,_ => s ; n = n ; det = DDef Indef} ;
|
||||
|
||||
dDefIndef : DetSpecies = DDef Indef ;
|
||||
---- other DetSpecies
|
||||
|
||||
|
||||
Reference in New Issue
Block a user