1
0
forked from GitHub/gf-core

animacy is now used in syntax as well

This commit is contained in:
krasimir
2016-08-30 08:30:04 +00:00
parent 436d957684
commit a14c81c619
5 changed files with 9 additions and 9 deletions

View File

@@ -4,16 +4,16 @@ concrete AdjectiveSlv of Adjective = CatSlv ** open ResSlv in {
PositA a = {
s = \\spec,g,c,n =>
case <spec,g,n,c> of {
<Def,Masc,Sg,Nom> => a.s ! APositDefNom ;
<Def,Masc,Sg,Acc> => a.s ! APositDefAcc ;
_ => a.s ! APosit g n c
<Def,AMasc _, Sg,Nom> => a.s ! APositDefNom ;
<_,AMasc Animate,Sg,Acc> => a.s ! APosit Masc Sg Gen ;
_ => a.s ! APosit (agender2gender g) n c
}
} ;
UseComparA a = {
s = \\spec,g,c,n =>
case <spec,g,n,c> of {
<Def,Masc,Sg,Acc> => a.s ! AComparDefAcc ;
_ => a.s ! ACompar g n c
<Def,AMasc _,Sg,Acc> => a.s ! AComparDefAcc ;
_ => a.s ! ACompar (agender2gender g) n c
}
} ;

View File

@@ -14,7 +14,7 @@ lincat
Comp = {s : Agr => Str} ;
-- Adjective
AP = {s : Species => Gender => Case => Number => Str} ;
AP = {s : Species => AGender => Case => Number => Str} ;
-- Noun
CN = {s : Species => Case => Number => Str; g : AGender} ;

View File

@@ -30,6 +30,6 @@ concrete ConjunctionSlv of Conjunction =
lincat
[NP] = {s1,s2 : Case => Str; a : Agr} ;
[AP] = {s1,s2 : Species => Gender => Case => Number => Str} ;
[AP] = {s1,s2 : Species => AGender => Case => Number => Str} ;
}

View File

@@ -59,7 +59,7 @@ concrete NounSlv of Noun = CatSlv ** open ResSlv in {
UseN n = {s = \\_ => n.s; g = n.g} ;
AdjCN ap cn = {
s = \\spec,c,n => ap.s ! spec ! agender2gender cn.g ! c ! n ++ cn.s ! Indef ! c ! n ;
s = \\spec,c,n => ap.s ! spec ! cn.g ! c ! n ++ cn.s ! Indef ! c ! n ;
g = cn.g
} ;
AdvCN cn ad = {s = \\spec,c,n => cn.s ! spec ! c ! n ++ ad.s ; g = cn.g} ;

View File

@@ -14,7 +14,7 @@ concrete PhraseSlv of Phrase = CatSlv ** open Prelude, ResSlv in {
UttAdv adv = adv ;
UttCN n = {s = n.s ! Indef ! Nom ! Sg} ;
UttCard n = {s = n.s ! Fem ! Nom} ;
UttAP ap = {s = ap.s ! Indef ! Masc ! Nom ! Sg} ;
UttAP ap = {s = ap.s ! Indef ! AMasc Inanimate ! Nom ! Sg} ;
UttInterj i = i ;
NoPConj = {s = []} ;