From dba4c9462c7008b8988d2b0c9bdf96410729efb2 Mon Sep 17 00:00:00 2001 From: "ramona.enache" Date: Sat, 8 May 2010 13:39:44 +0000 Subject: [PATCH] fixed SUMORon according to changes in the resource grammar --- examples/SUMO/BasicRon.gf | 20 +++++++++++--------- examples/SUMO/RGLExt/ExtensionRon.gf | 7 ++++--- examples/SUMO/SUMO.gf | 1 + examples/SUMO/SUMOFre.gf | 2 +- examples/SUMO/SUMORon.gf | 2 +- examples/phrasebook/GreetingsGer.gf | 1 + examples/phrasebook/SentencesRon.gf | 1 - examples/phrasebook/WordsFre.gf | 2 +- examples/phrasebook/WordsRon.gf | 5 ++++- 9 files changed, 24 insertions(+), 17 deletions(-) diff --git a/examples/SUMO/BasicRon.gf b/examples/SUMO/BasicRon.gf index 9fc5ba325..a41dd99b4 100644 --- a/examples/SUMO/BasicRon.gf +++ b/examples/SUMO/BasicRon.gf @@ -1,4 +1,5 @@ ---# -path=.:romanian:abstract:prelude:common +--# -path=.:RGLExt:alltenses + concrete BasicRon of Basic = CatRon - [Text] ** open DictLangRon,ResRon, Prelude, ParamBasic,Coordination, ParadigmsRon in{ lincat Class = CN ; @@ -12,13 +13,14 @@ lincat Formula = PolSentence; Stmt = StmtS ; [El] = {s1,s2 : NCase => Str ; a : Agr; nForm : NForm}; - [Class] = {s1,s2 : Number => Species => ACase => Str; g : NGender; a : Animacy ; isComp : Bool}; + [Class] = {s1,s2 : Number => Species => ACase => Str; g : NGender; a : Animacy ; isComp : Bool; needsRefForm : Bool}; - lin -BaseClass = {s1,s2 = \\_,_,_ => ""; + lin + +BaseClass = {s1,s2 = \\_,_,_ => ""; needsRefForm = False ; g = NNeut; a = Inanimate; isComp = False} ; -ConsClass xs x = consrTable3 Number Species ACase comma xs x ** {g = x.g; a = x.a; isComp = x.isComp} ; +ConsClass xs x = consrTable3 Number Species ACase comma xs x ** {g = x.g; a = x.a; needsRefForm = False; isComp = x.isComp} ; BaseEl c = {s1,s2 = \\_ => ""; @@ -48,7 +50,7 @@ el c1 c2 i e = e ; var c1 c2 i e = let np = UsePN e in {s = np.s; - a = agrP3 (agrGender c1.g Sg) Sg; indForm = np.indForm ; + a = agrP3 (agrGender c1.g Sg) Sg; indForm = np.indForm ; isPol = False; nForm = np.nForm; ss = np.ss; isComp = np.isComp ; isPronoun = False; lock_NP = <>}; @@ -84,14 +86,14 @@ both c1 c2 = {s = \\c,sp,n => c1.s ! c ! sp ! n ++ "şi" ++ c2.s ! c ! sp ! n; g = c2.g; a = case c1.a of {Inanimate => Inanimate; _ => c2.a }; - isComp = orB c1.isComp c2.isComp; lock_CN = <>}; + isComp = orB c1.isComp c2.isComp; needsRefForm = False; lock_CN = <>}; either c1 c2 = {s = \\c,sp,n => c1.s ! c ! sp ! n ++ "sau" ++ c2.s ! c ! sp ! n; g = c2.g; a = case c1.a of {Inanimate => Inanimate; _ => c2.a }; - isComp = orB c1.isComp c2.isComp; lock_CN = <>}; + isComp = orB c1.isComp c2.isComp; needsRefForm = False; lock_CN = <>}; subClassStm c1 c2 sc = ss (c1. s ! Sg ! Def ! ANomAcc ++ "este" ++ "o" ++ "subclasã" ++ "a" ++ c2.s ! Sg ! Def ! AGenDat) ; instStm c i = ss ((i.s ! No).comp ++ "este" ++ "o" ++ "instanþiere" ++ "a" ++ c.s ! Sg ! Def ! AGenDat) ; @@ -111,6 +113,6 @@ lindef El = \x -> mkNP x ("lui" ++ x) x Sg Masc; lindef Class = \x -> {s = \\n,sp,c => case c of {AGenDat => "lui" ++ x ; _ => x}; - g = NMasc; a = Animate; isComp=False; lock_CN =<>}; + g = NMasc; a = Animate; isComp=False; needsRefForm = False; lock_CN =<>}; }; \ No newline at end of file diff --git a/examples/SUMO/RGLExt/ExtensionRon.gf b/examples/SUMO/RGLExt/ExtensionRon.gf index e8e12ba10..50a94e88b 100644 --- a/examples/SUMO/RGLExt/ExtensionRon.gf +++ b/examples/SUMO/RGLExt/ExtensionRon.gf @@ -36,16 +36,17 @@ sentToNoun ps = heavyNP {s = \\_ => "\"" ++ ps.s ! Indep ! Pos ++ "\""; }; ConjCN conj ss = conjunctDistrTable3 Number Species ACase conj ss ** { - g = ss.g; a = ss.a; isComp = ss.isComp + g = ss.g; a = ss.a; isComp = ss.isComp; needsRefForm = False }; BaseCN x y ={ s1 = \\n,sp,c => x.s ! n ! sp ! c ; s2 = \\n,sp,c => y.s ! n ! sp ! c ; - g = x.g; a = x.a ; isComp = x.isComp}; + g = x.g; a = x.a ; isComp = x.isComp; + needsRefForm = False}; -ConsCN xs x = consrTable3 Number Species ACase comma xs x ** {g = x.g; a = x.a; isComp = x.isComp} ; +ConsCN xs x = consrTable3 Number Species ACase comma xs x ** {g = x.g; a = x.a; isComp = x.isComp; needsRefForm = False} ; at_Prep = mkPrep "la" Ac True; per_Prep = mkPrep "per" Ac True; diff --git a/examples/SUMO/SUMO.gf b/examples/SUMO/SUMO.gf index 97629ab45..b216cedac 100644 --- a/examples/SUMO/SUMO.gf +++ b/examples/SUMO/SUMO.gf @@ -1,3 +1,4 @@ +--# -path=.:alltenses: abstract SUMO = Basic, Merge, diff --git a/examples/SUMO/SUMOFre.gf b/examples/SUMO/SUMOFre.gf index 2681ed27a..0b974517f 100644 --- a/examples/SUMO/SUMOFre.gf +++ b/examples/SUMO/SUMOFre.gf @@ -1,5 +1,5 @@ --# -path=.:RGLExt:alltenses --- --# -path=.:RGLExt:../../lib/src/abstract:../../lib/src/romance:../../lib/src/french:../../lib/src/common + concrete SUMOFre of SUMO = MergeFre, Mid_level_ontologyFre diff --git a/examples/SUMO/SUMORon.gf b/examples/SUMO/SUMORon.gf index 02439e579..064ca5bd8 100644 --- a/examples/SUMO/SUMORon.gf +++ b/examples/SUMO/SUMORon.gf @@ -1,5 +1,5 @@ --# -path=.:RGLExt:alltenses --- --# -path=.:RGLExt:../../lib/src/abstract:../../lib/src/romanian:../../lib/src/common + concrete SUMORon of SUMO = MergeRon, Mid_level_ontologyRon diff --git a/examples/phrasebook/GreetingsGer.gf b/examples/phrasebook/GreetingsGer.gf index 966fde634..82fdbc32b 100644 --- a/examples/phrasebook/GreetingsGer.gf +++ b/examples/phrasebook/GreetingsGer.gf @@ -1,3 +1,4 @@ +--# -path=.:abstract:prelude:german:api:common concrete GreetingsGer of Greetings = open Prelude in { lincat diff --git a/examples/phrasebook/SentencesRon.gf b/examples/phrasebook/SentencesRon.gf index 1b7f54af1..7f8437f36 100644 --- a/examples/phrasebook/SentencesRon.gf +++ b/examples/phrasebook/SentencesRon.gf @@ -56,4 +56,3 @@ PCitizenship x = mkPhrase (mkUtt (mkAP x.prop)) ; PropCit p = p.prop ; } - diff --git a/examples/phrasebook/WordsFre.gf b/examples/phrasebook/WordsFre.gf index 351cbe081..9b6bbe0bf 100644 --- a/examples/phrasebook/WordsFre.gf +++ b/examples/phrasebook/WordsFre.gf @@ -91,7 +91,7 @@ lin Belgian = mkA "belge" ; Belgium = mkNP (mkPN "Belgique") ; Bulgarian = mkNat "bulgare" "Bulgarie" ; - Catalan = mkNat "cataln" "Catalogne" ; + Catalan = mkNat "catalan" "Catalogne" ; Danish = mkNat "danois" "Danemark" ; Dutch = mkNat "hollandais" "Holland" ; English = mkNat "anglais" "Angleterre" ; diff --git a/examples/phrasebook/WordsRon.gf b/examples/phrasebook/WordsRon.gf index b3bbc2fac..2188b70e9 100644 --- a/examples/phrasebook/WordsRon.gf +++ b/examples/phrasebook/WordsRon.gf @@ -1,4 +1,7 @@ --- (c) 2009 Ramona Enache under LGPL +--# -path=.:../../dist/build/rgl/alltenses + + +-- (c) 2010 Ramona Enache under LGPL concrete WordsRon of Words = SentencesRon ** open SyntaxRon, ResRon, Prelude,