From 8f9e72ae4c72f372c9c761a405a4177c2e302b87 Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 20 Dec 2010 14:10:48 +0000 Subject: [PATCH] mkTemp in api; Inf to aux in SentenceEng bug fix --- lib/src/api/Constructors.gf | 8 ++++++++ lib/src/english/SentenceEng.gf | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/src/api/Constructors.gf b/lib/src/api/Constructors.gf index 68169e638..4970d64a4 100644 --- a/lib/src/api/Constructors.gf +++ b/lib/src/api/Constructors.gf @@ -275,6 +275,14 @@ incomplete resource Constructors = open Grammar in { --% conditionalTense : Tense -- she would sleep --# notpresent --: = TCond ; --# notpresent --% +--3 Temp, temporal and aspectual features + +-- Temp is a combination of Tense and Ant. In extra modules for some +-- languages, it can also involve aspect and other things. + + mkTemp : Tense -> Ant -> Temp + = TTAnt ; --% + --3 ImpForm, imperative form -- Imperative form is a parameter that sets the form of imperative diff --git a/lib/src/english/SentenceEng.gf b/lib/src/english/SentenceEng.gf index adee292a8..c8018fc9b 100644 --- a/lib/src/english/SentenceEng.gf +++ b/lib/src/english/SentenceEng.gf @@ -12,7 +12,7 @@ concrete SentenceEng of Sentence = CatEng ** open Prelude, ResEng in { s = \\pol,n => let agr = AgP2 (numImp n) ; - verb = infVP VVInf vp agr ; + verb = infVP VVAux vp agr ; dont = case pol of { CNeg True => "don't" ; CNeg False => "do" ++ "not" ;