diff options
Diffstat (limited to 'next-lib/src/english')
| -rw-r--r-- | next-lib/src/english/AdjectiveEng.gf | 15 | ||||
| -rw-r--r-- | next-lib/src/english/NounEng.gf | 12 |
2 files changed, 19 insertions, 8 deletions
diff --git a/next-lib/src/english/AdjectiveEng.gf b/next-lib/src/english/AdjectiveEng.gf index 19dd5dddc..2306f5d9c 100644 --- a/next-lib/src/english/AdjectiveEng.gf +++ b/next-lib/src/english/AdjectiveEng.gf @@ -10,8 +10,16 @@ concrete AdjectiveEng of Adjective = CatEng ** open ResEng, Prelude in { s = \\_ => a.s ! AAdj Compar ++ "than" ++ np.s ! Nom ; isPre = False } ; + UseComparA a = { + s = \\_ => a.s ! AAdj Compar ; + isPre = True + } ; + + AdjOrd ord = { + s = \\_ => ord.s ; + isPre = True + } ; --- $SuperlA$ belongs to determiner syntax in $Noun$. ComplA2 a np = { s = \\_ => a.s ! AAdj Posit ++ a.c2 ++ np.s ! Acc ; @@ -33,6 +41,9 @@ concrete AdjectiveEng of Adjective = CatEng ** open ResEng, Prelude in { isPre = ap.isPre } ; - UseA2 a = a ; + UseA2 a = { + s = \\_ => a.s ! AAdj Posit ; + isPre = True + } ; } diff --git a/next-lib/src/english/NounEng.gf b/next-lib/src/english/NounEng.gf index 18ceeaa22..9f7771e48 100644 --- a/next-lib/src/english/NounEng.gf +++ b/next-lib/src/english/NounEng.gf @@ -31,18 +31,18 @@ concrete NounEng of Noun = CatEng ** open ResEng, Prelude in { a = np.a } ; - DetQuantOrd quant num ord = { - s = quant.s ! num.hasCard ! num.n ++ num.s ++ ord.s ; - sp = quant.sp ! num.hasCard ! num.n ++ num.s ++ ord.s ; - n = num.n - } ; - DetQuant quant num = { s = quant.s ! num.hasCard ! num.n ++ num.s ; sp = quant.sp ! num.hasCard ! num.n ++ num.s ; n = num.n } ; + DetQuantOrd quant num ord = { + s = quant.s ! num.hasCard ! num.n ++ num.s ++ ord.s ; + sp = quant.sp ! num.hasCard ! num.n ++ num.s ++ ord.s ; + n = num.n + } ; + DetNP det = { s = \\c => det.sp ; ---- case a = agrP3 det.n |
