mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-22 09:32:53 -06:00
adjusting parameter types in Romance and fixing some compilation bugs
This commit is contained in:
@@ -129,7 +129,8 @@ param
|
||||
|
||||
-- Clitic slots.
|
||||
|
||||
CAgr = CPron {g : Gender ; n : Number ; p : Person} | CRefl | CNone ; --- Agr
|
||||
CAgr = CPron Gender Number Person | CRefl | CNone ; --- Agr
|
||||
--- CAgr = CPron {g : Gender ; n : Number ; p : Person} | CRefl | CNone ; --- Agr
|
||||
|
||||
oper
|
||||
aagr : Gender -> Number -> AAgr = \g,n ->
|
||||
|
||||
@@ -104,12 +104,13 @@ oper
|
||||
vpdat = vp.clDat ;
|
||||
vpagr = vp.agr ;
|
||||
npa = np.a ;
|
||||
cpron = CPron npa.g npa.n npa.p ;
|
||||
noNewClit = <vpacc, vpdat, appCompl c np.s, vpagr> ;
|
||||
|
||||
cc : CAgr * CAgr * Str * VPAgr = case <np.hasClit,c.isDir> of {
|
||||
<True,True> => case c.c of {
|
||||
Acc => <CPron npa, vpdat, [], vpAgrClit npa> ;
|
||||
_ => <vpacc, CPron npa, [], vpagr> -- must be dat
|
||||
Acc => <cpron, vpdat, [], vpAgrClit npa> ;
|
||||
_ => <vpacc, cpron, [], vpagr> -- must be dat
|
||||
} ;
|
||||
_ => noNewClit
|
||||
} ;
|
||||
|
||||
Reference in New Issue
Block a user