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

(Ara) Various fixes with nouns, compounding, attributes etc.

Browse Source
This commit is contained in:
Inari Listenmaa
2018-11-22 16:09:11 +01:00
parent 193e3af83b
commit 570d347efe
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/arabic/NounAra.gf
View File

@@ -99,7 +99,7 @@ lin
} ; } ;
PossPron p = { PossPron p = {
s = \\_,_,_,_ => p.s ! Gen; s = \\_,_,_,_ => BIND ++ p.s ! Gen;
d = Poss; d = Poss;
is1sg = case p.a.pgn of { Per1 Sing => True ; _ => False } ; is1sg = case p.a.pgn of { Per1 Sing => True ; _ => False } ;
isPron = True; isPron = True;
@@ -195,7 +195,7 @@ lin
-- : CN -> NP -> CN ; -- house of Paris, house of mine -- : CN -> NP -> CN ; -- house of Paris, house of mine
PossNP cn np = cn ** { PossNP cn np = cn ** {
s = \\n,_d,c => cn.s ! n ! Const ! c ; s = \\n,_d,c => cn.s ! n ! Const ! c ;
s2 = \\n,_d,c => cn.s2 ! n ! Const ! c ; s2 = \\n,_d,c => cn.s2 ! n ! Const ! Gen ; -- unsure about this /IL
np = \\c => cn.np ! c ++ np.s ! Gen np = \\c => cn.np ! c ++ np.s ! Gen
}; };

22
src/arabic/ParadigmsAra.gf
View File

@@ -71,7 +71,8 @@ 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 both parts inflect mkN : N -> N -> N ; -- Compound noun where attribute inflects in state and case but not number
mkN : Number -> N -> N -> N ; -- Compound noun where attribute 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 ;
} ; } ;
@@ -338,16 +339,21 @@ resource ParadigmsAra = open
= mkFullN ; = mkFullN ;
mkN : (root,sgPatt,brokenPlPatt : Str) -> Gender -> Species -> N -- broken plural mkN : (root,sgPatt,brokenPlPatt : Str) -> Gender -> Species -> N -- broken plural
= brkN ; = brkN ;
mkN : N -> (attr : Str) -> N -- Compound nouns mkN : N -> (attr : Str) -> N -- Compound nouns with noninflecting attribute
= \n,attr -> n ** {s2 = \\n,s,c => attr} ; = \n,attr -> n ** {s2 = \\n,s,c => attr} ;
mkN : N -> N -> N -- Compound nouns mkN : N -> N -> N -- Compound nouns where attribute inflects in state and case but not number
= \n1,n2 -> n1 ** { = attrN Sg ;
s = \\n,_,c => n1.s ! n ! Const ! c ; mkN : Number -> N -> N -> N -- Compound nouns where attribute inflects in state, case and number
s2 = \\n,s,c => n1.s2 ! n ! s ! c = attrN ;
++ n2.s ! n ! s ! c
++ n2.s2 ! n ! s ! c} ;
} ; } ;
attrN : Number -> N -> N -> N = \num,n1,n2 -> n1 ** {
s = \\n,_,c => n1.s ! n ! Const ! c ;
s2 = \\n,s,c => let c' = case c of {Dat => Gen; _ => c} in -- the Dat with liPrep hack only applies to the first word
n1.s2 ! num ! s ! c' -- attribute doesn't change
++ n2.s ! num ! s ! c'
++ n2.s2 ! 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.