forked from GitHub/gf-rgl
(Ara) use the bare form (no case ending) in UttAP/CN + small cleanup here and there
This commit is contained in:
@@ -168,7 +168,6 @@ lin
|
|||||||
a = {pgn = Per3 cn.g Sg ; isPron = False} ;
|
a = {pgn = Per3 cn.g Sg ; isPron = False} ;
|
||||||
empty = []} ;
|
empty = []} ;
|
||||||
|
|
||||||
|
|
||||||
UseN,
|
UseN,
|
||||||
UseN2 = useN ;
|
UseN2 = useN ;
|
||||||
Use2N3 n3 = n3 ;
|
Use2N3 n3 = n3 ;
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ resource ResAra = PatternsAra ** open Prelude, Predef, OrthoAra, ParamX in {
|
|||||||
|
|
||||||
AP : Type = {s : Species => Gender => NTable } ;
|
AP : Type = {s : Species => Gender => NTable } ;
|
||||||
uttAP : AP -> (Gender => Str) ;
|
uttAP : AP -> (Gender => Str) ;
|
||||||
uttAP ap = \\g => ap.s ! NoHum ! g ! Sg ! Def ! Nom ; ----IL
|
uttAP ap = \\g => ap.s ! NoHum ! g ! Sg ! Indef ! Bare ; ----IL
|
||||||
|
|
||||||
CN : Type = Noun ** {np : Case => Str};
|
CN : Type = Noun ** {np : Case => Str};
|
||||||
|
|
||||||
@@ -184,7 +184,7 @@ resource ResAra = PatternsAra ** open Prelude, Predef, OrthoAra, ParamX in {
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
uttNum : NumOrdCard -> (Gender => Str) ;
|
uttNum : NumOrdCard -> (Gender => Str) ;
|
||||||
uttNum n = \\g => n.s ! g ! Def ! Nom ; ----IL
|
uttNum n = \\g => n.s ! g ! Def ! Bare ; ----IL
|
||||||
|
|
||||||
param
|
param
|
||||||
VForm =
|
VForm =
|
||||||
@@ -1572,9 +1572,9 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf ->
|
|||||||
{ s = \\pgn,vf =>
|
{ s = \\pgn,vf =>
|
||||||
let gn = pgn2gn pgn in
|
let gn = pgn2gn pgn in
|
||||||
case vf of {
|
case vf of {
|
||||||
VPPerf => v.s ! (VPerf Act pgn);
|
VPPerf => v.s ! VPerf Act pgn ;
|
||||||
VPImpf m => v.s ! (VImpf m Act pgn);
|
VPImpf m => v.s ! VImpf m Act pgn ;
|
||||||
VPImp => v.s ! (VImp gn.g gn.n)
|
VPImp => v.s ! VImp gn.g gn.n
|
||||||
};
|
};
|
||||||
sc = noPrep ;
|
sc = noPrep ;
|
||||||
obj = emptyObj ;
|
obj = emptyObj ;
|
||||||
@@ -1587,8 +1587,8 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf ->
|
|||||||
let actVP = predV v in actVP ** {
|
let actVP = predV v in actVP ** {
|
||||||
s = \\pgn,vf =>
|
s = \\pgn,vf =>
|
||||||
case vf of {
|
case vf of {
|
||||||
VPPerf => v.s ! (VPerf Pas pgn) ;
|
VPPerf => v.s ! VPerf Pas pgn ;
|
||||||
VPImpf m => v.s ! (VImpf m Pas pgn) ;
|
VPImpf m => v.s ! VImpf m Pas pgn ;
|
||||||
_ => actVP.s ! pgn ! vf
|
_ => actVP.s ! pgn ! vf
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ concrete StructuralAra of Structural = CatAra **
|
|||||||
no_Utt = {s = \\_ => "لا"} ;
|
no_Utt = {s = \\_ => "لا"} ;
|
||||||
on_Prep = mkPrep "عَلَى" ;
|
on_Prep = mkPrep "عَلَى" ;
|
||||||
only_Predet = mkPredet "فَقَط" False;
|
only_Predet = mkPredet "فَقَط" False;
|
||||||
-- or_Conj = ss "ْر" ** {n = Sg} ;
|
or_Conj = ss "أَوْ" ** {n = Sg} ;
|
||||||
-- otherwise_PConj = ss "ْتهروِسي" ;
|
-- otherwise_PConj = ss "ْتهروِسي" ;
|
||||||
part_Prep = mkPrep "مِنَ" ;
|
part_Prep = mkPrep "مِنَ" ;
|
||||||
-- please_Voc = ss "ةلَسي" ;
|
-- please_Voc = ss "ةلَسي" ;
|
||||||
|
|||||||
Reference in New Issue
Block a user