GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-13 23:09:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

adapted parse/English to new uncontracted polarity

Browse Source
This commit is contained in:
aarne
2011-06-02 09:26:33 +00:00
parent bbc2a7c538
commit adfc2b6796
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/parse/English.gf
View File

@@ -1,6 +1,6 @@
--# -path=.:oald:alltenses
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] ;
-- OaldEng - [everywhere_Adv,have_V2,here_Adv,quite_Adv,somewhere_Adv,there_Adv] ;

6
lib/src/parse/EnglishAbs.gf
View File

@@ -1,5 +1,5 @@
abstract EnglishAbs =
Parse,
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] ;
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] ;
-- Oald - [everywhere_Adv,have_V2,here_Adv,quite_Adv,somewhere_Adv,there_Adv] ;

21
lib/src/parse/ParseEng.gf
View File

@@ -6,13 +6,14 @@ concrete ParseEng of ParseEngAbs =
AdjectiveEng,
AdverbEng,
NumeralEng,
SentenceEng - [UseCl, UseQCl, UseRCl],
SentenceEng, --- - [UseCl, UseQCl, UseRCl],
QuestionEng,
RelativeEng - [IdRP, RelSlash],
ConjunctionEng,
PhraseEng - [UttImpSg, UttImpPl],
TextX,
TenseX,
PhraseEng, --- - [UttImpSg, UttImpPl],
TextX - [Pol,PNeg,PPos],
TenseX - [Pol,PNeg,PPos],
GrammarEng [Pol,PNeg,PPos],
StructuralEng - [above_Prep, everywhere_Adv, everybody_NP, every_Det, only_Predet, somebody_NP],
IdiomEng,
@@ -43,6 +44,9 @@ flags startcat = Phr ; unlexer = text ; lexer = text ;
-- Allow both "hope that he runs" and "hope he runs".
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.
lin UseCl t p cl =
case p.p of {
@@ -64,15 +68,16 @@ lin UseRCl t p cl =
lin UttImpSg p i =
case p.p of {
Pos => PhraseEng.UttImpSg p i;
Neg => variants { PhraseEng.UttImpSg p i ; UncNegImpSg p i }
CPos => PhraseEng.UttImpSg p i;
CNeg _ => variants { PhraseEng.UttImpSg p i ; UncNegImpSg p i }
} ;
lin UttImpPl p i =
case p.p of {
Pos => PhraseEng.UttImpPl p i;
Neg => variants { PhraseEng.UttImpPl p i ; UncNegImpPl p i }
CPos => PhraseEng.UttImpPl p i;
CNeg _ => variants { PhraseEng.UttImpPl p i ; UncNegImpPl p i }
} ;
-}
-- Two different forms of relative clauses:
-- Pied piping: "at which we are looking".