summaryrefslogtreecommitdiff
path: root/next-lib/src/english/ParadigmsEng.gf
diff options
context:
space:
mode:
authorbjorn <bjorn@bringert.net>2008-11-25 19:53:22 +0000
committerbjorn <bjorn@bringert.net>2008-11-25 19:53:22 +0000
commit450a34f2d87414cf30af74d9cb041ba1dd314fc6 (patch)
treef74767431ea16f4dd40e293c4b24f177cce703ac /next-lib/src/english/ParadigmsEng.gf
parentfbf266372a5ac133d7b87e623e0b9ba055273915 (diff)
Added ParadigmsEng.mkConj.
Diffstat (limited to 'next-lib/src/english/ParadigmsEng.gf')
-rw-r--r--next-lib/src/english/ParadigmsEng.gf19
1 files changed, 19 insertions, 0 deletions
diff --git a/next-lib/src/english/ParadigmsEng.gf b/next-lib/src/english/ParadigmsEng.gf
index 705c15189..005eb5454 100644
--- a/next-lib/src/english/ParadigmsEng.gf
+++ b/next-lib/src/english/ParadigmsEng.gf
@@ -202,6 +202,16 @@ oper
-- (These two functions are synonyms.)
+--2 Conjunctions
+--
+
+ mkConj : overload {
+ mkConj : Str -> Conj ; -- and (plural agreement)
+ mkConj : Str -> Number -> Conj ; -- or (agrement number given as argument)
+ mkConj : Str -> Str -> Conj ; -- both ... and (plural)
+ mkConj : Str -> Str -> Number -> Conj ; -- either ... or (agrement number given as argument)
+ } ;
+
--2 Verbs
--
@@ -630,6 +640,15 @@ mkSubj : Str -> Subj = \s -> {s = s ; lock_Subj = <>} ;
mkV3 : Str -> V3 = \v -> dirdirV3 (regV v) ;
} ;
+ mkConj = overload {
+ mkConj : Str -> Conj = \y -> mk2Conj [] y plural ;
+ mkConj : Str -> Number -> Conj = \y,n -> mk2Conj [] y n ;
+ mkConj : Str -> Str -> Conj = \x,y -> mk2Conj x y plural ;
+ mkConj : Str -> Str -> Number -> Conj = mk2Conj ;
+ } ;
+
+ mk2Conj : Str -> Str -> Number -> Conj = \x,y,n -> sd2 x y ** { n = n; lock_Conj = <> } ;
+
---- obsolete
-- Comparison adjectives may two more forms.