mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-28 01:18:57 -06:00
(Ara) misc. small fixes and cleanup
This commit is contained in:
@@ -15,7 +15,6 @@ oper DetNP : Det -> NP = notYet "DetNP" ;
|
|||||||
oper ExistIP : IP -> QCl = notYet "ExistIP" ;
|
oper ExistIP : IP -> QCl = notYet "ExistIP" ;
|
||||||
oper FunRP : Prep -> NP -> RP -> RP = notYet "FunRP" ;
|
oper FunRP : Prep -> NP -> RP -> RP = notYet "FunRP" ;
|
||||||
oper ImpPl1 : VP -> Utt = notYet "ImpPl1" ;
|
oper ImpPl1 : VP -> Utt = notYet "ImpPl1" ;
|
||||||
oper ImpersCl : VP -> Cl = notYet "ImpersCl" ;
|
|
||||||
oper PConjConj : Conj -> PConj = notYet "PConjConj" ;
|
oper PConjConj : Conj -> PConj = notYet "PConjConj" ;
|
||||||
oper PPartNP : NP -> V2 -> NP = notYet "PPartNP" ;
|
oper PPartNP : NP -> V2 -> NP = notYet "PPartNP" ;
|
||||||
oper PredSCVP : SC -> VP -> Cl = notYet "PredSCVP" ;
|
oper PredSCVP : SC -> VP -> Cl = notYet "PredSCVP" ;
|
||||||
|
|||||||
@@ -551,7 +551,9 @@ resource ParadigmsAra = open
|
|||||||
|
|
||||||
brkN' : Str -> Str -> Str -> Gender -> Species -> N =
|
brkN' : Str -> Str -> Str -> Gender -> Species -> N =
|
||||||
\root,sg,pl,gen,spec ->
|
\root,sg,pl,gen,spec ->
|
||||||
let { kitAb = mkWord sg root;
|
let { kitAb = case root of {
|
||||||
|
? + ? + "ي" => mkDefectiveAlifMaqsura (mkPat sg) (mkRoot3 root) ;
|
||||||
|
_ => mkWord sg root };
|
||||||
kutub = mkWord pl root
|
kutub = mkWord pl root
|
||||||
} in mkFullN (reg kitAb kutub) gen spec;
|
} in mkFullN (reg kitAb kutub) gen spec;
|
||||||
|
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ oper
|
|||||||
--PerfAct, PerfPas, ImpfAct, ImpfPas, Imp, PPart
|
--PerfAct, PerfPas, ImpfAct, ImpfPas, Imp, PPart
|
||||||
verb : (_,_,_,_,_,_ : Str) -> Verb =
|
verb : (_,_,_,_,_,_ : Str) -> Verb =
|
||||||
\katab,kutib,aktub,uktab,euktub,maktUb -> {
|
\katab,kutib,aktub,uktab,euktub,maktUb -> {
|
||||||
s = table {
|
s = \\vf => rectifyHmz (case vf of {
|
||||||
VPerf Act pgn => katab + suffixPerf ! pgn ;
|
VPerf Act pgn => katab + suffixPerf ! pgn ;
|
||||||
VPerf Pas pgn => kutib + suffixPerf ! pgn ;
|
VPerf Pas pgn => kutib + suffixPerf ! pgn ;
|
||||||
VImpf Ind Act pgn => prefixImpf!pgn + aktub + suffixImpfInd !pgn;
|
VImpf Ind Act pgn => prefixImpf!pgn + aktub + suffixImpfInd !pgn;
|
||||||
@@ -230,7 +230,7 @@ oper
|
|||||||
VImpf m Pas pgn => prefixImpf !pgn + uktab + suffixImpfCJ m !pgn;
|
VImpf m Pas pgn => prefixImpf !pgn + uktab + suffixImpfCJ m !pgn;
|
||||||
VImp g n => euktub + suffixImpfCJ Jus ! (Per2 g n);
|
VImp g n => euktub + suffixImpfCJ Jus ! (Per2 g n);
|
||||||
VPPart => maktUb
|
VPPart => maktUb
|
||||||
}
|
})
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
--affixes of sound verbs
|
--affixes of sound verbs
|
||||||
|
|||||||
@@ -12,23 +12,8 @@ concrete SentenceAra of Sentence = CatAra ** open
|
|||||||
flags optimize=all_subs ; coding=utf8 ;
|
flags optimize=all_subs ; coding=utf8 ;
|
||||||
|
|
||||||
lin
|
lin
|
||||||
{-
|
|
||||||
PredVP np vp =
|
|
||||||
{ s = \\t,p,o =>
|
|
||||||
case o of {
|
|
||||||
Verbal =>
|
|
||||||
case vp.comp.a.isPron of {
|
|
||||||
False => vp.s ! t ! p ! Verbal ! np.a ++ np.s ! Nom ++ vp.comp.s ! Acc ;
|
|
||||||
True => vp.s ! t ! p ! Verbal ! np.a ++ vp.comp.s ! Acc ++ np.s ! Nom
|
|
||||||
};
|
|
||||||
Nominal =>
|
|
||||||
np.s ! Nom ++ vp.s ! t ! p ! Nominal ! np.a ++ vp.comp.s ! Acc
|
|
||||||
}
|
|
||||||
};
|
|
||||||
-}
|
|
||||||
PredVP = predVP ;
|
|
||||||
|
|
||||||
-- PredSCVP sc vp = mkClause sc.s (agrP3 Sg) vp ;
|
PredVP = predVP ;
|
||||||
|
|
||||||
ImpVP vp = {
|
ImpVP vp = {
|
||||||
s = \\p,g,n =>
|
s = \\p,g,n =>
|
||||||
@@ -57,11 +42,9 @@ concrete SentenceAra of Sentence = CatAra ** open
|
|||||||
|
|
||||||
-- SlashVS np vs sslash = TODO
|
-- SlashVS np vs sslash = TODO
|
||||||
|
|
||||||
|
EmbedS s = {s = "أَنْ" ++ s.s ! Verbal} ;
|
||||||
EmbedS s = {s = "أَنْ" ++ s.s ! Verbal} ;
|
EmbedQS qs = {s = qs.s ! QIndir} ;
|
||||||
EmbedQS qs = {s = qs.s ! QIndir} ;
|
EmbedVP vp = {s = uttVP vp ! Masc} ;
|
||||||
EmbedVP vp = {s = uttVP vp ! Masc} ;
|
|
||||||
|
|
||||||
|
|
||||||
UseCl t p cl =
|
UseCl t p cl =
|
||||||
{s = \\o => t.s ++ p.s ++
|
{s = \\o => t.s ++ p.s ++
|
||||||
|
|||||||
Reference in New Issue
Block a user