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

bug fix in French verbs

Browse Source
This commit is contained in:
aarne
2005-02-15 21:31:00 +00:00
parent 7985de3252
commit 9fa3db48bc
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/resource/english/CategoriesEng.gf
View File

@@ -38,7 +38,7 @@ lincat
N2 = Function ; N2 = Function ;
-- = CommNounPhrase ** {s2 : Preposition} ; -- = CommNounPhrase ** {s2 : Preposition} ;
N3 = Function ** {s3 : Preposition} ; N3 = Function ** {s3 : Preposition} ;
Num = {s : Case => Str} ; Num = {s : Case => Str ; n : Number} ;
Prep = {s : Str} ; Prep = {s : Str} ;
A = Adjective ; A = Adjective ;

2
lib/resource/english/NumeralsEng.gf
View File

@@ -28,4 +28,4 @@ lin pot2as3 n = n ;
lin pot3 n = {s = n.s ++ "thousand"} ; lin pot3 n = {s = n.s ++ "thousand"} ;
lin pot3plus n m = {s = n.s ++ "thousand" ++ m.s} ; lin pot3plus n m = {s = n.s ++ "thousand" ++ m.s} ;
} }

7
lib/resource/french/BeschFre.gf
View File

@@ -1,13 +1,12 @@
resource BeschFre = open Prelude, TypesFre, MorphoFre in { resource BeschFre = open Prelude, TypesFre, MorphoFre in {
oper VerbeN = {s : VForm => Str} ; oper VerbeN = {s : VF => Str} ;
oper mkNV : Verbe -> VerbeN = \ve -> oper mkNV : Verbe -> VerbeN = \ve -> {s = vvf ve} ;
{s = ve} ;
oper conj : Str -> Verbe = conj1aimer ; --- temp. default oper conj : Str -> Verbe = conj1aimer ; --- temp. default
oper v_nancy100inf : Str -> VerbeN = \ve -> {s = table { oper v_nancy100inf : Str -> VerbeN = \ve -> {s = table {
Inf => ve ; VInfin => ve ;
_ => nonExist _ => nonExist
} }
} ; } ;

6
lib/resource/french/TypesFre.gf
View File

@@ -141,7 +141,9 @@ oper
-- Verbs: conversion from full verbs to present-tense verbs. -- 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 ; VInfin => aller ! Inf ;
VFin (VPres Ind) n p => aller ! Indic Pres n p ; VFin (VPres Ind) n p => aller ! Indic Pres n p ;
VFin (VPres Sub) n p => aller ! Subjo SPres n p ; VFin (VPres Sub) n p => aller ! Subjo SPres n p ;
@@ -153,8 +155,6 @@ oper
VImper np => aller ! Imper np ; VImper np => aller ! Imper np ;
VPart g n => aller ! Part (PPasse g n) VPart g n => aller ! Part (PPasse g n)
} ; } ;
aux = a
} ;
-- The full conjunction is a table on $VForm$: -- The full conjunction is a table on $VForm$:

2
lib/resource/french/VerbsFre.gf
View File

@@ -7,6 +7,8 @@
concrete VerbsFre of VerbsFreAbs = concrete VerbsFre of VerbsFreAbs =
open TypesFre, MorphoFre, CategoriesFre, BeschFre in { open TypesFre, MorphoFre, CategoriesFre, BeschFre in {
flags optimize=values ;
lincat lincat
V = CategoriesFre.V ; V = CategoriesFre.V ;
V2 = CategoriesFre.V2 ; V2 = CategoriesFre.V2 ;

2
lib/resource/romance/ClauseRomance.gf
View File

@@ -3,7 +3,7 @@
incomplete concrete ClauseRomance of Clause = CategoriesRomance ** incomplete concrete ClauseRomance of Clause = CategoriesRomance **
open Prelude, SyntaxRomance in { open Prelude, SyntaxRomance in {
flags optimize=all ; flags optimize=all ; --- parametrize much worse, 15/2
lin lin
SPredV np v = predVerbClause np v (complVerb v) ; SPredV np v = predVerbClause np v (complVerb v) ;