diff --git a/examples/SUMO/BasicEng.gf b/examples/SUMO/BasicEng.gf index 01b9617d9..6aabd37a5 100644 --- a/examples/SUMO/BasicEng.gf +++ b/examples/SUMO/BasicEng.gf @@ -29,8 +29,8 @@ lin and f1 f2 = {s = \\f,c => f1.s ! Indep ! c ++ "and" ++ f2.s ! Indep ! c; flag = NothingS; lock_PolSentence = <>}; or f1 f2 = {s = \\f,c => f1.s ! Indep ! c ++ "or" ++ f2.s ! Indep ! c; flag = NothingS; lock_PolSentence = <>}; not f1 = {s = \\f => table { - Neg => "it is not true that" ++ f1.s ! f ! Neg ; - Pos => f1.s ! Indep ! Neg + CNeg _ => "it is not true that" ++ f1.s ! f ! CPos ; + CPos => f1.s ! Indep ! CNeg False }; flag = f1.flag; lock_PolSentence = <> @@ -45,11 +45,11 @@ lin exists C f = let np = DetCN (DetQuant IndefArt NumSg) C in { s = \\form,c => case of { - => "there" ++ "exists" ++ np.s ! Nom ++ f.$0 ++ f.s ! Attrib ! c ; - => "and" ++ np.s ! Nom ++ f.$0 ++ f.s ! Attrib ! c ; - => "," ++ np.s ! Nom ++ f.$0 ++ f.s ! Attrib ! c ; - => "there" ++ "exists" ++ np.s ! Nom ++ f.$0 ++ "such" ++ "that" ++ f.s ! Indep ! c ; - _ => "and" ++ np.s ! Nom ++ f.$0 ++ "such" ++ "that" ++ f.s ! Indep ! c + => "there" ++ "exists" ++ np.s ! npNom ++ f.$0 ++ f.s ! Attrib ! c ; + => "and" ++ np.s ! npNom ++ f.$0 ++ f.s ! Attrib ! c ; + => "," ++ np.s ! npNom ++ f.$0 ++ f.s ! Attrib ! c ; + => "there" ++ "exists" ++ np.s ! npNom ++ f.$0 ++ "such" ++ "that" ++ f.s ! Indep ! c ; + _ => "and" ++ np.s ! npNom ++ f.$0 ++ "such" ++ "that" ++ f.s ! Indep ! c }; flag = case f.flag of { ExistS _ => ExistS Many; @@ -88,8 +88,8 @@ lin desc2desc c1 c2 i d = d; subClassStm c1 c2 sc = lin StmtS (ss (c1. s ! Sg ! Nom ++ "is a subclass of" ++ c2.s ! Sg ! Nom)) ; - instStm c i = lin StmtS (ss (i.s ! Nom ++ "is an instance of" ++ c.s ! Sg ! Nom)) ; - formStm f = lin StmtS (ss (f.s ! Indep ! Pos)) ; + instStm c i = lin StmtS (ss (i.s ! npNom ++ "is an instance of" ++ c.s ! Sg ! Nom)) ; + formStm f = lin StmtS (ss (f.s ! Indep ! CPos)) ; lindef Ind = \x -> {s = \\_ => x; a = agrP3 Sg; lock_NP = <>} ; diff --git a/examples/SUMO/RGLExt/ExtensionEng.gf b/examples/SUMO/RGLExt/ExtensionEng.gf index 9ec992a50..89fd8a9e4 100644 --- a/examples/SUMO/RGLExt/ExtensionEng.gf +++ b/examples/SUMO/RGLExt/ExtensionEng.gf @@ -4,8 +4,8 @@ concrete ExtensionEng of Extension = open CatEng, MorphoEng, ResEng, Conjunction lincat - PolSentence = {s : SentForm => Polarity => Str ; flag : Flag}; - [CN] = {s1,s2 : Number => Case => Str ; g : Gender} ; + PolSentence = {s : SentForm => CPolarity => Str ; flag : Flag}; + [CN] = {s1,s2 : Number => ResEng.Case => Str ; g : Gender} ; StmtS = {s : Str}; NP = CatEng.NP; CN = CatEng.CN; @@ -30,21 +30,21 @@ VerbToGerundA v = {s = \\_ => v.s ! VPresPart; lock_A=<>}; VerbToParticipeA v = {s = \\_ => v.s ! VPPart; lock_A=<>}; mkPolSent cl = {s = \\f,b => case b of - {Pos => cl.s ! Pres ! Simul ! CPos ! ODir; + {CPos => cl.s ! Pres ! Simul ! CPos ! ODir; _ => cl.s ! Pres ! Simul ! CNeg False ! ODir}; flag = NothingS ; lock_PolSentence = <>}; -sentToNoun ps = {s = \\_ => "\"" ++ ps.s ! Indep ! Pos ++ "\""; +sentToNoun ps = {s = \\_ => "\"" ++ ps.s ! Indep ! CPos ++ "\""; a = agrP3 Sg; lock_NP=<>}; -ConjCN conj ss = conjunctDistrTable2 Number Case conj ss ** {g = ss.g;lock_CN=<>}; +ConjCN conj ss = conjunctDistrTable2 Number ResEng.Case conj ss ** {g = ss.g;lock_CN=<>}; BaseCN x y ={s1 = \\n,c => x.s ! n ! c ; s2 = \\n,c => y.s ! n ! c ; g = x.g} ; -ConsCN xs x = consrTable2 Number Case comma xs x ** {g = Masc} ; +ConsCN xs x = consrTable2 Number ResEng.Case comma xs x ** {g = Masc} ; UsePolSentence p ps = {s = ps.s ! Indep ! p.p};