forked from GitHub/gf-rgl
Merge branch 'master' of github.com:GrammaticalFramework/gf-rgl
This commit is contained in:
@@ -70,6 +70,8 @@ oper
|
|||||||
_ => "لِ"
|
_ => "لِ"
|
||||||
}) Dat ;
|
}) Dat ;
|
||||||
biPrep : Preposition = mkPrefix "بِ" ;
|
biPrep : Preposition = mkPrefix "بِ" ;
|
||||||
|
kaPrep : Preposition = mkPrefix "كَ" ;
|
||||||
|
|
||||||
accPrep : Preposition = mkPreposition [] Acc ; -- default object case in VP
|
accPrep : Preposition = mkPreposition [] Acc ; -- default object case in VP
|
||||||
genPrep : Preposition = mkPreposition [] Gen ; -- default object case in N2
|
genPrep : Preposition = mkPreposition [] Gen ; -- default object case in N2
|
||||||
|
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ resource ParadigmsAra = open
|
|||||||
|
|
||||||
nisbaA : Str -> Adj ; -- Forms relative adjectives with the suffix ِيّ. Takes either the stem and adds يّ, or the whole word ending in يّ and just adds declension.
|
nisbaA : Str -> Adj ; -- Forms relative adjectives with the suffix ِيّ. Takes either the stem and adds يّ, or the whole word ending in يّ and just adds declension.
|
||||||
|
|
||||||
idaafaA : N -> A -> A ; -- Forms adjectives of type غَيْرُ طَيِّبٍ 'not good'. Noun is in construct state but inflects in case. Adjective is in genitive, but inflects in gender, number and state.
|
idaafaA : N -> A -> A ; -- Forms adjectives of type غَيْرُ لَذيذٍ 'not tasty'. Noun is in construct state but inflects in case. Adjective is in genitive, but inflects in gender, number and state.
|
||||||
|
|
||||||
degrA : (masc,fem,plur : Str) -> A ; -- Adjective where masculine singular is also the comparative form. Indeclinable singular, basic triptote declension for dual and plural.
|
degrA : (masc,fem,plur : Str) -> A ; -- Adjective where masculine singular is also the comparative form. Indeclinable singular, basic triptote declension for dual and plural.
|
||||||
|
|
||||||
@@ -202,6 +202,7 @@ resource ParadigmsAra = open
|
|||||||
|
|
||||||
liPrep : Prep ; -- The preposition لِ, binding to its head. Vowel assimilation and def. article elision implemented.
|
liPrep : Prep ; -- The preposition لِ, binding to its head. Vowel assimilation and def. article elision implemented.
|
||||||
biPrep : Prep ; -- The preposition بِ, binding to its head.
|
biPrep : Prep ; -- The preposition بِ, binding to its head.
|
||||||
|
kaPrep : Prep ; -- The preposition كَ, binding to its head.
|
||||||
noPrep : Prep ; -- No preposition at all, "complement case" is nominative.
|
noPrep : Prep ; -- No preposition at all, "complement case" is nominative.
|
||||||
|
|
||||||
--2 Conjunctions
|
--2 Conjunctions
|
||||||
@@ -375,6 +376,7 @@ resource ParadigmsAra = open
|
|||||||
noPrep = lin Prep ResAra.noPrep ;
|
noPrep = lin Prep ResAra.noPrep ;
|
||||||
biPrep = lin Prep ResAra.biPrep ;
|
biPrep = lin Prep ResAra.biPrep ;
|
||||||
liPrep = lin Prep ResAra.liPrep ;
|
liPrep = lin Prep ResAra.liPrep ;
|
||||||
|
kaPrep = lin Prep ResAra.kaPrep ;
|
||||||
|
|
||||||
casePrep : Case -> Prep = \c -> lin Prep {s=[]; c=c; binds=False} ;
|
casePrep : Case -> Prep = \c -> lin Prep {s=[]; c=c; binds=False} ;
|
||||||
|
|
||||||
|
|||||||
@@ -113,9 +113,15 @@ concrete VerbGer of Verb = CatGer ** open Prelude, ResGer, Coordination in {
|
|||||||
CompNP np = {s = \\_ => np.s ! False ! Nom ++ np.rc ; ext = np.ext} ;
|
CompNP np = {s = \\_ => np.s ! False ! Nom ++ np.rc ; ext = np.ext} ;
|
||||||
CompAdv a = {s = \\_ => a.s ; ext = []} ;
|
CompAdv a = {s = \\_ => a.s ; ext = []} ;
|
||||||
|
|
||||||
CompCN cn = {s = \\a => case numberAgr a of {
|
CompCN cn = {
|
||||||
Sg => "ein" + pronEnding ! GSg cn.g ! Nom ++ cn.s ! Strong ! Sg ! Nom ++ cn.rc ! Sg ; ---
|
s = let
|
||||||
Pl => cn.s ! Strong ! Pl ! Nom ++ cn.rc ! Pl ---
|
sg : Str = "ein" + pronEnding ! GSg cn.g ! Nom ++ cn.s ! Strong ! Sg ! Nom ++ cn.rc ! Sg ; ---
|
||||||
|
pl : Str = cn.s ! Strong ! Pl ! Nom ++ cn.rc ! Pl
|
||||||
|
in table {
|
||||||
|
AgPlPol => sg ;
|
||||||
|
a => case numberAgr a of {
|
||||||
|
Sg => sg ;
|
||||||
|
Pl => pl }
|
||||||
} ;
|
} ;
|
||||||
ext = cn.adv ++ cn.ext
|
ext = cn.adv ++ cn.ext
|
||||||
} ;
|
} ;
|
||||||
|
|||||||
Reference in New Issue
Block a user