diff --git a/lib/resource/Makefile b/lib/resource/Makefile index a04104e90..803700023 100644 --- a/lib/resource/Makefile +++ b/lib/resource/Makefile @@ -121,6 +121,7 @@ mathematical: $(GFCC) mathematical/MathematicalFin.gf mv mathematical/*.gfc ../mathematical +#doesn't compile 18/12/2007: multimodal: $(GF) -make -nocf multimodal/Multi???.gf mv multimodal/*.gfc ../multimodal diff --git a/lib/resource/api/Combinators.gf b/lib/resource/api/Combinators.gf index 6204bc525..0f6806a28 100644 --- a/lib/resource/api/Combinators.gf +++ b/lib/resource/api/Combinators.gf @@ -109,14 +109,14 @@ incomplete resource Combinators = open Grammar in { pred : A -> NP -> NP -> Cl = \a,x,y -> PredVP (ConjNP and_Conj (BaseNP x y)) (UseComp (CompAP (PositA a))) ; 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 - = \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 = \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 - = \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 = \a,x -> PredVP x (UseComp (CompAdv a)) ; pred : Prep -> NP -> NP -> Cl @@ -126,15 +126,15 @@ incomplete resource Combinators = open Grammar in { app = overload { app : N -> NP - = \n -> DetCN (DetSg (SgQuant DefArt) NoOrd) (UseN n) ; + = \n -> DetCN (DetSg (DefArt) NoOrd) (UseN n) ; 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 - = \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 - = \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 - = \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 { @@ -185,13 +185,13 @@ incomplete resource Combinators = open Grammar in { mod : Det -> CN -> NP = \d,n -> DetCN d n ; 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 - = \q,n -> DetCN (DetSg (SgQuant q) NoOrd) n ; + = \q,n -> DetCN (DetSg (q) NoOrd) n ; 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 - = \nu,n -> DetCN (DetPl (PlQuant IndefArt) (NumNumeral nu) NoOrd) (UseN n) + = \nu,n -> DetCN (DetPl (IndefArt) (NumNumeral nu) NoOrd) (UseN n) } ; diff --git a/lib/resource/api/Constructors.gf b/lib/resource/api/Constructors.gf index 81cb38f9f..3e7a2a3b2 100644 --- a/lib/resource/api/Constructors.gf +++ b/lib/resource/api/Constructors.gf @@ -836,6 +836,11 @@ incomplete resource Constructors = open Grammar in { --. -- Definitions + QuantSg : Type = Quant ** {isSg : {}} ; + QuantPl : Type = Quant ** {isPl : {}} ; + SgQuant : Quant -> QuantSg = \q -> q ** {isSg = <>} ; + PlQuant : Quant -> QuantPl = \q -> q ** {isPl = <>} ; + mkAP = overload { mkAP : A -> AP -- warm = PositA ; @@ -1030,7 +1035,7 @@ incomplete resource Constructors = open Grammar in { ---- obsol def_Det : Det = DetSg (SgQuant DefArt) NoOrd ; -- the (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 ; mkQuantPl : Quant -> QuantPl = PlQuant ; @@ -1038,7 +1043,7 @@ incomplete resource Constructors = open Grammar in { defQuant = DefArt ; indefQuant = IndefArt ; - massQuant : QuantSg = MassDet ; + massQuant : QuantSg = SgQuant MassDet ; the_QuantSg : QuantSg = SgQuant DefArt ; a_QuantSg : QuantSg = mkQuantSg indefQuant ; diff --git a/lib/resource/api/toplevel/OverGrammar.gf b/lib/resource/api/toplevel/OverGrammar.gf index a062d8249..7c38f2abc 100644 --- a/lib/resource/api/toplevel/OverGrammar.gf +++ b/lib/resource/api/toplevel/OverGrammar.gf @@ -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 ; diff --git a/lib/resource/api/toplevel/OverGrammarEng.gf b/lib/resource/api/toplevel/OverGrammarEng.gf index 7e7691970..7dc06f0f6 100644 --- a/lib/resource/api/toplevel/OverGrammarEng.gf +++ b/lib/resource/api/toplevel/OverGrammarEng.gf @@ -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 ; diff --git a/lib/resource/api/toplevel/OverLangEng.gf b/lib/resource/api/toplevel/OverLangEng.gf index 1f535e410..1bd005327 100644 --- a/lib/resource/api/toplevel/OverLangEng.gf +++ b/lib/resource/api/toplevel/OverLangEng.gf @@ -1,4 +1,4 @@ ---# -path=alltenses:prelude +--# -path=.:alltenses concrete OverLangEng of OverLang = OverGrammarEng-[PPos,PNeg,TPres,TPast,TFut,TCond,ASimul,AAnter], diff --git a/lib/resource/finnish/ExtraFin.gf b/lib/resource/finnish/ExtraFin.gf index 4d74797bc..c8599755a 100644 --- a/lib/resource/finnish/ExtraFin.gf +++ b/lib/resource/finnish/ExtraFin.gf @@ -58,7 +58,7 @@ concrete ExtraFin of ExtraFinAbs = CatFin ** PartCN cn = let - acn = DetCN (DetSg (SgQuant IndefArt) NoOrd) cn + acn = DetCN (DetSg IndefArt NoOrd) cn in { s = table { NPCase Nom | NPAcc => acn.s ! NPCase Part ; diff --git a/lib/resource/mathematical/PredicationI.gf b/lib/resource/mathematical/PredicationI.gf index 47cdd87c8..e2d80c323 100644 --- a/lib/resource/mathematical/PredicationI.gf +++ b/lib/resource/mathematical/PredicationI.gf @@ -22,7 +22,7 @@ lin predN2 n x y = PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (ComplN2 n 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)) ; 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. - 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 } diff --git a/lib/resource/mathematical/SymbolEng.gf b/lib/resource/mathematical/SymbolEng.gf index 53ff3aec0..d54f7afa0 100644 --- a/lib/resource/mathematical/SymbolEng.gf +++ b/lib/resource/mathematical/SymbolEng.gf @@ -20,7 +20,7 @@ lin SymbS sy = sy ; - SymbNum sy = {s = sy.s ; n = Sg} ; + SymbNum sy = {s = sy.s ; n = Pl} ; SymbOrd sy = {s = sy.s ++ "th"} ; lincat diff --git a/lib/resource/mathematical/SymbolFin.gf b/lib/resource/mathematical/SymbolFin.gf index 5e2cbd19e..922b19dcb 100644 --- a/lib/resource/mathematical/SymbolFin.gf +++ b/lib/resource/mathematical/SymbolFin.gf @@ -24,7 +24,7 @@ lin SymbS sy = sy ; - SymbNum n = {s = \\_,_ => n.s ; isNum = True} ; + SymbNum n = {s = \\_,_ => n.s ; isNum = True ; n = Pl} ; SymbOrd n = {s = \\_,_ => n.s ++ "."} ; lincat diff --git a/lib/resource/mathematical/SymbolRomance.gf b/lib/resource/mathematical/SymbolRomance.gf index 82899c242..64b4e1a34 100644 --- a/lib/resource/mathematical/SymbolRomance.gf +++ b/lib/resource/mathematical/SymbolRomance.gf @@ -24,7 +24,7 @@ lin } ; 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 ++ "."} ; --- lincat diff --git a/lib/resource/mathematical/SymbolScand.gf b/lib/resource/mathematical/SymbolScand.gf index 614232a6b..8bde4e1a4 100644 --- a/lib/resource/mathematical/SymbolScand.gf +++ b/lib/resource/mathematical/SymbolScand.gf @@ -21,7 +21,7 @@ lin 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} ; --- lincat diff --git a/lib/resource/multimodal/MultiI.gf b/lib/resource/multimodal/MultiI.gf index cd10d1545..a43d18bb3 100644 --- a/lib/resource/multimodal/MultiI.gf +++ b/lib/resource/multimodal/MultiI.gf @@ -28,8 +28,8 @@ incomplete concrete MultiI of Multi = Imp = Lang.Imp ** {point : Str} ; Utt = Lang.Utt ** {point : Str} ; Quant = Lang.Quant ** {point : Str} ; - QuantSg = Lang.QuantSg ** {point : Str} ; - QuantPl = Lang.QuantPl ** {point : Str} ; +--- QuantSg = Lang.QuantSg ** {point : Str} ; +--- QuantPl = Lang.QuantPl ** {point : Str} ; Point = {point : 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} ; DetSg qu o = Lang.DetSg qu o ** {point = qu.point} ; DetPl qu n o = Lang.DetPl qu n o ** {point = qu.point} ; - SgQuant qu = Lang.SgQuant qu ** {point = qu.point} ; - PlQuant qu = Lang.PlQuant qu ** {point = qu.point} ; +--- SgQuant qu = Lang.SgQuant qu ** {point = qu.point} ; +--- PlQuant qu = Lang.PlQuant qu ** {point = qu.point} ; PossPron p = Lang.PossPron p ** noPoint ; DefArt = Lang.DefArt ** noPoint ; IndefArt = Lang.IndefArt ** noPoint ; @@ -123,7 +123,7 @@ incomplete concrete MultiI of Multi = these_NP = Lang.these_NP ** noPoint ; this_NP = Lang.this_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 ; this_Quant = Lang.this_Quant ** noPoint ; diff --git a/lib/resource/russian/NounRus.gf b/lib/resource/russian/NounRus.gf index 8d9f5ba3f..138023133 100644 --- a/lib/resource/russian/NounRus.gf +++ b/lib/resource/russian/NounRus.gf @@ -88,7 +88,7 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in { -- 3 => (ti_j_EndDecl n.s) ; -- _ => uy_j_EndDecl n.s } ; ----- OrdNumeral numeral = variants {} ; ---- TODO + OrdNumeral numeral = variants {} ; ---- TODO; needed to compile Constructors ---- OrdDigits TODO -- {s = \\ af => (uy_j_EndDecl (numeral.s ! caseAF af ! genAF af)).s!af} ;