1
0
forked from GitHub/gf-rgl

(Som) Minor cleanup/typofix

This commit is contained in:
Inari Listenmaa
2019-08-14 13:52:45 +02:00
parent d0ae81832b
commit 2240335832
3 changed files with 6 additions and 5 deletions

View File

@@ -116,9 +116,10 @@ oper
-- Like conjunctTable from prelude/Coordination.gf, -- Like conjunctTable from prelude/Coordination.gf,
-- but forces the first argument into absolutive. -- but forces the first argument into absolutive.
conjunctNPTable : ConjDistr -> ({s1,s2 : Case => Str} ** BaseNP) -> {s : Case => Str ; st : State} = \co,xs -> xs ** conjunctNPTable : ConjDistr -> ({s1,s2 : Case => Str} ** BaseNP) -> NP = \co,xs -> lin NP (xs' ** {
{s = -- TODO if xs is a pronoun, make them use (pronTable ! xs.a).sp s = \\c => co.s1 ++ xs.s1 ! Abs ++ co.s2 ! xs.st ++ xs.s2 ! c
table { cas => co.s1 ++ xs.s1 ! Abs ++ co.s2 ! xs.st ++ xs.s2 ! cas}} ; }) ;
conjunctRSTable : ConjDistr -> {s1,s2 : State => Gender => Case => Str} -> RS = \co,xs -> lin RS (xs ** { conjunctRSTable : ConjDistr -> {s1,s2 : State => Gender => Case => Str} -> RS = \co,xs -> lin RS (xs ** {
s = \\st,g,c => co.s1 s = \\st,g,c => co.s1
++ xs.s1 ! st ! g ! c ++ xs.s1 ! st ! g ! c

View File

@@ -52,7 +52,7 @@ oper
} where { } where {
allomF : Str -> DefTA = \wiilka -> allomF : Str -> DefTA = \wiilka ->
case wiilka of { case wiilka of {
_ + "ta" => DA ; _ + "sha" => SHA ; _ + "ta" => TA ; _ + "sha" => SHA ;
_ + "da" => DA ; _ + "dha" => DHA } ; _ + "da" => DA ; _ + "dha" => DHA } ;
allomM : Str -> DefKA = \wiilka -> allomM : Str -> DefKA = \wiilka ->
case wiilka of { case wiilka of {

View File

@@ -17,7 +17,7 @@ concrete PhraseSom of Phrase = CatSom ** open Prelude, ResSom in {
UttNP np = { s = np.s ! Abs} ; UttNP np = { s = np.s ! Abs} ;
UttVP vp = { s = infVP vp } ; UttVP vp = { s = infVP vp } ;
UttAdv adv = {s = linAdv adv} ; UttAdv adv = {s = linAdv adv} ;
UttCN n = {s = linCN n } ; UttCN n = {s = linCN n} ;
UttCard n = {s = n.s ! Mid} ; UttCard n = {s = n.s ! Mid} ;
UttAP ap = { s = ap.s ! AF Sg Abs } ; UttAP ap = { s = ap.s ! AF Sg Abs } ;
UttInterj i = i ; UttInterj i = i ;