GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

brought derived resources up to date wrt Quant

Browse Source
This commit is contained in:
aarne
2007-12-18 10:46:41 +00:00
parent f85ead01b3
commit 90a84d1dcd
14 changed files with 78 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/resource/api/toplevel/OverGrammar.gf
View File

@@ -52,10 +52,12 @@ fun ovrld48_mkNP : Det -> CN -> NP ;
fun ovrld49_mkNP : Det -> N -> NP ;
fun ovrld50_mkNP : Num -> CN -> NP ;
fun ovrld51_mkNP : Num -> N -> NP ;
fun ovrld52_mkNP : QuantSg -> CN -> NP ;
fun ovrld53_mkNP : QuantSg -> N -> NP ;
fun ovrld54_mkNP : QuantPl -> CN -> NP ;
fun ovrld55_mkNP : QuantPl -> N -> NP ;
fun ovrld52_mkNP : Quant -> CN -> NP ;
fun ovrld53_mkNP : Quant -> N -> NP ;
--fun ovrld52_mkNP : QuantSg -> CN -> NP ;
--fun ovrld53_mkNP : QuantSg -> N -> NP ;
--fun ovrld54_mkNP : QuantPl -> CN -> NP ;
--fun ovrld55_mkNP : QuantPl -> N -> NP ;
fun ovrld56_mkNP : Pron -> CN -> NP ;
fun ovrld57_mkNP : Pron -> N -> NP ;
fun ovrld58_mkNP : Numeral -> CN -> NP ;
@@ -71,10 +73,10 @@ fun ovrld67_mkNP : Conj -> NP -> NP -> NP ;
fun ovrld68_mkNP : DConj -> NP -> NP -> NP ;
fun ovrld69_mkNP : Conj -> ListNP -> NP ;
fun ovrld70_mkNP : DConj -> ListNP -> NP ;
fun ovrld71_mkDet : QuantSg -> Ord -> Det ;
fun ovrld72_mkDet : QuantSg -> Det ;
fun ovrld73_mkDet : QuantPl -> Num -> Ord -> Det ;
fun ovrld74_mkDet : QuantPl -> Det ;
fun ovrld71_mkDet : Quant -> Ord -> Det ;
fun ovrld72_mkDet : Quant -> Det ;
fun ovrld73_mkDet : Quant -> Num -> Ord -> Det ;
fun ovrld74_mkDet : Quant -> Det ;
fun ovrld75_mkDet : Quant -> Det ;
fun ovrld76_mkDet : Quant -> Num -> Det ;
fun ovrld77_mkDet : Num -> Det ;
@@ -85,11 +87,11 @@ fun ovrld81_defSgDet : Det ;
fun ovrld82_defPlDet : Det ;
fun ovrld83_indefSgDet : Det ;
fun ovrld84_indefPlDet : Det ;
fun ovrld85_mkQuantSg : Quant -> QuantSg ;
fun ovrld86_mkQuantPl : Quant -> QuantPl ;
fun ovrld85_mkQuantSg : Quant -> Quant ;
fun ovrld86_mkQuantPl : Quant -> Quant ;
fun ovrld87_defQuant : Quant ;
fun ovrld88_indefQuant : Quant ;
fun ovrld89_massQuant : QuantSg ;
fun ovrld89_massQuant : Quant ;
fun ovrld90_mkNum : Numeral -> Num ;
fun ovrld91_mkNum : Int -> Num ;
fun ovrld92_mkNum : Digit -> Num ;

56
lib/resource/api/toplevel/OverGrammarEng.gf
View File

