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

changed which from apa to yang mana, which is more correct

Browse Source
This commit is contained in:
Meowyam
2022-01-03 21:39:01 +08:00
committed by Inari Listenmaa
parent 4212850c9e
commit a310e38904
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/malay/StructuralMay.gf
View File

@@ -74,7 +74,7 @@ lin someSg_Det =
lin no_Quant = -} lin no_Quant = -}
lin that_Quant = mkQuant "itu" ; lin that_Quant = mkQuant "itu" ;
lin this_Quant = mkQuant "ini" ; lin this_Quant = mkQuant "ini" ;
lin which_IQuant = mkQuant "apa" ** {isPre = False} ; lin which_IQuant = mkQuant "yang mana" ** {isPre = False} ;
----- -----
-- NP -- NP
@@ -115,7 +115,6 @@ lin to_Prep = mkPrep "ke" ;
lin with_Prep = mkPrep "dengan" ; lin with_Prep = mkPrep "dengan" ;
-- lin without_Prep = mkPrep "" ; -- lin without_Prep = mkPrep "" ;
------- -------
-- Pron -- Pron
@@ -141,7 +140,7 @@ lin they_Pron = mkPron "mereka" P3 ;
-- lin although_Subj = -- lin although_Subj =
-- lin because_Subj = -- lin because_Subj =
lin if_Subj = ss "sekiranya" ; lin if_Subj = ss "sekiranya" ;
-- lin that_Subj = lin that_Subj = ss "yang" ;
lin when_Subj = ss "kalau" ; lin when_Subj = ss "kalau" ;

15
src/malay/unittest/questions.gftest
View File

@@ -1,10 +1,10 @@
Lang: IdetCN (IdetQuant which_IQuant (NumCard (NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n5)))))))) (UseN song_N) Lang: IdetCN (IdetQuant which_IQuant (NumCard (NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n5)))))))) (UseN song_N)
LangEng: which five songs LangEng: which five songs
LangMay: lima lagu apa LangMay: lima lagu yang mana
Lang: PhrUtt NoPConj (UttQS (UseQCl (TTAnt TPres ASimul) PPos (QuestSlash (IdetCN (IdetQuant which_IQuant NumPl) (UseN song_N)) (SlashVP (UsePron youPl_Pron) (SlashV2a like_V2))))) NoVoc Lang: PhrUtt NoPConj (UttQS (UseQCl (TTAnt TPres ASimul) PPos (QuestSlash (IdetCN (IdetQuant which_IQuant NumPl) (UseN song_N)) (SlashVP (UsePron youPl_Pron) (SlashV2a like_V2))))) NoVoc
LangEng: which songs do you like LangEng: which songs do you like
LangMay: kamu suka lagu-lagu apa LangMay: kamu suka lagu-lagu yang mana
Lang: PhrUtt NoPConj (UttQS (UseQCl (TTAnt TPres ASimul) PPos (QuestSlash (IdetCN how8many_IDet (UseN cat_N)) (SlashVP (UsePron youPl_Pron) (SlashV2a have_V2))))) NoVoc Lang: PhrUtt NoPConj (UttQS (UseQCl (TTAnt TPres ASimul) PPos (QuestSlash (IdetCN how8many_IDet (UseN cat_N)) (SlashVP (UsePron youPl_Pron) (SlashV2a have_V2))))) NoVoc
LangEng: how many cats do you have LangEng: how many cats do you have
@@ -28,7 +28,7 @@ LangMay: adakah awak tidak mengajar kucing
Lang: UseQCl (TTAnt TPres ASimul) PPos (QuestVP (IdetCN (IdetQuant which_IQuant NumSg) (UseN cat_N)) (ComplSlash (SlashV2a teach_V2) (UsePron he_Pron))) Lang: UseQCl (TTAnt TPres ASimul) PPos (QuestVP (IdetCN (IdetQuant which_IQuant NumSg) (UseN cat_N)) (ComplSlash (SlashV2a teach_V2) (UsePron he_Pron)))
LangEng: which cat teaches him LangEng: which cat teaches him
LangMay: kucing apa mengajar dia LangMay: kucing yang mana mengajar dia
Lang: UseQCl (TTAnt TPast ASimul) PPos (QuestIAdv where_IAdv (PredVP (UsePron youSg_Pron) (UseV go_V))) Lang: UseQCl (TTAnt TPast ASimul) PPos (QuestIAdv where_IAdv (PredVP (UsePron youSg_Pron) (UseV go_V)))
LangEng: where did you go LangEng: where did you go
@@ -37,3 +37,12 @@ LangMay: awak pergi mana
Lang: UseQCl (TTAnt TPast ASimul) PPos (QuestIAdv why_IAdv (PredVP (UsePron youSg_Pron) (UseV go_V))) Lang: UseQCl (TTAnt TPast ASimul) PPos (QuestIAdv why_IAdv (PredVP (UsePron youSg_Pron) (UseV go_V)))
LangEng: why did you go LangEng: why did you go
LangMay: mengapa awak pergi LangMay: mengapa awak pergi
Lang: UseQCl (TTAnt TPast ASimul) PNeg (QuestIAdv why_IAdv (PredVP (UsePron youSg_Pron) (UseV go_V)))
LangEng: why didn't you go
LangMay: mengapa awak tidak pergi
-- With ComplSlash: Wh-word is the object
Lang: UseQCl (TTAnt TPast ASimul) PPos (QuestSlash (IdetCN (IdetQuant which_IQuant NumSg) (UseN woman_N)) (SlashVP (UsePron youSg_Pron) (SlashV2a see_V2)))
LangEng: which woman did you see
LangMay : awak melihat perempuan yang mana