From f7aed275d3bdac5ae1e48daeb801ed30b4df96bb Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 5 Nov 2008 10:22:09 +0000 Subject: distinguished know_VS and know_V2 in Lexicon; patched Italian imperatives (not quite finished yet) --- next-lib/src/italian/DiffIta.gf | 11 +++++------ next-lib/src/italian/LexiconIta.gf | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'next-lib/src/italian') diff --git a/next-lib/src/italian/DiffIta.gf b/next-lib/src/italian/DiffIta.gf index a54520fa9..d6ab22238 100644 --- a/next-lib/src/italian/DiffIta.gf +++ b/next-lib/src/italian/DiffIta.gf @@ -112,12 +112,11 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud let pe = case b of {True => P3 ; _ => p} ; agr = aag ** {p = pe} ; - clpr = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ; -----e verb = case of { -----e => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ; -----e _ => (vp.s ! VPImperat).fin ! agr -----e } ; - verb = (vp.s ! VPImperat).fin ! agr ; ----e + clpr = ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ; + verb = case of { + => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ; + _ => (vp.s ! VPImperat).fin ! agr + } ; neg = vp.neg ! pol ; compl = neg.p2 ++ clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol in diff --git a/next-lib/src/italian/LexiconIta.gf b/next-lib/src/italian/LexiconIta.gf index 552c372f2..573c436e6 100644 --- a/next-lib/src/italian/LexiconIta.gf +++ b/next-lib/src/italian/LexiconIta.gf @@ -103,7 +103,8 @@ lin iron_N = regN "ferro" ; john_PN = mkPN "Giovanni" masculine ; king_N = regN "ré" ; - know_V2 = dirV2 (verboV (conoscere_37 "conoscere")) ; --- savoir_V2 : VS + know_V2 = dirV2 (verboV (conoscere_37 "conoscere")) ; + know_VS = mkVS (verboV (sapere_78 "sapere")) ; lake_N = regN "lago" ; lamp_N = regN "lampa" ; learn_V2 = dirV2 (regV "imparare") ; -- cgit v1.2.3