GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-28 01:18:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Som) Fix word order in QuestVP

Browse Source
This commit is contained in:
Inari Listenmaa
2019-09-03 11:25:32 +02:00
parent 19ae07b9a7
commit c42d3e33e9
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/somali/QuestionSom.gf
View File

@@ -13,10 +13,10 @@ concrete QuestionSom of Question = CatSom ** open
let clRaw : ClLite = predVPlite ip vp ; let clRaw : ClLite = predVPlite ip vp ;
cl : ClLite = clRaw ** { cl : ClLite = clRaw ** {
stm = \\clt,p => case <clt,p> of { stm = \\clt,p => case <clt,p> of {
<Statement,Pos> => "baa" ; <_,Pos> => "baa" ;
_ => clRaw.stm ! clt ! p } _ => clRaw.stm ! clt ! p }
} }
in wordOrderLite Statement cl ; in wordOrderLite Question cl ;
-- : IP -> ClSlash -> QCl ; -- whom does John love -- : IP -> ClSlash -> QCl ; -- whom does John love
--QuestSlash ip cls = ; --QuestSlash ip cls = ;

21
src/somali/ResSom.gf
View File

@@ -1011,21 +1011,27 @@ oper
<Statement,Neg> -- object pronoun and prepositions contract with negation <Statement,Neg> -- object pronoun and prepositions contract with negation
=> {p2 = [] ; p1 = cl.comp.p1 ++ cl.comp.p2 ++ bind} ; => {p2 = [] ; p1 = cl.comp.p1 ++ cl.comp.p2 ++ bind} ;
_ => cl.comp } ; _ => cl.comp } ;
statementNounObj = case cltyp of {
Statement => obj.p1 ;
_ => [] } ;
subordNounObj = case cltyp of {
Subord => obj.p1 ; -- noun object if it's subordinate clause
_ => [] } ;
questionNounObj = case cltyp of {
Question => obj.p1 ; -- noun object if it's subordinate clause
_ => [] } ;
pred = cl.pred ! cltyp ! t ! a ! p in pred = cl.pred ! cltyp ! t ! a ! p in
cl.berri -- AdV cl.berri -- AdV
++ cl.subj.noun -- subject if it's a noun ++ cl.subj.noun -- subject if it's a noun
++ case cltyp of { ++ statementNounObj -- noun object if it's a statement
Subord => [] ;
_ => obj.p1 } -- noun object if it's a statement
++ cl.stm ! cltyp ! p -- STM ++ cl.stm ! cltyp ! p -- STM
++ cl.vComp.subjunc -- "waa in" construction ++ cl.vComp.subjunc -- "waa in" construction
++ cl.subj.pron ++ cl.subj.pron -- subject pronoun
++ case cltyp of {
Subord => obj.p1 ; -- noun object if it's subordinate clause ++ subordNounObj -- noun object if it's subordinate clause
_ => [] }
++ obj.p2 -- object if it's a pronoun ++ obj.p2 -- object if it's a pronoun
++ cl.sii -- restricted set of particles ++ cl.sii -- restricted set of particles
++ cl.dhex -- restricted set of nouns/adverbials ++ cl.dhex -- restricted set of nouns/adverbials
@@ -1033,6 +1039,7 @@ oper
++ cl.vComp.inf -- VV complement, if it's infinitive ++ cl.vComp.inf -- VV complement, if it's infinitive
++ pred.inf -- potential infinitive/participle ++ pred.inf -- potential infinitive/participle
++ pred.fin -- the verb inflected ++ pred.fin -- the verb inflected
++ questionNounObj -- noun object if it's a question
++ cl.vComp.subcl -- VV complement, if it's subordinate clause ++ cl.vComp.subcl -- VV complement, if it's subordinate clause
++ cl.miscAdv ---- NB. Only used if there are several adverbs, or for "waa in" construction. ++ cl.miscAdv ---- NB. Only used if there are several adverbs, or for "waa in" construction.
} ; ---- Primary places for adverbs are obj, sii or dhex. } ; ---- Primary places for adverbs are obj, sii or dhex.