From 875e03c92f0d896e8edd7df24b373434d44b3aa8 Mon Sep 17 00:00:00 2001 From: bjorn Date: Fri, 31 Oct 2008 10:58:21 +0000 Subject: [PATCH] Use BigLexEng in ParseEng. --- next-lib/src/parsing/Parse.gf | 4 +--- next-lib/src/parsing/ParseEng.gf | 13 ++++++++++--- next-lib/src/parsing/ParseEngAbs.gf | 12 +++++++++++- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/next-lib/src/parsing/Parse.gf b/next-lib/src/parsing/Parse.gf index 7396ae499..4cfc7110d 100644 --- a/next-lib/src/parsing/Parse.gf +++ b/next-lib/src/parsing/Parse.gf @@ -11,6 +11,4 @@ abstract Parse = Phrase, Text, Structural, - Idiom, - - Lexicon ; + Idiom ; diff --git a/next-lib/src/parsing/ParseEng.gf b/next-lib/src/parsing/ParseEng.gf index f892957f6..0edc1ee34 100644 --- a/next-lib/src/parsing/ParseEng.gf +++ b/next-lib/src/parsing/ParseEng.gf @@ -15,13 +15,20 @@ concrete ParseEng of ParseEngAbs = StructuralEng - [everybody_NP, every_Det, only_Predet, somebody_NP], IdiomEng, - LexiconEng, - ExtraEng - [ -- Don't include the uncontracted clauses. Instead -- use them as variants of the contracted ones. UncNegCl, UncNegQCl, UncNegRCl, UncNegImpSg, UncNegImpPl - ] + ], + + LexiconEng [N3, distance_N3, + VQ, wonder_VQ, + V2A, paint_V2A, + V2Q, ask_V2Q, + V2V, beg_V2V, + V2S, answer_V2S, + VA, become_VA], + BigLexEng ** open ParadigmsEng, ResEng, MorphoEng, ParamX, Prelude in { diff --git a/next-lib/src/parsing/ParseEngAbs.gf b/next-lib/src/parsing/ParseEngAbs.gf index e399c69ef..5ac51a5cc 100644 --- a/next-lib/src/parsing/ParseEngAbs.gf +++ b/next-lib/src/parsing/ParseEngAbs.gf @@ -4,7 +4,17 @@ abstract ParseEngAbs = -- Don't include the uncontracted clauses. Instead -- use them as variants of the contracted ones. UncNegCl, UncNegQCl, UncNegRCl, UncNegImpSg, UncNegImpPl - ] + ], + + Lexicon [N3, distance_N3, + VQ, wonder_VQ, + V2A, paint_V2A, + V2Q, ask_V2Q, + V2V, beg_V2V, + V2S, answer_V2S, + VA, become_VA], + BigLexEngAbs + ** { -- Syntactic additions