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

finishing verbs; bug fixes in comp

Browse Source
This commit is contained in:
aarne
2004-11-27 08:13:45 +00:00
parent b299e79109
commit 4564fd2f99
6 changed files with 6641 additions and 6635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/book/gf-book.tex
View File

@@ -76,7 +76,7 @@ is the Grammatical Framework, GF.
There are many reasons why natural-language applications are not
common. One reason is that they are difficult to build. No-one has
ever managed to write a program that correctly recognizes arbitrary
natural-language input in any language
natural-language input in any language.
GF is a special-purpose programming language for writing grammars.

189
lib/resource/french/ConjugNancy.gf
View File

@@ -1,107 +1,94 @@
resource ConjugNancy = open TypesFre, MorphoFre in {
oper mkNV : Verbe -> Verb = \ve -> verbPres ve AHabere ; --- AEsse
oper VerbeN = {s : VForm => Str} ;
oper mkNV : Verbe -> VerbeN = \ve ->
{s = ve} ;
oper conj : Str -> Verbe = conj1aimer ; --- temp. default
oper v_nancy1 : Str -> Verb = \s -> mkNV (conjAvoir s) ;
oper v_nancy2 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy3 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy4 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy5 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy6 : Str -> Verb = \s -> mkNV (conj1aimer s) ;
oper v_nancy7 : Str -> Verb = \s -> mkNV (conj1placer s) ;
oper v_nancy8 : Str -> Verb = \s -> mkNV (conj1manger s) ;
oper v_nancy9 : Str -> Verb = \s -> mkNV (conj1peser s) ;
oper v_nancy10 : Str -> Verb = \s -> mkNV (conj1céder s) ;
oper v_nancy11 : Str -> Verb = \s -> mkNV (conj1jeter s) ;
oper v_nancy12 : Str -> Verb = \s -> mkNV (conj1jeter s) ;
oper v_nancy13 : Str -> Verb = \s -> mkNV (conj1aimer s) ;
oper v_nancy14 : Str -> Verb = \s -> mkNV (conj1assiéger s) ;
oper v_nancy15 : Str -> Verb = \s -> mkNV (conj1aimer s) ; --- ?
oper v_nancy16 : Str -> Verb = \s -> mkNV (conj1payer s) ;
oper v_nancy17 : Str -> Verb = \s -> mkNV (conj1payer s) ;
oper v_nancy18 : Str -> Verb = \s -> mkNV (conj1envoyer s) ;
oper v_nancy19 : Str -> Verb = \s -> mkNV (conj2finir s) ;
oper v_nancy20 : Str -> Verb = \s -> mkNV (conj2haïr s) ;
oper v_nancy21 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy22 : Str -> Verb = \s -> mkNV (conj3aller s) ;
oper v_nancy23 : Str -> Verb = \s -> mkNV (conj3tenir s) ;
oper v_nancy24 : Str -> Verb = \s -> mkNV (conj3quérir s) ;
oper v_nancy25 : Str -> Verb = \s -> mkNV (conj3sentir s) ;
oper v_nancy26 : Str -> Verb = \s -> mkNV (conj3vêtir s) ;
oper v_nancy27 : Str -> Verb = \s -> mkNV (conj3couvrir s) ;
oper v_nancy28 : Str -> Verb = \s -> mkNV (conj3cueillir s) ;
oper v_nancy29 : Str -> Verb = \s -> mkNV (conj3assaillir s) ;
oper v_nancy30 : Str -> Verb = \s -> mkNV (conj3faillir s) ;
oper v_nancy31 : Str -> Verb = \s -> mkNV (conj3bouillir s) ;
oper v_nancy32 : Str -> Verb = \s -> mkNV (conj3dormir s) ;
oper v_nancy33 : Str -> Verb = \s -> mkNV (conj3courir s) ;
oper v_nancy34 : Str -> Verb = \s -> mkNV (conj3mourir s) ;
oper v_nancy35 : Str -> Verb = \s -> mkNV (conj3sentir s) ;
oper v_nancy36 : Str -> Verb = \s -> mkNV (conj3fuir s) ;
oper v_nancy37 : Str -> Verb = \s -> mkNV (conj3ouïr s) ;
oper v_nancy38 : Str -> Verb = \s -> mkNV (conj3cevoir s) ;
oper v_nancy39 : Str -> Verb = \s -> mkNV (conj3voir s) ;
oper v_nancy40 : Str -> Verb = \s -> mkNV (conj3pourvoir s) ;
oper v_nancy41 : Str -> Verb = \s -> mkNV (conj3savoir s) ;
oper v_nancy42 : Str -> Verb = \s -> mkNV (conj3devoir s) ;
oper v_nancy43 : Str -> Verb = \s -> mkNV (conj3pouvoir s) ;
oper v_nancy44 : Str -> Verb = \s -> mkNV (conj3mouvoir s) ;
oper v_nancy45 : Str -> Verb = \s -> mkNV (conj3pleuvoir s) ;
oper v_nancy46 : Str -> Verb = \s -> mkNV (conj3falloir s) ;
oper v_nancy47 : Str -> Verb = \s -> mkNV (conj3valoir s) ;
oper v_nancy48 : Str -> Verb = \s -> mkNV (conj3vouloir s) ;
oper v_nancy49 : Str -> Verb = \s -> mkNV (conj3asseoir s) ;
oper v_nancy50 : Str -> Verb = \s -> mkNV (conj3messeoir s) ; --- ?
oper v_nancy51 : Str -> Verb = \s -> mkNV (conj3surseoir s) ;
oper v_nancy52 : Str -> Verb = \s -> mkNV (conj3choir s) ;
oper v_nancy53 : Str -> Verb = \s -> mkNV (conj3rendre s) ;
oper v_nancy54 : Str -> Verb = \s -> mkNV (conj3prendre s) ;
oper v_nancy55 : Str -> Verb = \s -> mkNV (conj3battre s) ;
oper v_nancy56 : Str -> Verb = \s -> mkNV (conj3mettre s) ;
oper v_nancy57 : Str -> Verb = \s -> mkNV (conj3peindre s) ;
oper v_nancy58 : Str -> Verb = \s -> mkNV (conj3joindre s) ;
oper v_nancy59 : Str -> Verb = \s -> mkNV (conj3craindre s) ;
oper v_nancy60 : Str -> Verb = \s -> mkNV (conj3vaincre s) ;
oper v_nancy61 : Str -> Verb = \s -> mkNV (conj3traire s) ;
oper v_nancy62 : Str -> Verb = \s -> mkNV (conj3faire s) ;
oper v_nancy63 : Str -> Verb = \s -> mkNV (conj3plaire s) ;
oper v_nancy64 : Str -> Verb = \s -> mkNV (conj3connaître s) ;
oper v_nancy65 : Str -> Verb = \s -> mkNV (conj3naître s) ;
oper v_nancy66 : Str -> Verb = \s -> mkNV (conj3paître s) ;
oper v_nancy67 : Str -> Verb = \s -> mkNV (conj3croître s) ;
oper v_nancy68 : Str -> Verb = \s -> mkNV (conj3croire s) ;
oper v_nancy69 : Str -> Verb = \s -> mkNV (conj3boire s) ;
oper v_nancy70 : Str -> Verb = \s -> mkNV (conj3clore s) ;
oper v_nancy71 : Str -> Verb = \s -> mkNV (conj3conclure s) ;
oper v_nancy72 : Str -> Verb = \s -> mkNV (conj3absoudre s) ;
oper v_nancy73 : Str -> Verb = \s -> mkNV (conj3coudre s) ;
oper v_nancy74 : Str -> Verb = \s -> mkNV (conj3moudre s) ;
oper v_nancy75 : Str -> Verb = \s -> mkNV (conj3suivre s) ;
oper v_nancy76 : Str -> Verb = \s -> mkNV (conj3vivre s) ;
oper v_nancy77 : Str -> Verb = \s -> mkNV (conj3lire s) ;
oper v_nancy78 : Str -> Verb = \s -> mkNV (conj3dire s) ;
oper v_nancy79 : Str -> Verb = \s -> mkNV (conj3rire s) ;
oper v_nancy80 : Str -> Verb = \s -> mkNV (conj3écrire s) ;
oper v_nancy81 : Str -> Verb = \s -> mkNV (conj3confire s) ;
oper v_nancy82 : Str -> Verb = \s -> mkNV (conj3cuire s) ;
oper v_nancy83 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy84 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy85 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy86 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy87 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy88 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy89 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy90 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy91 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy92 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy93 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy94 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy95 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy96 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy97 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy98 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy99 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy100 : Str -> Verb = \s -> mkNV (conj s) ;
oper v_nancy1 : Str -> VerbeN = \s -> mkNV (conjAvoir s) ;
oper v_nancy2 : Str -> VerbeN = \s -> mkNV (conjÊtre s) ;
-- 3-5 not used
oper v_nancy6 : Str -> VerbeN = \s -> mkNV (conj1aimer s) ;
oper v_nancy7 : Str -> VerbeN = \s -> mkNV (conj1placer s) ;
oper v_nancy8 : Str -> VerbeN = \s -> mkNV (conj1manger s) ;
oper v_nancy9 : Str -> VerbeN = \s -> mkNV (conj1peser s) ;
oper v_nancy10 : Str -> VerbeN = \s -> mkNV (conj1céder s) ;
oper v_nancy11 : Str -> VerbeN = \s -> mkNV (conj1jeter s) ;
oper v_nancy12 : Str -> VerbeN = \s -> mkNV (conj1jeter s) ;
oper v_nancy13 : Str -> VerbeN = \s -> mkNV (conj1aimer s) ;
oper v_nancy14 : Str -> VerbeN = \s -> mkNV (conj1assiéger s) ;
oper v_nancy15 : Str -> VerbeN = \s -> mkNV (conj1aimer s) ; --- ?
oper v_nancy16 : Str -> VerbeN = \s -> mkNV (conj1payer s) ;
oper v_nancy17 : Str -> VerbeN = \s -> mkNV (conj1payer s) ;
oper v_nancy18 : Str -> VerbeN = \s -> mkNV (conj1envoyer s) ;
oper v_nancy19 : Str -> VerbeN = \s -> mkNV (conj2finir s) ;
oper v_nancy20 : Str -> VerbeN = \s -> mkNV (conj2haïr s) ;
-- oper v_nancy21 : Str -> VerbeN = \s -> mkNV (conj s) ; -- not used
oper v_nancy22 : Str -> VerbeN = \s -> mkNV (conj3aller s) ;
oper v_nancy23 : Str -> VerbeN = \s -> mkNV (conj3tenir s) ;
oper v_nancy24 : Str -> VerbeN = \s -> mkNV (conj3quérir s) ;
oper v_nancy25 : Str -> VerbeN = \s -> mkNV (conj3sentir s) ;
oper v_nancy26 : Str -> VerbeN = \s -> mkNV (conj3vêtir s) ;
oper v_nancy27 : Str -> VerbeN = \s -> mkNV (conj3couvrir s) ;
oper v_nancy28 : Str -> VerbeN = \s -> mkNV (conj3cueillir s) ;
oper v_nancy29 : Str -> VerbeN = \s -> mkNV (conj3assaillir s) ;
oper v_nancy30 : Str -> VerbeN = \s -> mkNV (conj3faillir s) ;
oper v_nancy31 : Str -> VerbeN = \s -> mkNV (conj3bouillir s) ;
oper v_nancy32 : Str -> VerbeN = \s -> mkNV (conj3dormir s) ;
oper v_nancy33 : Str -> VerbeN = \s -> mkNV (conj3courir s) ;
oper v_nancy34 : Str -> VerbeN = \s -> mkNV (conj3mourir s) ;
oper v_nancy35 : Str -> VerbeN = \s -> mkNV (conj3sentir s) ;
oper v_nancy36 : Str -> VerbeN = \s -> mkNV (conj3fuir s) ;
oper v_nancy37 : Str -> VerbeN = \s -> mkNV (conj3ouïr s) ;
oper v_nancy38 : Str -> VerbeN = \s -> mkNV (conj3cevoir s) ;
oper v_nancy39 : Str -> VerbeN = \s -> mkNV (conj3voir s) ;
oper v_nancy40 : Str -> VerbeN = \s -> mkNV (conj3pourvoir s) ;
oper v_nancy41 : Str -> VerbeN = \s -> mkNV (conj3savoir s) ;
oper v_nancy42 : Str -> VerbeN = \s -> mkNV (conj3devoir s) ;
oper v_nancy43 : Str -> VerbeN = \s -> mkNV (conj3pouvoir s) ;
oper v_nancy44 : Str -> VerbeN = \s -> mkNV (conj3mouvoir s) ;
oper v_nancy45 : Str -> VerbeN = \s -> mkNV (conj3pleuvoir s) ;
oper v_nancy46 : Str -> VerbeN = \s -> mkNV (conj3falloir s) ;
oper v_nancy47 : Str -> VerbeN = \s -> mkNV (conj3valoir s) ;
oper v_nancy48 : Str -> VerbeN = \s -> mkNV (conj3vouloir s) ;
oper v_nancy49 : Str -> VerbeN = \s -> mkNV (conj3asseoir s) ;
oper v_nancy50 : Str -> VerbeN = \s -> mkNV (conj3messeoir s) ; --- ?
oper v_nancy51 : Str -> VerbeN = \s -> mkNV (conj3surseoir s) ;
oper v_nancy52 : Str -> VerbeN = \s -> mkNV (conj3choir s) ;
oper v_nancy53 : Str -> VerbeN = \s -> mkNV (conj3rendre s) ;
oper v_nancy54 : Str -> VerbeN = \s -> mkNV (conj3prendre s) ;
oper v_nancy55 : Str -> VerbeN = \s -> mkNV (conj3battre s) ;
oper v_nancy56 : Str -> VerbeN = \s -> mkNV (conj3mettre s) ;
oper v_nancy57 : Str -> VerbeN = \s -> mkNV (conj3peindre s) ;
oper v_nancy58 : Str -> VerbeN = \s -> mkNV (conj3joindre s) ;
oper v_nancy59 : Str -> VerbeN = \s -> mkNV (conj3craindre s) ;
oper v_nancy60 : Str -> VerbeN = \s -> mkNV (conj3vaincre s) ;
oper v_nancy61 : Str -> VerbeN = \s -> mkNV (conj3traire s) ;
oper v_nancy62 : Str -> VerbeN = \s -> mkNV (conj3faire s) ;
oper v_nancy63 : Str -> VerbeN = \s -> mkNV (conj3plaire s) ;
oper v_nancy64 : Str -> VerbeN = \s -> mkNV (conj3connaître s) ;
oper v_nancy65 : Str -> VerbeN = \s -> mkNV (conj3naître s) ;
oper v_nancy66 : Str -> VerbeN = \s -> mkNV (conj3paître s) ;
oper v_nancy67 : Str -> VerbeN = \s -> mkNV (conj3croître s) ;
oper v_nancy68 : Str -> VerbeN = \s -> mkNV (conj3croire s) ;
oper v_nancy69 : Str -> VerbeN = \s -> mkNV (conj3boire s) ;
oper v_nancy70 : Str -> VerbeN = \s -> mkNV (conj3clore s) ;
oper v_nancy71 : Str -> VerbeN = \s -> mkNV (conj3conclure s) ;
oper v_nancy72 : Str -> VerbeN = \s -> mkNV (conj3absoudre s) ;
oper v_nancy73 : Str -> VerbeN = \s -> mkNV (conj3coudre s) ;
oper v_nancy74 : Str -> VerbeN = \s -> mkNV (conj3moudre s) ;
oper v_nancy75 : Str -> VerbeN = \s -> mkNV (conj3suivre s) ;
oper v_nancy76 : Str -> VerbeN = \s -> mkNV (conj3vivre s) ;
oper v_nancy77 : Str -> VerbeN = \s -> mkNV (conj3lire s) ;
oper v_nancy78 : Str -> VerbeN = \s -> mkNV (conj3dire s) ;
oper v_nancy79 : Str -> VerbeN = \s -> mkNV (conj3rire s) ;
oper v_nancy80 : Str -> VerbeN = \s -> mkNV (conj3écrire s) ;
oper v_nancy81 : Str -> VerbeN = \s -> mkNV (conj3confire s) ;
oper v_nancy82 : Str -> VerbeN = \s -> mkNV (conj3cuire s) ;
-- 83-99 not used
oper v_nancy100 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do
oper v_nancy101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do
}

