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

added Fre mkV with 2 args

Browse Source
This commit is contained in:
aarne
2012-03-08 12:36:59 +00:00
parent 1da464a4cc
commit 988d171bed
2 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib/src/french/BeschFre.gf
View File

@@ -231,43 +231,22 @@ oper v_besch101 : Str -> VerbeN = \s -> mkNV (conj s) ; --- to do
_ => conj1aimer parler
} ;
{-
let
e = last (Predef.tk 4 parler) ;
c = last (Predef.tk 3 parler) ;
verb_é = pbool2bool (occur "é" (e + last (Predef.tk 3 parler))) ;
verb_e = andB (pbool2bool (occur e "e")) (pbool2bool (occur c "cmnprsv"))
in
case Predef.dp 4 parler of {
"éger" => conj1assiéger parler ;
"eler" => conj1jeter parler ;
"eter" => conj1jeter parler ;
_ => case verb_é of {
True => conj1céder parler ;
_ => case verb_e of {
---- True => conj1peser parler ;
False | _ => case Predef.dp 3 parler of {
"cer" => conj1placer parler ;
"ger" => conj1manger parler ;
"yer" => conj1payer parler ;
_ => case Predef.dp 2 parler of {
"ir" => conj2finir parler ;
"re" => conj3rendre parler ;
_ => conj1aimer parler
}
}
}
}
} ;
-}
-- The following can be more reliable.
mkVerb2Reg : Str -> Str -> Verbe = \jeter,jette -> case <jeter,jette> of {
<_ + "er", _ + "e"> => auxConj1 (Predef.tk 2 jeter) (Predef.tk 1 jette)
(jette + "r") ;
<_ + "oir", _ > => conj3cevoir jeter ;
<_ + "ir", _ + "it"> => conj2finir jeter ;
<_ + "ir", _ > => conj3sentir jeter ;
_ => mkVerbReg jeter
} ;
mkVerb3Reg : Str -> Str -> Str -> Verbe = \jeter,jette,jettera ->
auxConj1
(Predef.tk 2 jeter)
(Predef.tk 1 jette)
(Predef.tk 1 jettera) ;
case jeter of {
_ + "er" => auxConj1 (Predef.tk 2 jeter) (Predef.tk 1 jette) (Predef.tk 1 jettera) ;
_ => mkVerb2Reg jeter jette
} ;
--3 The second conjugation
--

3
lib/src/french/ParadigmsFre.gf
View File

@@ -216,6 +216,7 @@ oper
mkV : overload {
mkV : (finir : Str) -> V ; -- regular 1/2/3 conjugation
mkV : (jeter,jette : Str) -> V ; -- 1st and 2nd conjugation variations
mkV : (jeter,jette,jettera : Str) -> V ; -- 1st conjugation variations
-- Here is a paradigm that works for most irregular verbs.
@@ -442,6 +443,8 @@ oper
mkV = overload {
mkV : Str -> V = regV ;
mkV : (jeter,jette : Str) -> V =
\x,y -> let v = vvf (mkVerb2Reg x y) in {s = v ; vtyp = VHabere ; lock_V = <>} ;
mkV : (jeter,jette,jettera : Str) -> V = reg3V ;
mkV : V2 -> V = v2V ;
mkV : (tenir,tiens,tenons,tiennent,tint,tiendra,tenu : Str) -> V