enable smart paradigms

This commit is contained in:
krangelov
2021-04-28 09:19:48 +02:00
parent bfa64d477d
commit 7396ed93f7

View File

@@ -126,7 +126,7 @@ oper dfltGender : Gender = G1 ;
--2 Prepositions --2 Prepositions
mkPrep : overload { mkPrep : overload {
mkPrep : Str -> Prep ; mkPrep : Str -> Prep ;
mkPrep : (Gender => Number => Str) -> Prep ; mkPrep : (Gender => Number => Str) -> Prep ;
} ; } ;
@@ -292,13 +292,13 @@ mkN2 = overload {
mkPrep = overload { mkPrep = overload {
mkPrep : Str -> Prep = \str -> lin Prep {s = \\n,g => str } ; mkPrep : Str -> Prep = \str -> lin Prep {s = \\n,g => str } ;
mkPrep : (Number => Gender => Str) -> Prep = \t ->lin Prep {s = t} ; mkPrep : (Number => Gender => Str) -> Prep = \t ->lin Prep {s = t} ;
} ; mkPrep : Str -> Str -> Prep = \p,q -> lin Prep
noPrep = mkPrep [] ;
{-} mkPrep : Str -> Str -> Prep = \p,q -> lin Prep
{s = table{Sg => table{G1 => p; _=> "" }; {s = table{Sg => table{G1 => p; _=> "" };
Pl => table{G1 => q; _=> ""}}} ; Pl => table{G1 => q; _=> ""}}} ;
prepV2 : V -> Prep -> V2 ; } ;
noPrep = mkPrep [] ;
prepV2 : V -> Prep -> V2 ;
prepV2 = \v,p -> lin V2 (v ** {c2 = p.s!Sg!G1}) ; prepV2 = \v,p -> lin V2 (v ** {c2 = p.s!Sg!G1}) ;
dirV2 : V -> V2 = \v -> prepV2 v noPrep ; dirV2 : V -> V2 = \v -> prepV2 v noPrep ;
@@ -349,7 +349,7 @@ mkN2 = overload {
V0 : Type ; V0 : Type ;
V0 : Type = V; V0 : Type = V;
mkV0 v = v ** {lock_V0 = <>} ; mkV0 v = v ** {lock_V0 = <>} ;
-}
-- pre-overload API and overload definitions -- pre-overload API and overload definitions
-- regN : Str ->Gender -> N ; -- regN : Str ->Gender -> N ;
@@ -389,12 +389,11 @@ mkN2 = overload {
regV=MorphoSwa.regV ; regV=MorphoSwa.regV ;
{-
mkV = overload {
mkV : Str -> V =\v ->lin V(regV v) ;
mkV : Str -> V -> V = prefixV
};
mkV = overload {
mkV : Str -> V = \v ->lin V(regV v) ;
mkV : Str -> V -> V = prefixV
};
prefixV : Str -> V -> V = \p,v -> lin V { s = \\b,vform => p + v.s! b ! vform } ; prefixV : Str -> V -> V = \p,v -> lin V { s = \\b,vform => p + v.s! b ! vform } ;
mkV2 = overload { mkV2 = overload {
@@ -418,7 +417,7 @@ mkN2 = overload {
mkV3 : V -> V3 = dirdirV3 ; mkV3 : V -> V3 = dirdirV3 ;
mkV3 : Str -> V3 = \v -> dirdirV3 (regV v) ; mkV3 : Str -> V3 = \v -> dirdirV3 (regV v) ;
} ; } ;
-}
mkConj = overload { mkConj = overload {
mkConj : Str -> Conj = \y -> mk2Conj [] y plural ; mkConj : Str -> Conj = \y -> mk2Conj [] y plural ;
mkConj : Str -> Number -> Conj = \y,n -> mk2Conj [] y n ; mkConj : Str -> Number -> Conj = \y,n -> mk2Conj [] y n ;