msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

(Ara) refactor sound verb constructors; reuse v1sound for v7sound

Browse Source
This commit is contained in:
Inari Listenmaa
2019-01-01 17:48:37 +02:00
parent 447126c713
commit d8debc25c4
1 changed files with 71 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/arabic/ResAra.gf
View File

@@ -98,7 +98,7 @@ resource ResAra = PatternsAra ** open Prelude, Predef, OrthoAra, ParamX in {
let pat = mkPat pS in let pat = mkPat pS in
case pS of { case pS of {
w + "ف" + x + "ع" + y + "ل" + z => w + "ف" + x + "ع" + y + "ل" + z =>
case rS of { case rS of { -- TODO: reconsider shadda, maybe handling it should be moved 100% to ParadigmsAra /IL 2019-01-01
x@? + y@? + "ّ" => mkStrong pat (mkRoot3 (x+y+y)) ; -- In principle, shadda shouldn't be in the root when dealing with strong inflection, but if someone puts one, this should fix it. /IL x@? + y@? + "ّ" => mkStrong pat (mkRoot3 (x+y+y)) ; -- In principle, shadda shouldn't be in the root when dealing with strong inflection, but if someone puts one, this should fix it. /IL
_ => mkStrong pat (mkRoot3 rS) } ; _ => mkStrong pat (mkRoot3 rS) } ;
w + "ف" + x + "ع" + y => w + "ف" + x + "ع" + y =>
@@ -219,7 +219,7 @@ oper
--macro for sound verb --macro for sound verb
--PerfAct, PerfPas, ImpfAct, ImpfPas, Imp, PPart --PerfAct, PerfPas, ImpfAct, ImpfPas, Imp, PPart
verb : (_,_,_,_,_,_ : Str) -> Verb = verb : (x1,_,_,_,_,x6 : Str) -> Verb =
\katab,kutib,aktub,uktab,euktub,maktUb -> { \katab,kutib,aktub,uktab,euktub,maktUb -> {
s = \\vf => rectifyHmz (case vf of { s = \\vf => rectifyHmz (case vf of {
VPerf Act pgn => katab + suffixPerf ! pgn ; VPerf Act pgn => katab + suffixPerf ! pgn ;
@@ -232,7 +232,14 @@ oper
VPPart => maktUb VPPart => maktUb
}) })
} ; } ;
verb' : SoundForms -> Verb = \vforms ->
let katab = vforms ! 0 ;
kutib = vforms ! 1 ;
aktub = vforms ! 2 ;
uktab = vforms ! 3 ;
euktub = vforms ! 4 ;
maktUb = vforms ! 5 ;
in verb katab kutib aktub uktab euktub maktUb ;
--affixes of sound verbs --affixes of sound verbs
suffixPerf : PerGenNum => Str = suffixPerf : PerGenNum => Str =
@@ -462,7 +469,7 @@ oper
--now is used for the sound, assimilated (weak C1), and when C1 = hamza: --now is used for the sound, assimilated (weak C1), and when C1 = hamza:
v1sound : Root3 -> Vowel -> Vowel -> Verb = v1soundForms : Root3 -> Vowel -> Vowel -> SoundForms =
\fcl,vowPerf,vowImpf -> \fcl,vowPerf,vowImpf ->
let { let {
qf = {f = fcl.c ; c = fcl.l} ; qf = {f = fcl.c ; c = fcl.l} ;
@@ -482,7 +489,10 @@ v1sound : Root3 -> Vowel -> Vowel -> Verb =
}; };
maktUb = mkStrong mafcUl fcl maktUb = mkStrong mafcUl fcl
} in } in
verb katab kutib aktub uktab euktub maktUb ; toSoundForms katab kutib aktub uktab euktub maktUb ;
v1sound : Root3 -> Vowel -> Vowel -> Verb = \fcl,vp,vi ->
verb' (v1soundForms fcl vp vi) ;
v1hollow : Root3 -> Vowel -> Verb = v1hollow : Root3 -> Vowel -> Verb =
\xwf,vowImpf -> \xwf,vowImpf ->
@@ -522,8 +532,11 @@ fvc : Vowel => Pattern =
a => fac a => fac
} ; } ;
v1geminate : Str -> Vowel -> Vowel -> Verb = v1geminate : Str -> Vowel -> Vowel -> Verb =
\r,vp,vi ->
verbGeminate (v1geminateForms r vp vi) ;
v1geminateForms : Str -> Vowel -> Vowel -> DefForms =
\rootStr,vowPerf,vowImpf -> \rootStr,vowPerf,vowImpf ->
let { let {
mdd = mkRoot3 rootStr ; --fcc mdd = mkRoot3 rootStr ; --fcc
@@ -540,9 +553,8 @@ v1geminate : Str -> Vowel -> Vowel -> Verb =
umdad = "ُ" + mkStrong fcal mdd ; umdad = "ُ" + mkStrong fcal mdd ;
Umdud = (prefixImp ! vowImpf) + mdud; Umdud = (prefixImp ! vowImpf) + mdud;
mamdUd = mkStrong mafcUl mdd mamdUd = mkStrong mafcUl mdd
} in verbGeminate (toDefForms } in toDefForms madd madad mudd mudid amudd amdud
madd madad mudd mudid amudd amdud umadd umdad Umdud mudd' mamdUd ;
umadd umdad Umdud mudd' mamdUd) ;
patGem1 : Vowel => Pattern = patGem1 : Vowel => Pattern =
table { table {
@@ -568,16 +580,23 @@ patGem3 : Vowel => Pattern =
-- IL -- Defective, hollow and geminate verbs all need 11 forms. -- IL -- Defective, hollow and geminate verbs all need 11 forms.
{- NB. the numbers don't always refer to the same forms! {- NB. the numbers don't always refer to the same forms!
The verb(Def|Hollow|Geminate) constructors pick the right forms. -} The verb(Def|Hollow|Geminate) constructors pick the right forms. -}
SoundForms : Type = Predef.Ints 5 => Str ;
DefForms : Type = Predef.Ints 10 => Str ; DefForms : Type = Predef.Ints 10 => Str ;
toSoundForms : (x1,_,_,_,_,x6 : Str) -> SoundForms =
\a,b,c,d,e,f ->
table {
0 => a ; 1 => b ; 2 => c ; 3 => d ; 4 => e ; 5 => f
} ;
toDefForms : (x1,_,_,_,_,_,_,_,_,_,x11 : Str) -> DefForms = toDefForms : (x1,_,_,_,_,_,_,_,_,_,x11 : Str) -> DefForms =
\a,b,c,d,e,f,g,h,i,j,k -> \a,b,c,d,e,f,g,h,i,j,k ->
table { table {
0 => a ; 1 => b ; 2 => c ; 3 => d ; 4 => e ; 5 => f ; 6 => g ; 0 => a ; 1 => b ; 2 => c ; 3 => d ; 4 => e ; 5 => f ;
7 => h ; 8 => i ; 9 => j ; 10 => k 6 => g ; 7 => h ; 8 => i ; 9 => j ; 10 => k
} ; } ;
v1DefForms_perfA : Root3 -> Vowel -> DefForms = \rmy,vowImpf -> v1defForms_perfA : Root3 -> Vowel -> DefForms = \rmy,vowImpf ->
let { let {
_rmi = mkDefective (patDef1 ! vowImpf) rmy ; _rmi = mkDefective (patDef1 ! vowImpf) rmy ;
_rmu = mkDefective (patDef2 ! vowImpf) rmy ; _rmu = mkDefective (patDef2 ! vowImpf) rmy ;
@@ -595,11 +614,11 @@ v1DefForms_perfA : Root3 -> Vowel -> DefForms = \rmy,vowImpf ->
} in toDefForms rama ramay rumi rumu rumiy armi armu urma eirmi eirmu marmiy ; } in toDefForms rama ramay rumi rumu rumiy armi armu urma eirmi eirmu marmiy ;
v1defective_a : Root3 -> Vowel -> Verb = \rmy,vowImpf -> v1defective_a : Root3 -> Vowel -> Verb = \rmy,vowImpf ->
let vforms = v1DefForms_perfA rmy vowImpf let vforms = v1defForms_perfA rmy vowImpf
in verbDef vforms vowImpf ; in verbDef vforms vowImpf ;
v1defective_i : Root3 -> Vowel -> Verb = \bqy,vowImpf -> -- IL (conjugation 1d4) v1defective_i : Root3 -> Vowel -> Verb = \bqy,vowImpf -> -- IL (conjugation 1d4)
let vforms_a = v1DefForms_perfA bqy vowImpf ; let vforms_a = v1defForms_perfA bqy vowImpf ;
baqI = mkDefective facIl bqy ; baqI = mkDefective facIl bqy ;
baqiy = mkDefective facil bqy ; baqiy = mkDefective facil bqy ;
vforms_i = table { 0 => baqI ; vforms_i = table { 0 => baqI ;
@@ -609,8 +628,8 @@ v1defective_i : Root3 -> Vowel -> Verb = \bqy,vowImpf -> -- IL (conjugation 1d4)
v1doubleweak : Root3 -> Verb = \r'y -> v1doubleweak : Root3 -> Verb = \r'y ->
let ry = r'y ** {c = ""} ; let ry = r'y ** {c = ""} ;
vforms_doubleweak : DefForms = \\x => rmSukun (v1DefForms_perfA ry a ! x) ; -- only remove the first sukun vforms_doubleweak : DefForms = \\x => rmSukun (v1defForms_perfA ry a ! x) ; -- only remove the first sukun
vforms_weak : DefForms = v1DefForms_perfA r'y a ; vforms_weak : DefForms = v1defForms_perfA r'y a ;
vforms = table { 0 => vforms_weak ! 0 ; -- all perfect forms vforms = table { 0 => vforms_weak ! 0 ; -- all perfect forms
1 => vforms_weak ! 1 ; 1 => vforms_weak ! 1 ;
2 => vforms_weak ! 2 ; 2 => vforms_weak ! 2 ;
@@ -751,32 +770,41 @@ v6sound : Root3 -> Verb =
mutafAqam = "م" + utafAqam mutafAqam = "م" + utafAqam
} in verb tafAqam tufUqim atafAqam utafAqam tafAqam mutafAqam; } in verb tafAqam tufUqim atafAqam utafAqam tafAqam mutafAqam;
-- v7sound : Root3 -> Verb = -- TODO 7s v7sound : Root3 -> Verb = \fcl ->
-- \fcl -> let vforms = v1soundForms fcl a i ;
-- let { _nfacil = "نْ" + mkStrong facil fcl ;
-- _facal = mkStrong facal fcl ; infacal = "اِنْ" + vforms ! 0 ;
-- _facil = mkStrong facil fcl; anfacil = "َ" + _nfacil ;
-- infacal = "اِنْ" + _facal ; -- VPerf Act infacil = "اِ" + _nfacil ;
-- ; -- VPerf Pas munfacil = "مُ" + _nfacil ;
-- anfacil = "َنْ" + _facil ; -- VImpf _ Act in verb' (table {
-- ; -- VImpf _ Pas 0 => infacal ;
-- ; -- VImp 2 => anfacil ;
-- -- VPPart 4 => infacil ;
-- } in 5 => munfacil ;
-- verb ; n => "ُنْ" + vforms ! n -- doesn't exist for form 7
}) ;
v7geminate : Root3 -> Verb = -- IL 7g -- very likely wrong v7geminate : Str -> Verb = \fcl ->
\fcl -> let vforms = v1geminateForms fcl a i ;
let { _nfacc = "نْ" + vforms ! 0 ;
_nfacc = "نْ" + mkHollow facc fcl ; _nfacic = "نْ" + mkStrong facil (mkRoot3 fcl) ;
infacal = "اِنْ" + mkStrong facal fcl ; -- VPerf Act -- TODO use another constructor, this is wrong for 3rd person infacc = "اِ" + _nfacc ; -- VPerf Act
unfucc = "اُنْ" + mkHollow fucc fcl ; -- VPerf Pas infacac = "اِنْ" + vforms ! 1 ; -- VPerf Act Pl3F
anfacc = "َ" + _nfacc ; -- VImpf _ Act anfacc = "َ" + _nfacc ; -- VImpf Act
unfacc = "ُ" + _nfacc ; -- VImpf _ Pas anfacic = "َ" + _nfacic ; -- VImpf Act Pl3F
infacc = "اِ" + _nfacc ; -- VImp infacic = "اِ" + _nfacic ; -- VImp PlF
munfacc = "مُ" +_nfacc -- VPPart munfacc = "مُ" + _nfacc ; -- VPPart
} in in verbGeminate (table {
verb infacal unfucc anfacc unfacc infacc munfacc ; 0 => infacc ;
1 => infacac ;
4 => anfacc ;
5 => anfacic ;
8 => infacc ;
9 => infacic ;
10 => munfacc ;
n => "ُنْ" + vforms ! n -- doesn't exist for form 7
}) ;
v8sound : Root3 -> Verb = v8sound : Root3 -> Verb =
\rbT -> \rbT ->