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

(Ara) Add months + new mkN constructors to handle adjective modifiers

Browse Source
This commit is contained in:
Inari Listenmaa
2018-12-18 11:27:11 +01:00
parent 143977d552
commit 038cb2536f
2 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/arabic/ConstructionAra.gf
View File

@@ -29,7 +29,13 @@ lin
weekdayNextAdv, -- next Sunday weekdayNextAdv, -- next Sunday
weekdayLastAdv = weekdayPunctualAdv ; -- last Sunday weekdayLastAdv = weekdayPunctualAdv ; -- last Sunday
monthAdv m = SyntaxAra.mkAdv R.biPrep (mkNP (mkN month_Timeunit m)) ; monthAdv january =
let january_CN : CN = mkCN month_Timeunit (mkNP (mkPN january)) ;
january_NP : NP = R.emptyNP **
{s = \\c => R.cn2str january_CN R.Sg R.Const c ;
a = {pgn = R.Per3 january_CN.g R.Sg ; isPron = False}} ;
in SyntaxAra.mkAdv R.biPrep january_NP ;
yearAdv y = SyntaxAra.mkAdv in_Prep y ; yearAdv y = SyntaxAra.mkAdv in_Prep y ;
-- dummy -- dummy
@@ -105,18 +111,18 @@ lin friday_Weekday = mkN day_Timeunit (mkN "جُمْعَة") ;
lin saturday_Weekday = mkN day_Timeunit (mkN "سَبْت") ; lin saturday_Weekday = mkN day_Timeunit (mkN "سَبْت") ;
lin sunday_Weekday = mkN day_Timeunit (mkN "أَحَد") ; lin sunday_Weekday = mkN day_Timeunit (mkN "أَحَد") ;
lin january_Month = mkN (mkN "كَانُون") (mkN "ثَانِي") ; -- TODO: something wrong with "ثَانِي" lin january_Month = mkN (mkN "كَانُون") (mkAP (mkOrd (mkNumeral n2_Unit))) ;
lin february_Month = mkN "شُبَاط" ; lin february_Month = mkN "شُبَاط" ;
lin march_Month = mkN "March" ; lin march_Month = mkN "آذَار" ;
lin april_Month = mkN "April" ; lin april_Month = mkN "نَيْسَان" ;
lin may_Month = mkN "May" ; lin may_Month = mkN "أَيَّار" ;
lin june_Month = mkN "June" ; lin june_Month = mkN "حَزِيرَان" ;
lin july_Month = mkN "July" ; lin july_Month = mkN "تَمُّوز" ;
lin august_Month = mkN "August" ; lin august_Month = mkN "آب" ;
lin september_Month = mkN "September" ; lin september_Month = mkN "أَيْلُول" ;
lin october_Month = mkN "October" ; lin october_Month = mkN (mkN "تِشْرِين") (mkAP (mkOrd (mkNumeral n1_Unit))) ;
lin november_Month = mkN "November" ; lin november_Month = mkN (mkN "تِشْرِين") (mkAP (mkOrd (mkNumeral n2_Unit))) ;
lin december_Month = mkN "December" ; lin december_Month = mkN (mkN "كَانُون") (mkAP (mkOrd (mkNumeral n1_Unit))) ;
-- lin afrikaans_Language = mkLanguage "Afrikaans" ; -- lin afrikaans_Language = mkLanguage "Afrikaans" ;
-- lin amharic_Language = mkLanguage "Amharic" ; -- lin amharic_Language = mkLanguage "Amharic" ;

22
src/arabic/ParadigmsAra.gf
View File

@@ -27,7 +27,9 @@ resource ParadigmsAra = open
Predef, Predef,
Prelude, Prelude,
MorphoAra, MorphoAra,
OrthoAra,(ResAra=ResAra), OrthoAra,
(ResAra=ResAra),
(A=AdjectiveAra),
CatAra CatAra
in { in {
@@ -75,8 +77,10 @@ resource ParadigmsAra = open
mkN : NTable -> Gender -> Species -> N ; -- loan words, irregular mkN : NTable -> Gender -> Species -> N ; -- loan words, irregular
mkN : (root,sgPatt,brokenPlPatt : Str) -> Gender -> Species -> N ; -- broken plural mkN : (root,sgPatt,brokenPlPatt : Str) -> Gender -> Species -> N ; -- broken plural
mkN : N -> (attr : Str) -> N ; -- Compound noun with invariant attribute mkN : N -> (attr : Str) -> N ; -- Compound noun with invariant attribute
mkN : N -> N -> N ; -- Compound noun where attribute inflects in state and case. Attribute in singular. mkN : N -> N -> N ; -- Compound noun with singular genitive attribute, but inflects in state.
mkN : Number -> N -> N -> N ; -- Compound noun where attribute inflects in state and case. Attribute's number specified by 1st arg. mkN : Number -> N -> N -> N ; -- Compound noun with genitive attribute, but inflects in state. Attribute's number specified by 1st arg.
mkN : N -> A -> N ; -- Force adjective modifier into the noun. Adjective inflects in state, case and number.
mkN : N -> AP -> N ; -- Force AP modifier into the noun. AP inflects in state, case and number.
--- mkN : (root,sgPatt : Str) -> Gender -> Species -> N -- sound feminine plural --- mkN : (root,sgPatt : Str) -> Gender -> Species -> N -- sound feminine plural
--- = sdfN ; --- = sdfN ;
} ; } ;
@@ -360,6 +364,11 @@ resource ParadigmsAra = open
= attrN Sg ; = attrN Sg ;
mkN : Number -> N -> N -> N -- Compound nouns where attribute inflects in state, case and number mkN : Number -> N -> N -> N -- Compound nouns where attribute inflects in state, case and number
= attrN ; = attrN ;
mkN : N -> A -> N
= mkAN ;
mkN : N -> AP -> N
= mkAPN
} ; } ;
attrN : Number -> N -> N -> N = \num,n1,n2 -> n1 ** { attrN : Number -> N -> N -> N = \num,n1,n2 -> n1 ** {
@@ -368,6 +377,13 @@ resource ParadigmsAra = open
++ n2.s ! num ! s ! Gen ++ n2.s ! num ! s ! Gen
++ n2.s2 ! num ! s ! Gen} ; ++ n2.s2 ! num ! s ! Gen} ;
mkAN : N -> A -> N = \n,a -> mkAPN n (A.PositA a) ;
mkAPN : N -> AP -> N = \n,ap -> n ** {
s2 = \\num,s,c => n.s2 ! num ! s ! c
++ ap.s ! n.h ! n.g ! num ! s ! c
} ;
dualN : N -> N = \n -> n ** {isDual=True} ; dualN : N -> N = \n -> n ** {isDual=True} ;
proDrop : NP -> NP ; -- Force a NP to lose its string, only contributing with its agreement. proDrop : NP -> NP ; -- Force a NP to lose its string, only contributing with its agreement.