fixed agreement to deal with Gender in exper/english

This commit is contained in:
aarne
2008-04-22 11:00:52 +00:00
parent 7e29773e50
commit b286c625a4
10 changed files with 83 additions and 60 deletions

View File

@@ -40,6 +40,7 @@ oper
human : Gender ;
nonhuman : Gender ;
masculine : Gender ;
feminine : Gender ;
-- To abstract over number names, we define the following.
@@ -81,6 +82,10 @@ oper
mkN : (man,men,man's,men's : Str) -> N ;
-- Change gender from the default $nonhuman$.
mkN : Gender -> N -> N ;
--3 Compound nouns
--
-- A compound noun is an uninflected string attached to an inflected noun,
@@ -346,7 +351,7 @@ oper
cnN3 = \n,p,q -> n ** {lock_N3 = <> ; c2 = p.s ; c3 = q.s} ;
regPN n = regGenPN n human ;
regGenPN n g = nameReg n g ** {lock_PN = <>} ;
regGenPN n g = nameReg n g ** {g = g ; lock_PN = <>} ;
nounPN n = {s = n.s ! singular ; g = n.g ; lock_PN = <>} ;
mk2A a b = mkAdjective a a a b ** {lock_A = <>} ;