From 54376eacf80d6a8f965aeee839074d60c7e08d0d Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 21 May 2004 15:12:51 +0000 Subject: [PATCH] fix eng parad --- lib/resource-0.6/english/ParadigmsEng.gf | 8 +++++--- src/GF/Compile/PrOld.hs | 4 ++-- src/Today.hs | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/resource-0.6/english/ParadigmsEng.gf b/lib/resource-0.6/english/ParadigmsEng.gf index 45ac5d1d2..fe65c437d 100644 --- a/lib/resource-0.6/english/ParadigmsEng.gf +++ b/lib/resource-0.6/english/ParadigmsEng.gf @@ -108,10 +108,11 @@ oper --2 Adverbs --- Adverbs are not inflected. The lexical ones have position not --- before the verb. +-- Adverbs are not inflected. Most lexical ones have position not +-- before the verb. Some can be preverbal (e.g. "always"). mkAdv : Str -> AdV ; + mkAdvPre : Str -> AdV ; --2 Verbs -- @@ -219,12 +220,13 @@ oper apReg = \s -> AdjP1 (mkAdj1 s) ; aGen : Str -> AdjDeg = \s -> case last s of { - "y" => mkAdjDeg s (init s + "ier") (init s + "iest") ; + "y" => mkAdjDeg s (init s ++ "ier") (init s + "iest") ; "e" => mkAdjDeg s (s + "r") (s + "st") ; _ => aReg s } ; mkAdv a = advPost a ** {lock_AdV = <>} ; + mkAdvPre a = advPre a ** {lock_AdV = <>} ; mkV = \go,goes,went,gone -> verbNoPart (mkVerbP3 go goes went gone) ** {lock_V = <>} ; diff --git a/src/GF/Compile/PrOld.hs b/src/GF/Compile/PrOld.hs index 683dbe419..ce1983dd1 100644 --- a/src/GF/Compile/PrOld.hs +++ b/src/GF/Compile/PrOld.hs @@ -56,8 +56,8 @@ stripTerm t = case t of TComp ty -> TComp $ stripTerm ty TWild ty -> TWild $ stripTerm ty _ -> ti - R [] -> EInt 8 --- GF 1.2 parser doesn't accept empty records - RecType [] -> Cn (zIdent "Int") --- +---- R [] -> EInt 8 --- GF 1.2 parser doesn't accept empty records +---- RecType [] -> Cn (zIdent "Int") --- _ -> composSafeOp stripTerm t stripPattern p = case p of diff --git a/src/Today.hs b/src/Today.hs index 002cdf2bf..980148f83 100644 --- a/src/Today.hs +++ b/src/Today.hs @@ -1 +1 @@ -module Today where today = "Tue May 18 23:54:22 CEST 2004" +module Today where today = "Fri May 21 18:10:31 CEST 2004"