1
0
forked from GitHub/gf-rgl

(Som) Rename internal opers, update adp.comb. list

source: Morgan Nilsson's list, add ?? for those that aren't there
This commit is contained in:
Inari Listenmaa
2023-03-11 22:37:16 +08:00
parent 0e09cf9b4a
commit 8a12362649
8 changed files with 154 additions and 136 deletions
+11 -10
View File
@@ -25,6 +25,7 @@ oper
masc : Gender ;
fem : Gender ;
-- Export the adposition type with the more usual/mainstream name Preposition
Preposition : Type ;
ka : Preposition ;
ku : Preposition ;
@@ -141,7 +142,7 @@ oper
mkAdv : Str -> Adv = \s -> lin Adv {
berri = s ;
c2 = noPrep ;
np = {s = [] ; a = P3_Prep} ;
np = {s = [] ; a = ZeroObj} ;
sii,dhex,miscAdv = []
} ;
@@ -172,12 +173,12 @@ oper
masc = Masc ;
fem = Fem ;
Preposition = ResSom.Preposition ;
Preposition = ResSom.Adposition ;
ka = ResSom.Ka ;
ku = ResSom.Ku ;
la = ResSom.La ;
u = ResSom.U ;
noPrep = ResSom.NoPrep ;
noPrep = ResSom.NoAdp ;
VVForm = ResSom.VVForm ;
infinitive = Infinitive ;
@@ -229,14 +230,14 @@ oper
mkV2 = overload {
mkV2 : Str -> V2 = \s -> lin V2 (regV s ** {c2 = noPrep}) ;
mkV2 : Str -> Preposition -> V2 = \s,p -> lin V2 (regV s ** {c2 = p}) ;
mkV2 : V -> Preposition -> V2 = \v,p -> lin V2 (v ** {c2 = p}) ;
mkV2 : Str -> Adposition -> V2 = \s,p -> lin V2 (regV s ** {c2 = p}) ;
mkV2 : V -> Adposition -> V2 = \v,p -> lin V2 (v ** {c2 = p}) ;
} ;
mkV3 = overload {
mkV3 : (sug : Str) -> V3 = \s -> lin V3 (regV s ** {c2,c3 = noPrep}) ;
mkV3 : (sug : Str) -> (_,_ : Preposition) -> V3 = \s,p,q -> lin V3 (regV s ** {c2 = p ; c3 = q}) ;
mkV3 : V -> (_,_ : Preposition) -> V2 = \v,p,q -> lin V3 (v ** {c2 = p ; c3 = q}) ;
mkV3 : (sug : Str) -> (_,_ : Adposition) -> V3 = \s,p,q -> lin V3 (regV s ** {c2 = p ; c3 = q}) ;
mkV3 : V -> (_,_ : Adposition) -> V2 = \v,p,q -> lin V3 (v ** {c2 = p ; c3 = q}) ;
} ;
mkVV = overload {
@@ -252,11 +253,11 @@ oper
} ;
mkV2S = overload {
mkV2S : Str -> V2S -- Predictable verb, no preposition.
mkV2S : Str -> V2S -- Predictable verb, no Adposition.
= \s -> lin V2S (regV s ** {c2 = noPrep}) ;
mkV2S : Str -> Preposition -> V2S -- Predictable verb, preposition given as second argument.
mkV2S : Str -> Adposition -> V2S -- Predictable verb, Adposition given as second argument.
= \s,pr -> lin V2S (regV s ** {c2 = pr}) ;
mkV2S : V -> Preposition -> V2S -- Unpredictable verb, preposition.
mkV2S : V -> Adposition -> V2S -- Unpredictable verb, Adposition.
= \v,pr -> lin V2S (v ** {c2 = pr})
} ;