merged sysu/Assign* with DictEngChi now that they have been checked; fixed some multicharacter problems

This commit is contained in:
aarne
2013-10-23 16:13:21 +00:00
parent 1fcae658ac
commit 2aa5736cb4
4 changed files with 11499 additions and 31 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -184,7 +184,7 @@ oper
mkpDet : Str -> Det
= \s -> lin Det {s = word s ; detType = DTFull Sg} ;
mkQuant : Str -> Quant
= \s -> lin Quant {s,pl = s ; detType = DTFull Sg} ;
= \s -> lin Quant {s,pl = word s ; detType = DTFull Sg} ;
mkAdA : Str -> AdA
= \s -> lin AdA {s = word s} ;
mkNum : Str -> Num

View File

@@ -19,30 +19,7 @@ concrete ParseChi of ParseEngAbs =
VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV,
ClSlash, RCl, EmptyRelSlash, ListCN, ConjCN, BaseCN, ConsCN],
DictEngChi,
Assign_1,
Assign_10 - [weep_V],
Assign_11,
Assign_12,
Assign_13,
Assign_14,
Assign_15,
Assign_16,
Assign_17,
Assign_18,
Assign_19,
Assign_2,
Assign_20,
Assign_21,
Assign_3,
Assign_31,
Assign_32,
Assign_4,
Assign_5,
Assign_6,
Assign_7,
Assign_8,
Assign_9
DictEngChi
**
open ResChi, ParadigmsChi, SyntaxChi, Prelude in {

View File

@@ -67,6 +67,11 @@ resource ResChi = ParamX ** open Prelude in {
bword : Str -> Str -> Str = \x,y -> x ++ y ; -- change to x + y to treat words as single tokens
word : Str -> Str = \s -> case s of {
x@? + y@? + z@? + u@? + v@? + w@? + a@? + b@? + c@? + d@? + e@? =>
bword x (bword y (bword z (bword u (bword v (bword w (bword a (bword b (bword c (bword d e))))))))) ;
x@? + y@? + z@? + u@? + v@? + w@? + a@? + b@? + c@? + d@? =>
bword x (bword y (bword z (bword u (bword v (bword w (bword a (bword b (bword c d)))))))) ;
x@? + y@? + z@? + u@? + v@? + w@? + a@? + b@? + c@? => bword x (bword y (bword z (bword u (bword v (bword w (bword a (bword b c))))))) ;
x@? + y@? + z@? + u@? + v@? + w@? + a@? + b@? => bword x (bword y (bword z (bword u (bword v (bword w (bword a b)))))) ;
x@? + y@? + z@? + u@? + v@? + w@? + a@? => bword x (bword y (bword z (bword u (bword v (bword w a))))) ;
x@? + y@? + z@? + u@? + v@? + w@? => bword x (bword y (bword z (bword u (bword v w)))) ;
@@ -228,15 +233,15 @@ oper
Quantifier = Determiner ** {pl : Str} ;
mkDet = overload {
mkDet : Str -> Determiner = \s -> {s = s ; detType = DTFull Sg} ;
mkDet : Str -> Number -> Determiner = \s,n -> {s = s ; detType = DTFull n} ;
mkDet : Str -> DetType -> Determiner = \s,d -> {s = s ; detType = d} ;
mkDet : Str -> Determiner = \s -> {s = word s ; detType = DTFull Sg} ;
mkDet : Str -> Number -> Determiner = \s,n -> {s = word s ; detType = DTFull n} ;
mkDet : Str -> DetType -> Determiner = \s,d -> {s = word s ; detType = d} ;
} ;
mkQuant = overload {
mkQuant : Str -> Quantifier = \s -> {s,pl = s ; detType = DTFull Sg} ;
mkQuant : Str -> DetType -> Quantifier = \s,d -> {s,pl = s ; detType = d} ;
mkQuant : Str -> Str -> DetType -> Quantifier = \s,p,d -> {s = s ; detType = d ; pl = p} ;
mkQuant : Str -> Quantifier = \s -> {s,pl = word s ; detType = DTFull Sg} ;
mkQuant : Str -> DetType -> Quantifier = \s,d -> {s,pl = word s ; detType = d} ;
mkQuant : Str -> Str -> DetType -> Quantifier = \s,p,d -> {s = word s ; detType = d ; pl = p} ;
} ;
pronNP : (s : Str) -> NP = \s -> {