@@ -43,33 +43,33 @@ lin ovrld31_mkCl = \s,v,n,q -> PredVP s (ComplV2A v n q) ;
lin ovrld32_mkCl = ImpersCl ;
lin ovrld33_mkCl = CleftNP ;
lin ovrld34_mkCl = CleftAdv ;
lin ovrld35_mkCl = \y -> ExistNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (UseN y)) ;
lin ovrld36_mkCl = \y -> ExistNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) y) ;
lin ovrld35_mkCl = \y -> ExistNP (DetCN (DetSg (IndefArt) NoOrd) (UseN y)) ;
lin ovrld36_mkCl = \y -> ExistNP (DetCN (DetSg (IndefArt) NoOrd) y) ;
lin ovrld37_mkCl = ExistNP ;
lin ovrld38_mkCl = \x,y -> PredVP x (UseComp (CompAP y)) ;
lin ovrld39_mkCl = \x,y -> PredVP x (UseComp (CompAP (PositA y))) ;
lin ovrld40_mkCl = \x,y,z -> PredVP x (UseComp (CompAP (ComparA y z))) ;
lin ovrld41_mkCl = \x,y,z -> PredVP x (UseComp (CompAP (ComplA2 y z))) ;
lin ovrld42_mkCl = \x,y -> PredVP x (UseComp (CompNP y)) ;
lin ovrld43_mkCl = \x,y -> PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) y))) ;
lin ovrld44_mkCl = \x,y -> PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (UseN y)))) ;
lin ovrld43_mkCl = \x,y -> PredVP x (UseComp (CompNP (DetCN (DetSg (IndefArt) NoOrd) y))) ;
lin ovrld44_mkCl = \x,y -> PredVP x (UseComp (CompNP (DetCN (DetSg (IndefArt) NoOrd) (UseN y)))) ;
lin ovrld45_mkCl = \x,y -> PredVP x (UseComp (CompAdv y)) ;
lin ovrld46_mkCl = \v -> ImpersCl (UseV v) ;
lin ovrld47_genericCl = GenericCl ;
lin ovrld48_mkNP = DetCN ;
lin ovrld49_mkNP = \d,n -> DetCN d (UseN n) ;
lin ovrld50_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) d NoOrd) n ;
lin ovrld51_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) d NoOrd) (UseN n) ;
lin ovrld50_mkNP = \d,n -> DetCN (DetPl (IndefArt) d NoOrd) n ;
lin ovrld51_mkNP = \d,n -> DetCN (DetPl (IndefArt) d NoOrd) (UseN n) ;
lin ovrld52_mkNP = \q,n -> DetCN (DetSg q NoOrd) n ;
lin ovrld53_mkNP = \q,n -> DetCN (DetSg q NoOrd) (UseN n) ;
lin ovrld54_mkNP = \q,n -> DetCN (DetPl q NoNum NoOrd) n ;
lin ovrld55_mkNP = \q,n -> DetCN (DetPl q NoNum NoOrd) (UseN n) ;
lin ovrld56_mkNP = \p,n -> DetCN (DetSg (SgQuant (PossPron p)) NoOrd) n ;
lin ovrld57_mkNP = \p,n -> DetCN (DetSg (SgQuant (PossPron p)) NoOrd) (UseN n) ;
lin ovrld58_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) (NumNumeral d) NoOrd) n ;
lin ovrld59_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) (NumNumeral d) NoOrd) (UseN n) ;
lin ovrld60_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) (NumInt d) NoOrd) n ;
lin ovrld61_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) (NumInt d) NoOrd) (UseN n) ;
--lin ovrld54_mkNP = \q,n -> DetCN (DetPl q NoNum NoOrd) n ;
--lin ovrld55_mkNP = \q,n -> DetCN (DetPl q NoNum NoOrd) (UseN n) ;
lin ovrld56_mkNP = \p,n -> DetCN (DetSg ((PossPron p)) NoOrd) n ;
lin ovrld57_mkNP = \p,n -> DetCN (DetSg ((PossPron p)) NoOrd) (UseN n) ;
lin ovrld58_mkNP = \d,n -> DetCN (DetPl (IndefArt) (NumNumeral d) NoOrd) n ;
lin ovrld59_mkNP = \d,n -> DetCN (DetPl (IndefArt) (NumNumeral d) NoOrd) (UseN n) ;
lin ovrld60_mkNP = \d,n -> DetCN (DetPl (IndefArt) (NumInt d) NoOrd) n ;
lin ovrld61_mkNP = \d,n -> DetCN (DetPl (IndefArt) (NumInt d) NoOrd) (UseN n) ;
lin ovrld62_mkNP = UsePN ;
lin ovrld63_mkNP = UsePron ;
lin ovrld64_mkNP = PredetNP ;
@@ -83,18 +83,18 @@ lin ovrld71_mkDet = DetSg ;
lin ovrld72_mkDet = \q -> DetSg q NoOrd ;
lin ovrld73_mkDet = DetPl ;
lin ovrld74_mkDet = \q -> DetPl q NoNum NoOrd ;
lin ovrld75_mkDet = \q -> DetSg (SgQuant q) NoOrd ;
lin ovrld76_mkDet = \q,nu -> DetPl (PlQuant q) nu NoOrd ;
lin ovrld77_mkDet = \n -> DetPl (PlQuant IndefArt) n NoOrd ;
lin ovrld78_mkDet = \n -> DetPl (PlQuant IndefArt) (NumInt n) NoOrd ;
lin ovrld79_mkDet = \d -> DetPl (PlQuant IndefArt) (NumNumeral d) NoOrd ;
lin ovrld80_mkDet = \p -> DetSg (SgQuant (PossPron p)) NoOrd ;
lin ovrld81_defSgDet = DetSg (SgQuant DefArt) NoOrd ;
lin ovrld82_defPlDet = DetPl (PlQuant DefArt) NoNum NoOrd ;
lin ovrld83_indefSgDet = DetSg (SgQuant IndefArt) NoOrd ;
lin ovrld84_indefPlDet = DetPl (PlQuant IndefArt) NoNum NoOrd ;
lin ovrld85_mkQuantSg = SgQuant ;
lin ovrld86_mkQuantPl = PlQuant ;
lin ovrld75_mkDet = \q -> DetSg (q) NoOrd ;
lin ovrld76_mkDet = \q,nu -> DetPl (q) nu NoOrd ;
lin ovrld77_mkDet = \n -> DetPl (IndefArt) n NoOrd ;
lin ovrld78_mkDet = \n -> DetPl (IndefArt) (NumInt n) NoOrd ;
lin ovrld79_mkDet = \d -> DetPl (IndefArt) (NumNumeral d) NoOrd ;
lin ovrld80_mkDet = \p -> DetSg ((PossPron p)) NoOrd ;
lin ovrld81_defSgDet = DetSg (DefArt) NoOrd ;
lin ovrld82_defPlDet = DetPl (DefArt) NoNum NoOrd ;
lin ovrld83_indefSgDet = DetSg (IndefArt) NoOrd ;
lin ovrld84_indefPlDet = DetPl (IndefArt) NoNum NoOrd ;
lin ovrld85_mkQuantSg q = q ; ----SgQuant ;
lin ovrld86_mkQuantPl q = q ; ----PlQuant ;
lin ovrld87_defQuant = DefArt ;
lin ovrld88_indefQuant = IndefArt ;
lin ovrld89_massQuant = MassDet ;
@@ -262,8 +262,8 @@ lin ovrld250_mkVP = \y,z -> (UseComp (CompAP (ComparA y z))) ;
lin ovrld251_mkVP = \y,z -> (UseComp (CompAP (ComplA2 y z))) ;
lin ovrld252_mkVP = \a -> UseComp (CompAP a) ;
lin ovrld253_mkVP = \a -> UseComp (CompNP a) ;
lin ovrld254_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) y))) ;
lin ovrld255_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (UseN y)))) ;
lin ovrld254_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (IndefArt) NoOrd) y))) ;
lin ovrld255_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (IndefArt) NoOrd) (UseN y)))) ;
lin ovrld256_mkVP = \a -> UseComp (CompAdv a) ;
lin ovrld257_mkVP = AdvVP ;
lin ovrld258_mkVP = AdVVP ;

2
lib/resource/api/toplevel/OverLangEng.gf
View File

@@ -1,4 +1,4 @@
--# -path=alltenses:prelude
--# -path=.:alltenses
concrete OverLangEng of OverLang =
OverGrammarEng-[PPos,PNeg,TPres,TPast,TFut,TCond,ASimul,AAnter],