GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-21 02:39:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

improved the performance of Romance while retaining correct agreement ; removed Diff modules from Phrasebook

Browse Source
This commit is contained in:
aarne
2010-04-06 20:35:12 +00:00
parent 40ec2f5229
commit f3ae4092d5
49 changed files with 161 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/src/catalan/DiffCat.gf
View File

@@ -87,23 +87,21 @@ oper
infForm _ _ _ _ = True ;
mkImperative b p vp = {
s = \\pol,agr =>
mkImperative b p vp =
\\pol,g,n =>
let
pe = case b of {True => P3 ; _ => p} ;
---- agr = aag ** {p = pe} ;
aag = verbAgr agr ; ----
agr = {g = g ; n = n ; p = pe} ;
clpr = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ;
----e verb = case <aag.n, pol,pe> of {
----e <Sg,Neg,P2> => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ;
----e _ => (vp.s ! VPImperat).fin ! agr
----e } ;
verb = vp.s.s ! vImperForm agr ; ----e
verb = vp.s.s ! vImper n pe ; ----e
neg = vp.neg ! pol ;
compl = neg.p2 ++ clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol
in
neg.p1 ++ verb ++ bindIf clpr.p3 ++ clpr.p1 ++ compl ;
} ;
negation : Polarity => (Str * Str) = table {
Pos => <[],[]> ;

14
lib/src/catalan/IdiomCat.gf
View File

@@ -4,10 +4,10 @@ concrete IdiomCat of Idiom = CatCat **
flags optimize=all_subs ;
lin
ExistNP np = mkClause [] True (agrP3 Masc Sg)
ExistNP np = mkClause [] True False (agrP3 Masc Sg)
(insertClit3 "hi" (insertComplement (\\_ => (np.s ! Acc).ton) (predV haver_V))) ;
GenericCl vp = mkClause "hom" True (agrP3 Masc Sg) vp ;
ImpersCl vp = mkClause [] True (agrP3 Masc Sg) vp ;
GenericCl vp = mkClause "hom" True False (agrP3 Masc Sg) vp ;
ImpersCl vp = mkClause [] True False (agrP3 Masc Sg) vp ;
ProgrVP vp =
@@ -23,7 +23,7 @@ concrete IdiomCat of Idiom = CatCat **
----AR, for completeness
CleftNP np rs = mkClause [] True (agrP3 Masc Sg)
CleftNP np rs = mkClause [] True False (agrP3 Masc Sg)
(insertComplement (\\_ => rs.s ! Indic ! np.a)
(insertComplement (\\_ => (np.s ! rs.c).ton) (predV copula))) ;
@@ -31,17 +31,17 @@ concrete IdiomCat of Idiom = CatCat **
ExistIP ip = {
s = \\t,a,p,_ =>
ip.s ! Nom ++
(mkClause [] True
(mkClause [] True False
(agrP3 Masc Sg)
(insertClit3 "hi" (insertComplement (\\_ => ip.s ! Acc) (predV haver_V))))
.s ! DDir ! t ! a ! p ! Indic
} ;
ImpPl1 vp = {s =
(mkImperative False P1 vp).s ! Pos ! Ag Masc Pl P1 ; --- fem
mkImperative False P1 vp ! Pos ! Masc ! Pl --- fem
} ;
CleftAdv ad s = mkClause [] True (agrP3 Masc Sg)
CleftAdv ad s = mkClause [] True False (agrP3 Masc Sg)
(insertComplement (\\_ => conjThat ++ s.s ! Indic)
(insertComplement (\\_ => ad.s) (predV copula))) ;

2
lib/src/catalan/MorphoCat.gf
View File

@@ -147,7 +147,7 @@ oper
_ => ses
} ;
a = Ag g n p ;
hasClit = True
hasClit = True ; isPol = False
} ;
elisPoss : Str -> Str = \s ->

2
lib/src/catalan/ParadigmsCat.gf
View File

@@ -316,7 +316,7 @@ oper
}
} ;
makeNP x g n = {s = (pn2np (mk2PN x g)).s; a = agrP3 g n ; hasClit = False} ** {lock_NP = <>} ;
makeNP x g n = {s = (pn2np (mk2PN x g)).s; a = agrP3 g n ; hasClit = False ; isPol = False} ** {lock_NP = <>} ;
mk5A a b c d e =
compADeg {s = \\_ => (mkAdj a b c d e).s ; isPre = False ; lock_A = <>} ;