mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-21 09:02:50 -06:00
refining SubjPre rules; adding * in chunking
This commit is contained in:
@@ -12,7 +12,7 @@ lin
|
|||||||
OneChunk c = c ;
|
OneChunk c = c ;
|
||||||
PlusChunk c cs = cc2 c cs ;
|
PlusChunk c cs = cc2 c cs ;
|
||||||
|
|
||||||
ChunkPhr c = c ;
|
ChunkPhr c = ss ("*" ++ c.s) | c ;
|
||||||
|
|
||||||
lin
|
lin
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ lin
|
|||||||
OneChunk c = c ;
|
OneChunk c = c ;
|
||||||
PlusChunk c cs = cc2 c cs ;
|
PlusChunk c cs = cc2 c cs ;
|
||||||
|
|
||||||
ChunkPhr c = c ;
|
ChunkPhr c = ss ("*" ++ c.s) | c ;
|
||||||
|
|
||||||
lin
|
lin
|
||||||
|
|
||||||
|
|||||||
@@ -281,4 +281,12 @@ fun
|
|||||||
--< ComplAdv : (a : Arg) -> PrAdv (aNP a) -> NP -> PrAdv a ; -- typically: formation of preposition phrase
|
--< ComplAdv : (a : Arg) -> PrAdv (aNP a) -> NP -> PrAdv a ; -- typically: formation of preposition phrase
|
||||||
ComplAdv_none : PrAdv_np -> NP -> PrAdv_none ;
|
ComplAdv_none : PrAdv_np -> NP -> PrAdv_none ;
|
||||||
|
|
||||||
|
--< SubjUttPreS : Subj -> PrCl aNone -> PrCl aNone -> Utt ;
|
||||||
|
SubjUttPreS : Subj -> PrCl_none -> PrCl_none -> Utt ;
|
||||||
|
--< SubjUttPreQ : Subj -> PrCl aNone -> PrQCl aNone -> Utt ;
|
||||||
|
SubjUttPreQ : Subj -> PrCl_none -> PrQCl_none -> Utt ;
|
||||||
|
--< SubjUttPost : Subj -> PrCl aNone -> Utt -> Utt ;
|
||||||
|
SubjUttPost : Subj -> PrCl_none -> Utt -> Utt ;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -216,4 +216,11 @@ lin
|
|||||||
ComplAdv_none
|
ComplAdv_none
|
||||||
= Pred.ComplAdv Pred.aNone ;
|
= Pred.ComplAdv Pred.aNone ;
|
||||||
|
|
||||||
|
SubjUttPreS
|
||||||
|
= Pred.SubjUttPreS ;
|
||||||
|
SubjUttPreQ
|
||||||
|
= Pred.SubjUttPreQ ;
|
||||||
|
SubjUttPost
|
||||||
|
= Pred.SubjUttPost ;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -12992,7 +12992,8 @@ ConjAdv 9.865361307113396e-4
|
|||||||
PositAdvAdj 3.606964005524602e-2
|
PositAdvAdj 3.606964005524602e-2
|
||||||
PrepNP 0.8085086392378303
|
PrepNP 0.8085086392378303
|
||||||
SubjUttPost 9.395582197250852e-6
|
SubjUttPost 9.395582197250852e-6
|
||||||
SubjUttPre 9.395582197250852e-6
|
SubjUttPreS 5.395582197250852e-6
|
||||||
|
SubjUttPreQ 5.395582197250852e-6
|
||||||
a_fortiori_Adv 9.395582197250852e-6
|
a_fortiori_Adv 9.395582197250852e-6
|
||||||
a_la_carte_Adv 9.395582197250852e-6
|
a_la_carte_Adv 9.395582197250852e-6
|
||||||
a_la_mode_Adv 9.395582197250852e-6
|
a_la_mode_Adv 9.395582197250852e-6
|
||||||
|
|||||||
@@ -115,8 +115,11 @@ fun
|
|||||||
ComplAdv : (a : Arg) -> PrAdv (aNP a) -> NP -> PrAdv a ; -- typically: formation of preposition phrase
|
ComplAdv : (a : Arg) -> PrAdv (aNP a) -> NP -> PrAdv a ; -- typically: formation of preposition phrase
|
||||||
|
|
||||||
-- subjunction ; we want to preserve the order in translation
|
-- subjunction ; we want to preserve the order in translation
|
||||||
|
-- Pre is more specialized to make inverted S order
|
||||||
|
---- Imp to do
|
||||||
|
|
||||||
SubjUttPre : Subj -> PrCl aNone -> Utt -> Utt ;
|
SubjUttPreS : Subj -> PrCl aNone -> PrCl aNone -> Utt ;
|
||||||
|
SubjUttPreQ : Subj -> PrCl aNone -> PrQCl aNone -> Utt ;
|
||||||
SubjUttPost : Subj -> PrCl aNone -> Utt -> Utt ;
|
SubjUttPost : Subj -> PrCl aNone -> Utt -> Utt ;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
incomplete concrete PredFunctor of Pred = Cat [Ant,NP,Utt,IP,IAdv,IComp,Conj,RP,RS,Subj] **
|
incomplete concrete PredFunctor of Pred = Cat [Ant,NP,Utt,IP,IAdv,IComp,Conj,RP,RS,Subj,Imp] **
|
||||||
open
|
open
|
||||||
PredInterface,
|
PredInterface,
|
||||||
ParamX,
|
ParamX,
|
||||||
@@ -363,7 +363,8 @@ lin
|
|||||||
|
|
||||||
ComplAdv x p np = {s = appComplCase p.c1 np ; isAdV = p.isAdV ; c1 = noComplCase} ;
|
ComplAdv x p np = {s = appComplCase p.c1 np ; isAdV = p.isAdV ; c1 = noComplCase} ;
|
||||||
|
|
||||||
SubjUttPre subj cl utt = ss (subj.s ++ declSubordCl cl ++ ("," | []) ++ utt.s) ; ----- inv for S
|
SubjUttPreS subj cl s = ss (subj.s ++ declSubordCl cl ++ ("," | []) ++ declInvCl s) ;
|
||||||
|
SubjUttPreQ subj cl q = ss (subj.s ++ declSubordCl cl ++ ("," | []) ++ questCl q) ;
|
||||||
SubjUttPost subj cl utt = ss (utt.s ++ ("," | []) ++ subj.s ++ declSubordCl cl) ;
|
SubjUttPost subj cl utt = ss (utt.s ++ ("," | []) ++ subj.s ++ declSubordCl cl) ;
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user