forked from GitHub/gf-core
adapted parse/English to new uncontracted polarity
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
--# -path=.:oald:alltenses
|
--# -path=.:oald:alltenses
|
||||||
|
|
||||||
concrete English of EnglishAbs =
|
concrete English of EnglishAbs =
|
||||||
ParseEng,
|
ParseEng,
|
||||||
OaldStructuralEng - [above_Prep, after_Prep,and_Conj,before_Prep,behind_Prep,between_Prep,during_Prep,except_Prep,for_Prep,from_Prep,in_Prep,on_Prep,or_Conj,through_Prep,to_Prep,under_Prep, with_Prep,without_Prep] ;
|
OaldStructuralEng - [above_Prep, after_Prep,and_Conj,before_Prep,behind_Prep,between_Prep,during_Prep,except_Prep,for_Prep,from_Prep,in_Prep,on_Prep,or_Conj,through_Prep,to_Prep,under_Prep, with_Prep,without_Prep] ;
|
||||||
-- OaldEng - [everywhere_Adv,have_V2,here_Adv,quite_Adv,somewhere_Adv,there_Adv] ;
|
-- OaldEng - [everywhere_Adv,have_V2,here_Adv,quite_Adv,somewhere_Adv,there_Adv] ;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
abstract EnglishAbs =
|
abstract EnglishAbs =
|
||||||
Parse,
|
ParseEngAbs,
|
||||||
OaldStructural - [above_Prep, after_Prep,and_Conj,before_Prep,behind_Prep,between_Prep,during_Prep,except_Prep,for_Prep,from_Prep,in_Prep,on_Prep,or_Conj,through_Prep,to_Prep,under_Prep, with_Prep,without_Prep],
|
OaldStructural - [above_Prep, after_Prep,and_Conj,before_Prep,behind_Prep,between_Prep,during_Prep,except_Prep,for_Prep,from_Prep,in_Prep,on_Prep,or_Conj,through_Prep,to_Prep,under_Prep, with_Prep,without_Prep] ;
|
||||||
Oald - [everywhere_Adv,have_V2,here_Adv,quite_Adv,somewhere_Adv,there_Adv] ;
|
-- Oald - [everywhere_Adv,have_V2,here_Adv,quite_Adv,somewhere_Adv,there_Adv] ;
|
||||||
|
|
||||||
|
|||||||
@@ -6,13 +6,14 @@ concrete ParseEng of ParseEngAbs =
|
|||||||
AdjectiveEng,
|
AdjectiveEng,
|
||||||
AdverbEng,
|
AdverbEng,
|
||||||
NumeralEng,
|
NumeralEng,
|
||||||
SentenceEng - [UseCl, UseQCl, UseRCl],
|
SentenceEng, --- - [UseCl, UseQCl, UseRCl],
|
||||||
QuestionEng,
|
QuestionEng,
|
||||||
RelativeEng - [IdRP, RelSlash],
|
RelativeEng - [IdRP, RelSlash],
|
||||||
ConjunctionEng,
|
ConjunctionEng,
|
||||||
PhraseEng - [UttImpSg, UttImpPl],
|
PhraseEng, --- - [UttImpSg, UttImpPl],
|
||||||
TextX,
|
TextX - [Pol,PNeg,PPos],
|
||||||
TenseX,
|
TenseX - [Pol,PNeg,PPos],
|
||||||
|
GrammarEng [Pol,PNeg,PPos],
|
||||||
StructuralEng - [above_Prep, everywhere_Adv, everybody_NP, every_Det, only_Predet, somebody_NP],
|
StructuralEng - [above_Prep, everywhere_Adv, everybody_NP, every_Det, only_Predet, somebody_NP],
|
||||||
IdiomEng,
|
IdiomEng,
|
||||||
|
|
||||||
@@ -43,6 +44,9 @@ flags startcat = Phr ; unlexer = text ; lexer = text ;
|
|||||||
-- Allow both "hope that he runs" and "hope he runs".
|
-- Allow both "hope that he runs" and "hope he runs".
|
||||||
lin ComplVS v s = variants { VerbEng.ComplVS v s; ComplBareVS v s } ;
|
lin ComplVS v s = variants { VerbEng.ComplVS v s; ComplBareVS v s } ;
|
||||||
|
|
||||||
|
{-
|
||||||
|
--- this can now be done by just using ExtraEng.UncNeg : Pol
|
||||||
|
|
||||||
-- Allow both contracted and uncontracted negated clauses.
|
-- Allow both contracted and uncontracted negated clauses.
|
||||||
lin UseCl t p cl =
|
lin UseCl t p cl =
|
||||||
case p.p of {
|
case p.p of {
|
||||||
@@ -64,15 +68,16 @@ lin UseRCl t p cl =
|
|||||||
|
|
||||||
lin UttImpSg p i =
|
lin UttImpSg p i =
|
||||||
case p.p of {
|
case p.p of {
|
||||||
Pos => PhraseEng.UttImpSg p i;
|
CPos => PhraseEng.UttImpSg p i;
|
||||||
Neg => variants { PhraseEng.UttImpSg p i ; UncNegImpSg p i }
|
CNeg _ => variants { PhraseEng.UttImpSg p i ; UncNegImpSg p i }
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
lin UttImpPl p i =
|
lin UttImpPl p i =
|
||||||
case p.p of {
|
case p.p of {
|
||||||
Pos => PhraseEng.UttImpPl p i;
|
CPos => PhraseEng.UttImpPl p i;
|
||||||
Neg => variants { PhraseEng.UttImpPl p i ; UncNegImpPl p i }
|
CNeg _ => variants { PhraseEng.UttImpPl p i ; UncNegImpPl p i }
|
||||||
} ;
|
} ;
|
||||||
|
-}
|
||||||
|
|
||||||
-- Two different forms of relative clauses:
|
-- Two different forms of relative clauses:
|
||||||
-- Pied piping: "at which we are looking".
|
-- Pied piping: "at which we are looking".
|
||||||
|
|||||||
Reference in New Issue
Block a user