forked from GitHub/gf-core
bug fix in French verbs
This commit is contained in:
@@ -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
|
||||
}
|
||||
} ;
|
||||
|
||||
@@ -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$:
|
||||
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
concrete VerbsFre of VerbsFreAbs =
|
||||
open TypesFre, MorphoFre, CategoriesFre, BeschFre in {
|
||||
|
||||
flags optimize=values ;
|
||||
|
||||
lincat
|
||||
V = CategoriesFre.V ;
|
||||
V2 = CategoriesFre.V2 ;
|
||||
|
||||
Reference in New Issue
Block a user