GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-22 09:32:53 -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

1
lib/resource/Makefile
View File

@@ -121,6 +121,7 @@ mathematical:
$(GFCC) mathematical/MathematicalFin.gf $(GFCC) mathematical/MathematicalFin.gf
mv mathematical/*.gfc ../mathematical mv mathematical/*.gfc ../mathematical
#doesn't compile 18/12/2007:
multimodal: multimodal:
$(GF) -make -nocf multimodal/Multi???.gf $(GF) -make -nocf multimodal/Multi???.gf
mv multimodal/*.gfc ../multimodal mv multimodal/*.gfc ../multimodal

26
lib/resource/api/Combinators.gf
View File

@@ -109,14 +109,14 @@ incomplete resource Combinators = open Grammar in {
pred : A -> NP -> NP -> Cl pred : A -> NP -> NP -> Cl
= \a,x,y -> PredVP (ConjNP and_Conj (BaseNP x y)) (UseComp (CompAP (PositA a))) ; = \a,x,y -> PredVP (ConjNP and_Conj (BaseNP x y)) (UseComp (CompAP (PositA a))) ;
pred : N -> NP -> Cl pred : N -> NP -> Cl
= \n,x -> PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (UseN n)))) ; = \n,x -> PredVP x (UseComp (CompNP (DetCN (DetSg (IndefArt) NoOrd) (UseN n)))) ;
pred : CN -> NP -> Cl pred : CN -> NP -> Cl
= \n,x -> PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) n))) ; = \n,x -> PredVP x (UseComp (CompNP (DetCN (DetSg (IndefArt) NoOrd) n))) ;
pred : NP -> NP -> Cl pred : NP -> NP -> Cl
= \n,x -> PredVP x (UseComp (CompNP n)) ; pred : N2 -> NP -> NP -> Cl = \n,x -> PredVP x (UseComp (CompNP n)) ; pred : N2 -> NP -> NP -> Cl
= \n,x,y -> PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (ComplN2 n y)))) ; = \n,x,y -> PredVP x (UseComp (CompNP (DetCN (DetSg (IndefArt) NoOrd) (ComplN2 n y)))) ;
pred : N -> NP -> NP -> Cl pred : N -> NP -> NP -> Cl
= \n,x,y -> PredVP (ConjNP and_Conj (BaseNP x y)) (UseComp (CompNP (DetCN (DetPl (PlQuant IndefArt) NoNum NoOrd) (UseN n)))) ; = \n,x,y -> PredVP (ConjNP and_Conj (BaseNP x y)) (UseComp (CompNP (DetCN (DetPl (IndefArt) NoNum NoOrd) (UseN n)))) ;
pred : Adv -> NP -> Cl pred : Adv -> NP -> Cl
= \a,x -> PredVP x (UseComp (CompAdv a)) ; = \a,x -> PredVP x (UseComp (CompAdv a)) ;
pred : Prep -> NP -> NP -> Cl pred : Prep -> NP -> NP -> Cl
@@ -126,15 +126,15 @@ incomplete resource Combinators = open Grammar in {
app = overload { app = overload {
app : N -> NP app : N -> NP
= \n -> DetCN (DetSg (SgQuant DefArt) NoOrd) (UseN n) ; = \n -> DetCN (DetSg (DefArt) NoOrd) (UseN n) ;
app : N2 -> NP -> NP app : N2 -> NP -> NP
= \n,x -> DetCN (DetSg (SgQuant DefArt) NoOrd) (ComplN2 n x) ; = \n,x -> DetCN (DetSg (DefArt) NoOrd) (ComplN2 n x) ;
app : N3 -> NP -> NP -> NP app : N3 -> NP -> NP -> NP
= \n,x,y -> DetCN (DetSg (SgQuant DefArt) NoOrd) (ComplN2 (ComplN3 n x) y) ; = \n,x,y -> DetCN (DetSg (DefArt) NoOrd) (ComplN2 (ComplN3 n x) y) ;
app : N2 -> NP -> NP -> NP app : N2 -> NP -> NP -> NP
= \n,x,y -> DetCN (DetSg (SgQuant DefArt) NoOrd) (ComplN2 n (ConjNP and_Conj (BaseNP x y))) ; = \n,x,y -> DetCN (DetSg (DefArt) NoOrd) (ComplN2 n (ConjNP and_Conj (BaseNP x y))) ;
app : N2 -> N -> CN app : N2 -> N -> CN
= \f,n -> ComplN2 f (DetCN (DetPl (PlQuant IndefArt) NoNum NoOrd) (UseN n)) = \f,n -> ComplN2 f (DetCN (DetPl (IndefArt) NoNum NoOrd) (UseN n))
} ; } ;
coord = overload { coord = overload {
@@ -185,13 +185,13 @@ incomplete resource Combinators = open Grammar in {
mod : Det -> CN -> NP mod : Det -> CN -> NP
= \d,n -> DetCN d n ; = \d,n -> DetCN d n ;
mod : Quant -> N -> NP mod : Quant -> N -> NP
= \q,n -> DetCN (DetSg (SgQuant q) NoOrd) (UseN n) ; = \q,n -> DetCN (DetSg (q) NoOrd) (UseN n) ;
mod : Quant -> CN -> NP mod : Quant -> CN -> NP
= \q,n -> DetCN (DetSg (SgQuant q) NoOrd) n ; = \q,n -> DetCN (DetSg (q) NoOrd) n ;
mod : Predet -> N -> NP mod : Predet -> N -> NP
= \q,n -> PredetNP q (DetCN (DetPl (PlQuant IndefArt) NoNum NoOrd) (UseN n)) ; = \q,n -> PredetNP q (DetCN (DetPl (IndefArt) NoNum NoOrd) (UseN n)) ;
mod : Numeral -> N -> NP mod : Numeral -> N -> NP
= \nu,n -> DetCN (DetPl (PlQuant IndefArt) (NumNumeral nu) NoOrd) (UseN n) = \nu,n -> DetCN (DetPl (IndefArt) (NumNumeral nu) NoOrd) (UseN n)
} ; } ;

9
lib/resource/api/Constructors.gf
View File

@@ -836,6 +836,11 @@ incomplete resource Constructors = open Grammar in {
--. --.
-- Definitions -- Definitions
QuantSg : Type = Quant ** {isSg : {}} ;
QuantPl : Type = Quant ** {isPl : {}} ;
SgQuant : Quant -> QuantSg = \q -> q ** {isSg = <>} ;
PlQuant : Quant -> QuantPl = \q -> q ** {isPl = <>} ;
mkAP = overload { mkAP = overload {
mkAP : A -> AP -- warm mkAP : A -> AP -- warm
= PositA ; = PositA ;
@@ -1030,7 +1035,7 @@ incomplete resource Constructors = open Grammar in {
---- obsol ---- obsol
def_Det : Det = DetSg (SgQuant DefArt) NoOrd ; -- the (man) def_Det : Det = DetSg (SgQuant DefArt) NoOrd ; -- the (man)
indef_Det : Det = DetSg (SgQuant IndefArt) NoOrd ; -- a (man) indef_Det : Det = DetSg (SgQuant IndefArt) NoOrd ; -- a (man)
mass_Det : Det = DetSg MassDet NoOrd; -- (water) mass_Det : Det = DetSg (SgQuant MassDet) NoOrd; -- (water)
mkQuantSg : Quant -> QuantSg = SgQuant ; mkQuantSg : Quant -> QuantSg = SgQuant ;
mkQuantPl : Quant -> QuantPl = PlQuant ; mkQuantPl : Quant -> QuantPl = PlQuant ;
@@ -1038,7 +1043,7 @@ incomplete resource Constructors = open Grammar in {
defQuant = DefArt ; defQuant = DefArt ;
indefQuant = IndefArt ; indefQuant = IndefArt ;
massQuant : QuantSg = MassDet ; massQuant : QuantSg = SgQuant MassDet ;
the_QuantSg : QuantSg = SgQuant DefArt ; the_QuantSg : QuantSg = SgQuant DefArt ;
a_QuantSg : QuantSg = mkQuantSg indefQuant ; a_QuantSg : QuantSg = mkQuantSg indefQuant ;

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 ovrld49_mkNP : Det -> N -> NP ;
fun ovrld50_mkNP : Num -> CN -> NP ; fun ovrld50_mkNP : Num -> CN -> NP ;
fun ovrld51_mkNP : Num -> N -> NP ; fun ovrld51_mkNP : Num -> N -> NP ;
fun ovrld52_mkNP : QuantSg -> CN -> NP ; fun ovrld52_mkNP : Quant -> CN -> NP ;
fun ovrld53_mkNP : QuantSg -> N -> NP ; fun ovrld53_mkNP : Quant -> N -> NP ;
fun ovrld54_mkNP : QuantPl -> CN -> NP ; --fun ovrld52_mkNP : QuantSg -> CN -> NP ;
fun ovrld55_mkNP : QuantPl -> N -> 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 ovrld56_mkNP : Pron -> CN -> NP ;
fun ovrld57_mkNP : Pron -> N -> NP ; fun ovrld57_mkNP : Pron -> N -> NP ;
fun ovrld58_mkNP : Numeral -> CN -> 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 ovrld68_mkNP : DConj -> NP -> NP -> NP ;
fun ovrld69_mkNP : Conj -> ListNP -> NP ; fun ovrld69_mkNP : Conj -> ListNP -> NP ;
fun ovrld70_mkNP : DConj -> ListNP -> NP ; fun ovrld70_mkNP : DConj -> ListNP -> NP ;
fun ovrld71_mkDet : QuantSg -> Ord -> Det ; fun ovrld71_mkDet : Quant -> Ord -> Det ;
fun ovrld72_mkDet : QuantSg -> Det ; fun ovrld72_mkDet : Quant -> Det ;
fun ovrld73_mkDet : QuantPl -> Num -> Ord -> Det ; fun ovrld73_mkDet : Quant -> Num -> Ord -> Det ;
fun ovrld74_mkDet : QuantPl -> Det ; fun ovrld74_mkDet : Quant -> Det ;
fun ovrld75_mkDet : Quant -> Det ; fun ovrld75_mkDet : Quant -> Det ;
fun ovrld76_mkDet : Quant -> Num -> Det ; fun ovrld76_mkDet : Quant -> Num -> Det ;
fun ovrld77_mkDet : Num -> Det ; fun ovrld77_mkDet : Num -> Det ;
@@ -85,11 +87,11 @@ fun ovrld81_defSgDet : Det ;
fun ovrld82_defPlDet : Det ; fun ovrld82_defPlDet : Det ;
fun ovrld83_indefSgDet : Det ; fun ovrld83_indefSgDet : Det ;
fun ovrld84_indefPlDet : Det ; fun ovrld84_indefPlDet : Det ;
fun ovrld85_mkQuantSg : Quant -> QuantSg ; fun ovrld85_mkQuantSg : Quant -> Quant ;
fun ovrld86_mkQuantPl : Quant -> QuantPl ; fun ovrld86_mkQuantPl : Quant -> Quant ;
fun ovrld87_defQuant : Quant ; fun ovrld87_defQuant : Quant ;
fun ovrld88_indefQuant : Quant ; fun ovrld88_indefQuant : Quant ;
fun ovrld89_massQuant : QuantSg ; fun ovrld89_massQuant : Quant ;
fun ovrld90_mkNum : Numeral -> Num ; fun ovrld90_mkNum : Numeral -> Num ;
fun ovrld91_mkNum : Int -> Num ; fun ovrld91_mkNum : Int -> Num ;
fun ovrld92_mkNum : Digit -> 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 ovrld32_mkCl = ImpersCl ;
lin ovrld33_mkCl = CleftNP ; lin ovrld33_mkCl = CleftNP ;
lin ovrld34_mkCl = CleftAdv ; lin ovrld34_mkCl = CleftAdv ;
lin ovrld35_mkCl = \y -> ExistNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (UseN y)) ; lin ovrld35_mkCl = \y -> ExistNP (DetCN (DetSg (IndefArt) NoOrd) (UseN y)) ;
lin ovrld36_mkCl = \y -> ExistNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) y) ; lin ovrld36_mkCl = \y -> ExistNP (DetCN (DetSg (IndefArt) NoOrd) y) ;
lin ovrld37_mkCl = ExistNP ; lin ovrld37_mkCl = ExistNP ;
lin ovrld38_mkCl = \x,y -> PredVP x (UseComp (CompAP y)) ; lin ovrld38_mkCl = \x,y -> PredVP x (UseComp (CompAP y)) ;
lin ovrld39_mkCl = \x,y -> PredVP x (UseComp (CompAP (PositA 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 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 ovrld41_mkCl = \x,y,z -> PredVP x (UseComp (CompAP (ComplA2 y z))) ;
lin ovrld42_mkCl = \x,y -> PredVP x (UseComp (CompNP y)) ; 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 ovrld43_mkCl = \x,y -> PredVP x (UseComp (CompNP (DetCN (DetSg (IndefArt) NoOrd) y))) ;
lin ovrld44_mkCl = \x,y -> PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (UseN 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 ovrld45_mkCl = \x,y -> PredVP x (UseComp (CompAdv y)) ;
lin ovrld46_mkCl = \v -> ImpersCl (UseV v) ; lin ovrld46_mkCl = \v -> ImpersCl (UseV v) ;
lin ovrld47_genericCl = GenericCl ; lin ovrld47_genericCl = GenericCl ;
lin ovrld48_mkNP = DetCN ; lin ovrld48_mkNP = DetCN ;
lin ovrld49_mkNP = \d,n -> DetCN d (UseN n) ; lin ovrld49_mkNP = \d,n -> DetCN d (UseN n) ;
lin ovrld50_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) d NoOrd) n ; lin ovrld50_mkNP = \d,n -> DetCN (DetPl (IndefArt) d NoOrd) n ;
lin ovrld51_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) d NoOrd) (UseN n) ; lin ovrld51_mkNP = \d,n -> DetCN (DetPl (IndefArt) d NoOrd) (UseN n) ;
lin ovrld52_mkNP = \q,n -> DetCN (DetSg q NoOrd) n ; lin ovrld52_mkNP = \q,n -> DetCN (DetSg q NoOrd) n ;
lin ovrld53_mkNP = \q,n -> DetCN (DetSg q NoOrd) (UseN n) ; lin ovrld53_mkNP = \q,n -> DetCN (DetSg q NoOrd) (UseN n) ;
lin ovrld54_mkNP = \q,n -> DetCN (DetPl q NoNum NoOrd) 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 ovrld55_mkNP = \q,n -> DetCN (DetPl q NoNum NoOrd) (UseN n) ;
lin ovrld56_mkNP = \p,n -> DetCN (DetSg (SgQuant (PossPron p)) NoOrd) n ; lin ovrld56_mkNP = \p,n -> DetCN (DetSg ((PossPron p)) NoOrd) n ;
lin ovrld57_mkNP = \p,n -> DetCN (DetSg (SgQuant (PossPron p)) NoOrd) (UseN n) ; lin ovrld57_mkNP = \p,n -> DetCN (DetSg ((PossPron p)) NoOrd) (UseN n) ;
lin ovrld58_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) (NumNumeral d) NoOrd) n ; lin ovrld58_mkNP = \d,n -> DetCN (DetPl (IndefArt) (NumNumeral d) NoOrd) n ;
lin ovrld59_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) (NumNumeral d) NoOrd) (UseN n) ; lin ovrld59_mkNP = \d,n -> DetCN (DetPl (IndefArt) (NumNumeral d) NoOrd) (UseN n) ;
lin ovrld60_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) (NumInt d) NoOrd) n ; lin ovrld60_mkNP = \d,n -> DetCN (DetPl (IndefArt) (NumInt d) NoOrd) n ;
lin ovrld61_mkNP = \d,n -> DetCN (DetPl (PlQuant IndefArt) (NumInt d) NoOrd) (UseN n) ; lin ovrld61_mkNP = \d,n -> DetCN (DetPl (IndefArt) (NumInt d) NoOrd) (UseN n) ;
lin ovrld62_mkNP = UsePN ; lin ovrld62_mkNP = UsePN ;
lin ovrld63_mkNP = UsePron ; lin ovrld63_mkNP = UsePron ;
lin ovrld64_mkNP = PredetNP ; lin ovrld64_mkNP = PredetNP ;
@@ -83,18 +83,18 @@ lin ovrld71_mkDet = DetSg ;
lin ovrld72_mkDet = \q -> DetSg q NoOrd ; lin ovrld72_mkDet = \q -> DetSg q NoOrd ;
lin ovrld73_mkDet = DetPl ; lin ovrld73_mkDet = DetPl ;
lin ovrld74_mkDet = \q -> DetPl q NoNum NoOrd ; lin ovrld74_mkDet = \q -> DetPl q NoNum NoOrd ;
lin ovrld75_mkDet = \q -> DetSg (SgQuant q) NoOrd ; lin ovrld75_mkDet = \q -> DetSg (q) NoOrd ;
lin ovrld76_mkDet = \q,nu -> DetPl (PlQuant q) nu NoOrd ; lin ovrld76_mkDet = \q,nu -> DetPl (q) nu NoOrd ;
lin ovrld77_mkDet = \n -> DetPl (PlQuant IndefArt) n NoOrd ; lin ovrld77_mkDet = \n -> DetPl (IndefArt) n NoOrd ;
lin ovrld78_mkDet = \n -> DetPl (PlQuant IndefArt) (NumInt n) NoOrd ; lin ovrld78_mkDet = \n -> DetPl (IndefArt) (NumInt n) NoOrd ;
lin ovrld79_mkDet = \d -> DetPl (PlQuant IndefArt) (NumNumeral d) NoOrd ; lin ovrld79_mkDet = \d -> DetPl (IndefArt) (NumNumeral d) NoOrd ;
lin ovrld80_mkDet = \p -> DetSg (SgQuant (PossPron p)) NoOrd ; lin ovrld80_mkDet = \p -> DetSg ((PossPron p)) NoOrd ;
lin ovrld81_defSgDet = DetSg (SgQuant DefArt) NoOrd ; lin ovrld81_defSgDet = DetSg (DefArt) NoOrd ;
lin ovrld82_defPlDet = DetPl (PlQuant DefArt) NoNum NoOrd ; lin ovrld82_defPlDet = DetPl (DefArt) NoNum NoOrd ;
lin ovrld83_indefSgDet = DetSg (SgQuant IndefArt) NoOrd ; lin ovrld83_indefSgDet = DetSg (IndefArt) NoOrd ;
lin ovrld84_indefPlDet = DetPl (PlQuant IndefArt) NoNum NoOrd ; lin ovrld84_indefPlDet = DetPl (IndefArt) NoNum NoOrd ;
lin ovrld85_mkQuantSg = SgQuant ; lin ovrld85_mkQuantSg q = q ; ----SgQuant ;
lin ovrld86_mkQuantPl = PlQuant ; lin ovrld86_mkQuantPl q = q ; ----PlQuant ;
lin ovrld87_defQuant = DefArt ; lin ovrld87_defQuant = DefArt ;
lin ovrld88_indefQuant = IndefArt ; lin ovrld88_indefQuant = IndefArt ;
lin ovrld89_massQuant = MassDet ; 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 ovrld251_mkVP = \y,z -> (UseComp (CompAP (ComplA2 y z))) ;
lin ovrld252_mkVP = \a -> UseComp (CompAP a) ; lin ovrld252_mkVP = \a -> UseComp (CompAP a) ;
lin ovrld253_mkVP = \a -> UseComp (CompNP a) ; lin ovrld253_mkVP = \a -> UseComp (CompNP a) ;
lin ovrld254_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) y))) ; lin ovrld254_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (IndefArt) NoOrd) y))) ;
lin ovrld255_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (UseN y)))) ; lin ovrld255_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (IndefArt) NoOrd) (UseN y)))) ;
lin ovrld256_mkVP = \a -> UseComp (CompAdv a) ; lin ovrld256_mkVP = \a -> UseComp (CompAdv a) ;
lin ovrld257_mkVP = AdvVP ; lin ovrld257_mkVP = AdvVP ;
lin ovrld258_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 = concrete OverLangEng of OverLang =
OverGrammarEng-[PPos,PNeg,TPres,TPast,TFut,TCond,ASimul,AAnter], OverGrammarEng-[PPos,PNeg,TPres,TPast,TFut,TCond,ASimul,AAnter],

2
lib/resource/finnish/ExtraFin.gf
View File

@@ -58,7 +58,7 @@ concrete ExtraFin of ExtraFinAbs = CatFin **
PartCN cn = PartCN cn =
let let
acn = DetCN (DetSg (SgQuant IndefArt) NoOrd) cn acn = DetCN (DetSg IndefArt NoOrd) cn
in { in {
s = table { s = table {
NPCase Nom | NPAcc => acn.s ! NPCase Part ; NPCase Nom | NPAcc => acn.s ! NPCase Part ;

6
lib/resource/mathematical/PredicationI.gf
View File

@@ -22,7 +22,7 @@ lin
predN2 n x y = predN2 n x y =
PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (ComplN2 n y)))) ; PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (ComplN2 n y)))) ;
predNColl n x y = PredVP (ConjNP and_Conj (BaseNP x y)) predNColl n x y = PredVP (ConjNP and_Conj (BaseNP x y))
(UseComp (CompNP (DetCN (DetPl (PlQuant IndefArt) NoNum NoOrd) (UseN n)))) ; (UseComp (CompNP (DetCN (DetPl (IndefArt) NoNum NoOrd) (UseN n)))) ;
predAdv a x = PredVP x (UseComp (CompAdv a)) ; predAdv a x = PredVP x (UseComp (CompAdv a)) ;
predPrep p x y = PredVP x (UseComp (CompAdv (PrepNP p y))) ; predPrep p x y = PredVP x (UseComp (CompAdv (PrepNP p y))) ;
@@ -50,6 +50,8 @@ lin
-- This is similar to a family except that the argument is a type. -- This is similar to a family except that the argument is a type.
typN2 f n = ComplN2 f (DetCN (DetPl (PlQuant IndefArt) NoNum NoOrd) n) ; typN2 f n = ComplN2 f (DetCN (DetPl (IndefArt) NoNum NoOrd) n) ;
--.
oper SgQuant : Quant -> Quant = \q -> q ; ---- for BWC with DEPREC
} }

2
lib/resource/mathematical/SymbolEng.gf
View File

@@ -20,7 +20,7 @@ lin
SymbS sy = sy ; SymbS sy = sy ;
SymbNum sy = {s = sy.s ; n = Sg} ; SymbNum sy = {s = sy.s ; n = Pl} ;
SymbOrd sy = {s = sy.s ++ "th"} ; SymbOrd sy = {s = sy.s ++ "th"} ;
lincat lincat

2
lib/resource/mathematical/SymbolFin.gf
View File

@@ -24,7 +24,7 @@ lin
SymbS sy = sy ; SymbS sy = sy ;
SymbNum n = {s = \\_,_ => n.s ; isNum = True} ; SymbNum n = {s = \\_,_ => n.s ; isNum = True ; n = Pl} ;
SymbOrd n = {s = \\_,_ => n.s ++ "."} ; SymbOrd n = {s = \\_,_ => n.s ++ "."} ;
lincat lincat

2
lib/resource/mathematical/SymbolRomance.gf
View File

@@ -24,7 +24,7 @@ lin
} ; } ;
SymbS sy = {s = \\_ => sy.s} ; SymbS sy = {s = \\_ => sy.s} ;
SymbNum n = {s = \\_ => n.s ; isNum = True} ; SymbNum n = {s = \\_ => n.s ; isNum = True ; n = Pl} ;
SymbOrd n = {s = \\_ => n.s ++ "."} ; --- SymbOrd n = {s = \\_ => n.s ++ "."} ; ---
lincat lincat

2
lib/resource/mathematical/SymbolScand.gf
View File

@@ -21,7 +21,7 @@ lin
SymbS sy = {s = \\_ => sy.s} ; SymbS sy = {s = \\_ => sy.s} ;
SymbNum n = {s = \\_ => n.s ; isDet = True} ; SymbNum n = {s = \\_ => n.s ; isDet = True ; n = Pl} ;
SymbOrd n = {s = n.s ++ ":te" ; isDet = True} ; --- SymbOrd n = {s = n.s ++ ":te" ; isDet = True} ; ---
lincat lincat

10
lib/resource/multimodal/MultiI.gf
View File

@@ -28,8 +28,8 @@ incomplete concrete MultiI of Multi =
Imp = Lang.Imp ** {point : Str} ; Imp = Lang.Imp ** {point : Str} ;
Utt = Lang.Utt ** {point : Str} ; Utt = Lang.Utt ** {point : Str} ;
Quant = Lang.Quant ** {point : Str} ; Quant = Lang.Quant ** {point : Str} ;
QuantSg = Lang.QuantSg ** {point : Str} ; --- QuantSg = Lang.QuantSg ** {point : Str} ;
QuantPl = Lang.QuantPl ** {point : Str} ; --- QuantPl = Lang.QuantPl ** {point : Str} ;
Point = {point : Str} ; Point = {point : Str} ;
Speech = {s : Str} ; Speech = {s : Str} ;
@@ -43,8 +43,8 @@ incomplete concrete MultiI of Multi =
AdvNP np adv = Lang.AdvNP np adv ** {point = np.point ++ adv.point} ; AdvNP np adv = Lang.AdvNP np adv ** {point = np.point ++ adv.point} ;
DetSg qu o = Lang.DetSg qu o ** {point = qu.point} ; DetSg qu o = Lang.DetSg qu o ** {point = qu.point} ;
DetPl qu n o = Lang.DetPl qu n o ** {point = qu.point} ; DetPl qu n o = Lang.DetPl qu n o ** {point = qu.point} ;
SgQuant qu = Lang.SgQuant qu ** {point = qu.point} ; --- SgQuant qu = Lang.SgQuant qu ** {point = qu.point} ;
PlQuant qu = Lang.PlQuant qu ** {point = qu.point} ; --- PlQuant qu = Lang.PlQuant qu ** {point = qu.point} ;
PossPron p = Lang.PossPron p ** noPoint ; PossPron p = Lang.PossPron p ** noPoint ;
DefArt = Lang.DefArt ** noPoint ; DefArt = Lang.DefArt ** noPoint ;
IndefArt = Lang.IndefArt ** noPoint ; IndefArt = Lang.IndefArt ** noPoint ;
@@ -123,7 +123,7 @@ incomplete concrete MultiI of Multi =
these_NP = Lang.these_NP ** noPoint ; these_NP = Lang.these_NP ** noPoint ;
this_NP = Lang.this_NP ** noPoint ; this_NP = Lang.this_NP ** noPoint ;
those_NP = Lang.those_NP ** noPoint ; those_NP = Lang.those_NP ** noPoint ;
one_Quant = Lang.one_Quant ** noPoint ; --- one_Quant = Lang.one_Quant ** noPoint ;
that_Quant = Lang.that_Quant ** noPoint ; that_Quant = Lang.that_Quant ** noPoint ;
this_Quant = Lang.this_Quant ** noPoint ; this_Quant = Lang.this_Quant ** noPoint ;

2
lib/resource/russian/NounRus.gf
View File

@@ -88,7 +88,7 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
-- 3 => (ti_j_EndDecl n.s) ; -- 3 => (ti_j_EndDecl n.s) ;
-- _ => uy_j_EndDecl n.s } ; -- _ => uy_j_EndDecl n.s } ;
---- OrdNumeral numeral = variants {} ; ---- TODO OrdNumeral numeral = variants {} ; ---- TODO; needed to compile Constructors
---- OrdDigits TODO ---- OrdDigits TODO
-- {s = \\ af => (uy_j_EndDecl (numeral.s ! caseAF af ! genAF af)).s!af} ; -- {s = \\ af => (uy_j_EndDecl (numeral.s ! caseAF af ! genAF af)).s!af} ;