From 6c5d0226d654b8fba29faa1860e203d3c07568dc Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 30 Mar 2010 21:48:24 +0000 Subject: [PATCH] moved phrases like 'I am hungry' from Greetings to Words to make them more general --- src/romance/ExtraRomance.gf | 2 ++ src/romance/ExtraRomanceAbs.gf | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/romance/ExtraRomance.gf b/src/romance/ExtraRomance.gf index 9bddb29f3..18b3cd56e 100644 --- a/src/romance/ExtraRomance.gf +++ b/src/romance/ExtraRomance.gf @@ -6,6 +6,8 @@ incomplete concrete ExtraRomance of ExtraRomanceAbs = CatRomance ** lin TPasseSimple = {s = []} ** {t = RPasse} ; --# notpresent + lin ComplCN v cn = insertComplement (\\_ => prepCase v.c2.c ++ cn.s ! Sg) (predV v) ; + lincat VPI = {s : Str} ; [VPI] = {s1,s2 : Str} ; diff --git a/src/romance/ExtraRomanceAbs.gf b/src/romance/ExtraRomanceAbs.gf index ff5263e98..e8a8e7daf 100644 --- a/src/romance/ExtraRomanceAbs.gf +++ b/src/romance/ExtraRomanceAbs.gf @@ -2,6 +2,7 @@ abstract ExtraRomanceAbs = Cat, Extra[ VPI,ListVPI,BaseVPI,ConsVPI,MkVPI,ComplVPIVV,ConjVPI, VV,VP,Conj] ** { - fun TPasseSimple : Tense ; --# notpresent - + fun + TPasseSimple : Tense ; --# notpresent + ComplCN : V2 -> CN -> VP ; -- j'ai soif }