From 9fa3db48bc9cc8a827683a48ba1d1b627ca10cd1 Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Tue, 15 Feb 2005 21:31:00 +0000
Subject: [PATCH] bug fix in French verbs

---
 lib/resource/english/CategoriesEng.gf | 2 +-
 lib/resource/english/NumeralsEng.gf   | 2 +-
 lib/resource/french/BeschFre.gf       | 7 +++----
 lib/resource/french/TypesFre.gf       | 6 +++---
 lib/resource/french/VerbsFre.gf       | 2 ++
 lib/resource/romance/ClauseRomance.gf | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/resource/english/CategoriesEng.gf b/lib/resource/english/CategoriesEng.gf
index 100e5963e..3d78e43e8 100644
--- a/lib/resource/english/CategoriesEng.gf
+++ b/lib/resource/english/CategoriesEng.gf
@@ -38,7 +38,7 @@ lincat
   N2     = Function ;
       -- = CommNounPhrase ** {s2 : Preposition} ;
   N3     = Function ** {s3 : Preposition} ;
-  Num    = {s : Case => Str} ;
+  Num    = {s : Case => Str ; n : Number} ;
   Prep   = {s : Str} ;
 
   A      = Adjective ; 
diff --git a/lib/resource/english/NumeralsEng.gf b/lib/resource/english/NumeralsEng.gf
index 1c270ff4e..5124fdc43 100644
--- a/lib/resource/english/NumeralsEng.gf
+++ b/lib/resource/english/NumeralsEng.gf
@@ -28,4 +28,4 @@ lin pot2as3 n = n ;
 lin pot3 n = {s = n.s ++ "thousand"} ;
 lin pot3plus n m = {s = n.s ++ "thousand" ++ m.s} ;
 
-}
\ No newline at end of file
+}
diff --git a/lib/resource/french/BeschFre.gf b/lib/resource/french/BeschFre.gf
index 5ff5dd747..4f67c7ecc 100644
--- a/lib/resource/french/BeschFre.gf
+++ b/lib/resource/french/BeschFre.gf
@@ -1,13 +1,12 @@
 resource BeschFre = open Prelude, TypesFre, MorphoFre in {
 
-oper VerbeN = {s : VForm => Str} ;
-oper mkNV : Verbe -> VerbeN = \ve -> 
-  {s = ve} ;
+oper VerbeN = {s : VF => Str} ;
+oper mkNV : Verbe -> VerbeN = \ve -> {s = vvf ve} ;
 
 oper conj : Str -> Verbe = conj1aimer ;  --- temp. default
 
 oper v_nancy100inf : Str -> VerbeN = \ve -> {s = table {
-  Inf => ve ;
+  VInfin => ve ;
   _ => nonExist
   }
 } ;
diff --git a/lib/resource/french/TypesFre.gf b/lib/resource/french/TypesFre.gf
index 7dcaaec64..e422b7184 100644
--- a/lib/resource/french/TypesFre.gf
+++ b/lib/resource/french/TypesFre.gf
@@ -141,7 +141,9 @@ oper
 
 -- Verbs: conversion from full verbs to present-tense verbs.
 
-  verbPres = \aller,a -> {s = table { 
+  verbPres = \aller,a -> {s = vvf aller ; aux = a} ;
+
+  vvf : (VForm => Str) -> (VF => Str) = \aller -> table { 
     VInfin       => aller ! Inf ;
     VFin (VPres   Ind) n p => aller ! Indic Pres n p ; 
     VFin (VPres   Sub) n p => aller ! Subjo SPres n p ;
@@ -153,8 +155,6 @@ oper
     VImper np    => aller ! Imper np ;
     VPart g n    => aller ! Part (PPasse g n)
     } ;
-  aux = a
-  } ;
 
 -- The full conjunction is a table on $VForm$:
 
diff --git a/lib/resource/french/VerbsFre.gf b/lib/resource/french/VerbsFre.gf
index 59a7f1ca0..36ca98358 100644
--- a/lib/resource/french/VerbsFre.gf
+++ b/lib/resource/french/VerbsFre.gf
@@ -7,6 +7,8 @@
 concrete VerbsFre of VerbsFreAbs = 
   open TypesFre, MorphoFre, CategoriesFre, BeschFre in {
 
+  flags optimize=values ;
+
 lincat
   V  = CategoriesFre.V ;
   V2 = CategoriesFre.V2 ;
diff --git a/lib/resource/romance/ClauseRomance.gf b/lib/resource/romance/ClauseRomance.gf
index 19061bf04..2163cb6ab 100644
--- a/lib/resource/romance/ClauseRomance.gf
+++ b/lib/resource/romance/ClauseRomance.gf
@@ -3,7 +3,7 @@
 incomplete concrete ClauseRomance of Clause = CategoriesRomance ** 
   open Prelude, SyntaxRomance in {
 
-  flags optimize=all ;
+  flags optimize=all ; --- parametrize much worse, 15/2
 
   lin
   SPredV np v = predVerbClause np v (complVerb v) ;