8
lib/resource/french/MorphoFre.gf
View File

@@ -882,10 +882,12 @@ oper
conj3choir : Str -> Verbe = \choir ->
let {
ch = Predef.tk 3 choir ;
tchoir = auxConj3usS "oi" "oy" "oi" "" (variants {"oir" ; "err"}) "oi" "oy" ""
e = Predef.tk 5 choir ;
tchoir =
auxConj3usS "choi" "choy" "choi" "ch"
(variants {"choir" ; "cherr"}) "choi" "choy" "ch"
} in
\\p => ch + tchoir ! p ;
\\p => e + tchoir ! p ;
conj3échoir : Str -> Verbe = \échoir ->
let {techoir = conj3choir échoir} in

13050
lib/resource/french/VerbesAbs.gf
View File

File diff suppressed because it is too large Load Diff

5
lib/resource/french/VerbesFre.gf
View File

@@ -1,9 +1,12 @@
--# -path=.:../romance:../abstract:../../prelude
-- Verbs from Nancy, courtesy of Sylvain Pogodalla, 25/11/2004
-- Translated to GF by Aarne Ranta
concrete VerbesFre of VerbesAbs = --- CategoriesFre **
open TypesFre, ConjugNancy in {
lincat V = {s : VF => Str ; aux : VAux} ;
lincat VN = {s : VForm => Str} ; --- aux : VAux} ;
{- --- remove deficient verbs

22
src/GF/Grammar/Compute.hs
View File

@@ -139,6 +139,13 @@ computeTerm gr = comp where
foldr1 C (map K (str2strings (glueStr v (str a)))) | v <- x']
,return $ Glue x y
]
(FV ks,_) -> do
kys <- mapM (comp g . flip Glue y) ks
return $ FV kys
(_,FV ks) -> do
xks <- mapM (comp g . Glue x) ks
return $ FV xks
_ -> do
mapM_ checkNoArgVars [x,y]
r <- composOp (comp g) t
@@ -152,10 +159,17 @@ computeTerm gr = comp where
C a b -> do
a' <- comp g a
b' <- comp g b
returnC $ case (a',b') of
(Empty,_) -> b'
(_,Empty) -> a'
_ -> C a' b'
case (a',b') of
(Alts _, K a) -> checks [do
as <- strsFromTerm a' -- this may fail when compiling opers
return $ variants [
foldr1 C (map K (str2strings (plusStr v (str a)))) | v <- as]
,
return $ C a' b'
]
(Empty,_) -> returnC b'
(_,Empty) -> returnC a'
_ -> returnC $ C a' b'
-- reduce free variation as much as you can
FV [t] -> comp g t