GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-27 08:58:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Som) minor typofixes

Browse Source
This commit is contained in:
Inari Listenmaa
2019-08-19 17:49:59 +02:00
parent 21a83b9591
commit 62eb0f84d1
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/somali/ExtendSom.gf
View File

@@ -6,7 +6,7 @@ concrete ExtendSom of Extend = CatSom
** open Prelude, ResSom in {
lin
-- : NP -> SSlash -> Utt ; -- her I love -- Sayeed p. 189-
-- : NP -> SSlash -> Utt ; -- her I love -- Saeed p. 189-
FocusObj np sslash = -- FIXME: preposition disappears in negative sentences
let ss = sslash.s ! False ;
ssSub = sslash.s ! True ; -- the negative particle is the same as subordinate, but verb forms come from main clause

2
src/somali/IdiomSom.gf
View File

@@ -34,7 +34,7 @@ concrete IdiomSom of Idiom = CatSom ** open Prelude, ResSom, VerbSom in {
--ProgrVP vp = vp ** { } ;
{- TODO: Sayeed p. 92 optative
{- TODO: Saeed p. 92 optative
-- : VP -> Utt ; -- let's go
ImpPl1 vp = { } ;

2
src/somali/NounSom.gf
View File

@@ -75,7 +75,7 @@ concrete NounSom of Noun = CatSom ** open ResSom, Prelude in {
-- : NP -> RS -> NP ; -- Paris, which is here
{- NB. technically, if the RS has undergone ConjRS, it could contain both
restrictive and appositive relative clauses. Quote Sayeed p.215-216:
restrictive and appositive relative clauses. Quote Saeed p.215-216:
"When multiple relative clauses occur, this formal distinction is
maintained, since in the only context both can occur, on nouns with
determiners, restrictives are joined by ee while appositives employ oo."

4
src/somali/ParamSom.gf
View File

@@ -253,7 +253,7 @@ oper
--------------------------------------------------------------------------------
-- Verbs
-- Sayeed p. 84-85
-- Saeed p. 84-85
-- Tense: Past/Present/Future
-- Aspect: Simple/Progressive/Habitual
-- Mood: Declarative/Imperative/Conditional/Optative/Potential
@@ -283,7 +283,7 @@ param
| VNegPast Aspect
| VPast Aspect VAgr
| VImp Number Polarity
| VRel GenNum {- Sayeed p. 95-96 + ch 8
| VRel GenNum {- Saeed p. 95-96 + ch 8
Reduced present general in relative clauses; as absolutive
1/2SG/3SG M/2PL/3PL suga (VRel MascSg)
3 SG F sugta (VRel FemSg)

2
src/somali/RelativeSom.gf
View File

@@ -9,7 +9,7 @@ lin
-- : RP -> VP -> RCl ;
{- NB. this works because vfSubord only puts different forms from vfStatement
in Pres,Simul,Pos. RelVP needs a third set of forms in Abs,Pres,Simul,Pos,
called "reduced present general" (Sayeed p. 95-96 + ch 8).
called "reduced present general" (Saeed p. 95-96 + ch 8).
These forms are found in VRel in VP, and aren't chosen by predVP, so we put
them in manually in RelVP.
-}

4
src/somali/ResSom.gf
View File

@@ -453,7 +453,7 @@ oper
} ;
Verb : Type = BaseVerb ** {
sii : Str ; -- closed class of particles: sii, soo, kala, wada (Sayeed 171)
sii : Str ; -- closed class of particles: sii, soo, kala, wada (Saeed 171)
dhex : Str ; -- closed class of adverbials: hoos, kor, dul, dhex, …
} ;
Verb2 : Type = Verb ** {c2 : Preposition} ;
@@ -819,7 +819,7 @@ oper
-- object pronoun, prepositions and negation all contract
} ;
stm : {p1,p2 : Str} = case cltyp of {
Subord => {p1 = if_then_Pol p [] "aan" ; -- if we form a ClSlash, no sentence type marker; negation with aan (Sayeed p. 210)
Subord => {p1 = if_then_Pol p [] "aan" ; -- if we form a ClSlash, no sentence type marker; negation with aan (Saeed p. 210)
p2 = if_then_Pol p subjpron []} ;
Question => {p1 = "ma" ; p2 = []} ; -- TODO find out how negative questions work
Statement => case <p,vp.pred,subj.a> of {

2
src/somali/SentenceSom.gf
View File

@@ -10,7 +10,7 @@ lin
-- : NP -> VP -> Cl
PredVP = predVP ;
-- : SC -> VP -> Cl ; -- that she goes is good (Sayeed p. 94)
-- : SC -> VP -> Cl ; -- that she goes is good (Saeed p. 94)
--PredSCVP sc vp = ;
--2 Clauses missing object noun phrases

2
src/somali/VerbSom.gf
View File

@@ -15,7 +15,7 @@ lin
ReflVP = ResSom.insertRefl ;
-- : VV -> VP -> VP ;
ComplVV vv vp = vp ** { -- check Sayeed p. 169
ComplVV vv vp = vp ** { -- check Saeed p. 169
s = vv.s ;
vComp = vp.vComp ++ vp.s ! VInf ;
pred = NoPred ;

18
src/somali/unittest/num.gftest
View File

@@ -1,28 +1,28 @@
-- LangEng: the two cats
LangSom: laba &+ da bisadood
LangSom: laba BIND da bisadood
Lang: PhrUtt NoPConj (UttNP (DetCN (DetQuant DefArt (NumCard (NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2)))))))) (UseN cat_N))) NoVoc
-- LangEng: those three men
LangSom: saddex &+ daas nin
LangSom: saddex BIND daas nin
Lang: PhrUtt NoPConj (UttNP (DetCN (DetQuant that_Quant (NumCard (NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3)))))))) (UseN man_N))) NoVoc
-- LangEng: my three fathers
LangSom: saddex &+ dayd &+ a aabbe
LangSom: saddex BIND dayd BIND a aabbe
Lang: PhrUtt NoPConj (UttNP (DetCN (DetQuant (PossPron i_Pron) (NumCard (NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3)))))))) (UseN2 father_N2))) NoVoc
-- LangEng: she is the first cat
LangSom: waa bisad &+ da kowaad
LangSom: waa bisad BIND da kowaad
Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron she_Pron) (UseComp (CompNP (DetCN (DetQuantOrd DefArt NumSg (OrdNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))))) (UseN cat_N))))))) NoVoc
-- LangEng: she is my first cat
LangSom: waa bisad &+ dayd &+ a kowaad
LangSom: waa bisad BIND dayd BIND a kowaad
Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron she_Pron) (UseComp (CompNP (DetCN (DetQuantOrd (PossPron i_Pron) NumSg (OrdNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))))) (UseN cat_N))))))) NoVoc
LangEng: he is my first father
LangSom: waa aabb &+ ahay kowaad
-- LangEng: he is my first father
LangSom: waa aabb BIND ahay kowaad
Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron he_Pron) (UseComp (CompNP (DetCN (DetQuantOrd (PossPron i_Pron) NumSg (OrdNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))))) (UseN2 father_N2))))))) NoVoc
-- LangEng: he is my first man
LangSom: waa nin &+ kayg &+ a kowaad
Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron he_Pron) (UseComp (CompNP (DetCN (DetQuantOrd (PossPron i_Pron) NumSg (OrdNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))))) (UseN man_N))))))) NoVoc
LangSom: waa nin BIND kayg BIND a kowaad
Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron he_Pron) (UseComp (CompNP (DetCN (DetQuantOrd (PossPron i_Pron) NumSg (OrdNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))))) (UseN man_N))))))) NoVoc