diff --git a/src/somali/ParadigmsSom.gf b/src/somali/ParadigmsSom.gf index fe847f498..a2df4b7d2 100644 --- a/src/somali/ParadigmsSom.gf +++ b/src/somali/ParadigmsSom.gf @@ -116,7 +116,7 @@ oper -- mkSubj : Str -> Bool -> Subj = \s,b -> -- lin Subj { } ; - mkAdv : Str -> Adv = \s -> lin Adv {s = s ; c2 = noPrep ; np = emptyNP} ; + mkAdv : Str -> Adv = \s -> lin Adv {s = s ; c2=noPrep ; np = emptyNP} ; mkAdV : Str -> AdV = \s -> lin AdV {s = s} ; @@ -146,11 +146,11 @@ oper fem = Fem ; Preposition = ResSom.Preposition ; - ka = ResSom.ka ; - ku = ResSom.ku ; - la = ResSom.la ; - u = ResSom.u ; - noPrep = ResSom.noPrep ; + ka = ResSom.Ka ; + ku = ResSom.Ku ; + la = ResSom.La ; + u = ResSom.U ; + noPrep = ResSom.NoPrep ; ------------------------ mkN = overload { diff --git a/src/somali/ParamSom.gf b/src/somali/ParamSom.gf index 25bd4dedb..bc0cdb248 100644 --- a/src/somali/ParamSom.gf +++ b/src/somali/ParamSom.gf @@ -156,34 +156,34 @@ param -- Prepositions param - Preposition = u | ku | ka | la | noPrep ; + Preposition = U | Ku | Ka | La | NoPrep ; PrepositionPlus = P Preposition | Passive ; -- Hack: RGL only supports V2s as passive, so I can reuse V2's preposition slot for passives as well, and save >200 parameters. (Don't ask.) - PrepCombination = ugu | uga | ula | kaga | kula | kala + PrepCombination = Ugu | Uga | Ula | Kaga | Kula | Kala | Single PrepositionPlus ; oper combine : PrepositionPlus -> Preposition -> PrepCombination = \p1,p2 -> let oneWay : PrepositionPlus => Preposition => PrepCombination = \\x,y => case of { - => Single Passive ; + => Single Passive ; => Single (P p) ; -- TODO check if this ever happens

=> case of { - => ugu ; - => uga ; - => ula ; - => kaga ; - => kula ; - => kala ; - => Single (P p) ; - => Single x ; + => Ugu ; + => Uga ; + => Ula ; + => Kaga ; + => Kula ; + => Kala ; + => Single (P p) ; + => Single x ; => Single x }} -- for trying both ways in case oneWay ! P p2 ! (pp2prep p1) of { Single _ => oneWay ! p1 ! p2 ; z => z } ; pp2prep : PrepositionPlus -> Preposition = \pp -> - case pp of {P p => p ; Passive => noPrep} ; + case pp of {P p => p ; Passive => NoPrep} ; -------------------------------------------------------------------------------- -- Verbs diff --git a/src/somali/ResSom.gf b/src/somali/ResSom.gf index 99ecc9e46..0ee9adf6d 100644 --- a/src/somali/ResSom.gf +++ b/src/somali/ResSom.gf @@ -325,51 +325,49 @@ oper prep : Preposition -> (Prep ** {c2 : Preposition}) = \p -> prepTable ! P p ** {c2 = p} ; prepTable : PrepositionPlus => Prep = table { - P ku => mkPrep "ku" "igu" "kugu" "nagu" "idinku" "lagu" ; - P ka => mkPrep "ka" "iga" "kaa" "naga" "idinka" "laga" ; - P la => mkPrep "la" "ila" "kula" "nala" "idinla" "lala" ; - P u => mkPrep "u" "ii" "kuu" "noo" "idiin" "loo" ; - P noPrep => mkPrep [] "i" "ku" "na" "idin" "la" ; + P Ku => mkPrep "ku" "igu" "kugu" "nagu" "idinku" "lagu" ; + P Ka => mkPrep "ka" "iga" "kaa" "naga" "idinka" "laga" ; + P La => mkPrep "la" "ila" "kula" "nala" "idinla" "lala" ; + P U => mkPrep "u" "ii" "kuu" "noo" "idiin" "loo" ; + P NoPrep => mkPrep [] "i" "ku" "na" "idin" "la" ; -- impersonal subject clitic combining with object clitics. Passive => mkPrep "la" "la i" "lagu" "nala" "laydin" "la" } ; prepCombTable : Agreement => PrepCombination => Str = table { - Sg1 => table { ugu => "iigu" ; uga => "iiga" ; - ula => "iila" ; kaga => "igaga" ; - kula => "igula" ; kala => "igala" ; + Sg1 => table { Ugu => "iigu" ; Uga => "iiga" ; + Ula => "iila" ; Kaga => "igaga" ; + Kula => "igula" ; Kala => "igala" ; Single p => (prepTable ! p).s ! Sg1 } ; - Sg2 => table { ugu => "kuugu" ; uga => "kaaga" ; - ula => "kuula" ; kaga => "kaaga" ; - kula => "kugula" ; kala => "kaala" ; + Sg2 => table { Ugu => "kuugu" ; Uga => "kaaga" ; + Ula => "kuula" ; Kaga => "kaaga" ; + Kula => "kugula" ; Kala => "kaala" ; Single p => (prepTable ! p).s ! Sg2 } ; Pl1 Excl => - table { ugu => "noogu" ; uga => "nooga" ; - ula => "noola" ; kaga => "nagaga" ; - kula => "nagula" ; kala => "nagala" ; + table { Ugu => "noogu" ; Uga => "nooga" ; + Ula => "noola" ; Kaga => "nagaga" ; + Kula => "nagula" ; Kala => "nagala" ; Single p => (prepTable ! p).s ! Pl1 Excl } ; Pl1 Incl => - table { ugu => "inoogu" ; uga => "inooga" ; - ula => "inoola" ; kaga => "inagaga" ; - kula => "inagula" ; kala => "inagala" ; + table { Ugu => "inoogu" ; Uga => "inooga" ; + Ula => "inoola" ; Kaga => "inagaga" ; + Kula => "inagula" ; Kala => "inagala" ; Single p => (prepTable ! p).s ! Pl1 Incl } ; - Pl2 => table { ugu => "idiinku" ; uga => "idiinka" ; - ula => "idiinla" ; kaga => "idinkaga" ; - kula => "idinkula" ; kala => "idinkala" ; + Pl2 => table { Ugu => "idiinku" ; Uga => "idiinka" ; + Ula => "idiinla" ; Kaga => "idinkaga" ; + Kula => "idinkula" ; Kala => "idinkala" ; Single p => (prepTable ! p).s ! Pl2 } ; Impers => - table { ugu => "loogu" ; uga => "looga" ; - ula => "loola" ; kaga => "lagaga" ; - kula => "lagula" ; kala => "lagala" ; + table { Ugu => "loogu" ; Uga => "looga" ; + Ula => "loola" ; Kaga => "lagaga" ; + Kula => "lagula" ; Kala => "lagala" ; Single p => (prepTable ! p).s ! Impers } ; - a => table { ugu => "ugu" ; uga => "uga" ; - ula => "ula" ; kaga => "kaga" ; - kula => "kula" ; kala => "kala" ; + a => table { Ugu => "ugu" ; Uga => "uga" ; + Ula => "ula" ; Kaga => "kaga" ; + Kula => "kula" ; Kala => "kala" ; Single p => (prepTable ! p).s ! a } } ; --- TODO: Negationen má `inte' skrivs samman med en föregående preposition. - -------------------------------------------------------------------------------- -- Adjectives @@ -631,8 +629,8 @@ oper comp = \\_ => <[],[]> ; pred = NoPred ; adv = [] ; - c2 = P noPrep ; - c3 = noPrep ; + c2 = P NoPrep ; + c3 = NoPrep ; obj2 = {s = [] ; a = Unassigned} ; secObj = [] } ; @@ -688,10 +686,10 @@ oper insertAdv : VerbPhrase -> Adverb -> VerbPhrase = \vp,adv -> case adv.c2 of { - noPrep => vp ** {adv = adv.s} ; -- The adverb is not formed with PrepNP + NoPrep => vp ** {adv = adv.s} ; -- The adverb is not formed with PrepNP prep => case of { -

=> insertComp (vp ** {c2 = P adv.c2}) adv.np ; -- should cover for obligatory argument that is not introduced with a preposition - <_ ,_ ,noPrep> => insertComp (vp ** {c3 = adv.c2}) adv.np ; +

=> insertComp (vp ** {c2 = P adv.c2}) adv.np ; -- should cover for obligatory argument that is not introduced with a preposition + <_ ,_ ,NoPrep> => insertComp (vp ** {c3 = adv.c2}) adv.np ; -- if complement slots are full, put preposition just as a string. TODO check word order. _ => vp ** {adv = (prepTable ! P adv.c2).s ! adv.np.a ++ adv.np.s ! Abs} } diff --git a/src/somali/VerbSom.gf b/src/somali/VerbSom.gf index d47df66d9..a90699265 100644 --- a/src/somali/VerbSom.gf +++ b/src/somali/VerbSom.gf @@ -96,7 +96,7 @@ lin -- : VP -> Prep -> VPSlash ; -- live in (it) -- NB. We need possibly a MissingArg kind of solution here too -- VPSlashPrep vp prep = vp ** - -- { c2 = case vp.c2 of { noPrep => prep.prep ; + -- { c2 = case vp.c2 of { NoPrep => prep.prep ; -- x => x }} ;