summaryrefslogtreecommitdiff
path: root/next-lib/src/english
diff options
context:
space:
mode:
authorbjorn <bjorn@bringert.net>2008-11-18 15:20:40 +0000
committerbjorn <bjorn@bringert.net>2008-11-18 15:20:40 +0000
commitf3f29a46839d7e9ba97b56663a775bbf2d5453e4 (patch)
treec6bb3238c2b2231c2ae0bdd7f82e56c260f3ce2f /next-lib/src/english
parent7a7f3247b11a225efd96840493737a4530827ab1 (diff)
The stand-alone form of no_Quant should be "none", not "no".
Diffstat (limited to 'next-lib/src/english')
-rw-r--r--next-lib/src/english/MorphoEng.gf8
-rw-r--r--next-lib/src/english/StructuralEng.gf2
2 files changed, 6 insertions, 4 deletions
diff --git a/next-lib/src/english/MorphoEng.gf b/next-lib/src/english/MorphoEng.gf
index 15dca5d09..fac049210 100644
--- a/next-lib/src/english/MorphoEng.gf
+++ b/next-lib/src/english/MorphoEng.gf
@@ -21,9 +21,11 @@ resource MorphoEng = open Prelude, (Predef=Predef), ResEng in {
sp = regGenitiveS s ;
n = n} ;
- mkQuant : Str -> Str -> {s : Bool => Number => Str; sp : Bool => Number => Case => Str } = \x,y -> {
- s = \\_ => table { Sg => x ; Pl => y } ;
- sp = \\_ => table { Sg => regGenitiveS x ; Pl => regGenitiveS y }
+ mkQuant : Str -> Str -> {s : Bool => Number => Str; sp : Bool => Number => Case => Str } = \sg,pl -> mkQuant4 sg pl sg pl ;
+
+ mkQuant4 : Str -> Str -> Str -> Str -> {s : Bool => Number => Str; sp : Bool => Number => Case => Str } = \sg,pl,sg',pl' -> {
+ s = \\_ => table { Sg => sg ; Pl => pl } ;
+ sp = \\_ => table { Sg => regGenitiveS sg' ; Pl => regGenitiveS pl' }
} ;
regGenitiveS : Str -> Case => Str = \s ->
diff --git a/next-lib/src/english/StructuralEng.gf b/next-lib/src/english/StructuralEng.gf
index 893ca2e82..9c50066a4 100644
--- a/next-lib/src/english/StructuralEng.gf
+++ b/next-lib/src/english/StructuralEng.gf
@@ -123,7 +123,7 @@ concrete StructuralEng of Structural = CatEng **
youPol_Pron = mkPron "you" "you" "your" "yours" singular P2 human ;
not_Predet = {s = "not" ; lock_Predet = <>} ;
- no_Quant = mkQuant "no" "no" ;
+ no_Quant = mkQuant4 "no" "no" "none" "none" ;
if_then_Conj = {s1 = "if" ; s2 = "then" ; n = singular ; lock_Conj = <>} ;
nobody_NP = regNP "nobody" singular ;
nothing_NP = regNP "nothing" singular ;