From 667e7e67d3b9f4808fab3d46a83e110e61b1edec Mon Sep 17 00:00:00 2001
From: "ra.monique" <ra.monique@gmail.com>
Date: Sun, 28 Nov 2010 19:38:56 +0000
Subject: fixed SUMOEng with open instead of import for the Extension module

---
 examples/SUMO/RGLExt/DictLang.gf     |  5 ++---
 examples/SUMO/RGLExt/DictLangEng.gf  |  4 ++--
 examples/SUMO/RGLExt/Extension.gf    |  5 +++--
 examples/SUMO/RGLExt/ExtensionEng.gf | 37 ++++++++++++++++++++++++------------
 4 files changed, 32 insertions(+), 19 deletions(-)

(limited to 'examples/SUMO/RGLExt')

diff --git a/examples/SUMO/RGLExt/DictLang.gf b/examples/SUMO/RGLExt/DictLang.gf
index 1b21e8fdf..1b0919b2e 100644
--- a/examples/SUMO/RGLExt/DictLang.gf
+++ b/examples/SUMO/RGLExt/DictLang.gf
@@ -6,8 +6,7 @@
 -- which may be more suitable to open in applications.
 
 abstract DictLang = 
-  Grammar,
-  Extension
-  ** {
+  Grammar
+  ** open Extension in {
  -- flags startcat=NP ;
   } ;
diff --git a/examples/SUMO/RGLExt/DictLangEng.gf b/examples/SUMO/RGLExt/DictLangEng.gf
index 4e5aa5335..6227348f5 100644
--- a/examples/SUMO/RGLExt/DictLangEng.gf
+++ b/examples/SUMO/RGLExt/DictLangEng.gf
@@ -1,8 +1,8 @@
 --# -path=.:../../../lib/src/abstract:../../../lib/src/english:../../../lib/src/common
 
 concrete DictLangEng of DictLang = 
-  GrammarEng,
-  ExtensionEng ** {
+  GrammarEng
+  ** open ExtensionEng in {
 
 flags  unlexer = text ; lexer = text ;
 
diff --git a/examples/SUMO/RGLExt/Extension.gf b/examples/SUMO/RGLExt/Extension.gf
index 170403983..56367ef72 100644
--- a/examples/SUMO/RGLExt/Extension.gf
+++ b/examples/SUMO/RGLExt/Extension.gf
@@ -1,7 +1,7 @@
 
 -- other functions needed for parsing 
 
-abstract Extension = Cat ** {
+abstract Extension =  {
 
 
 
@@ -9,6 +9,7 @@ cat
   PolSentence;
   StmtS ;
   [CN]{2};
+  N; N2; A; V; V2; CN; NP; Cl; Pol; Prep; Conj; -- redefined from Cat
 fun 
 
 VerbToNounV2 : V2 -> N2 ; -- discovering
@@ -21,7 +22,7 @@ sentToNoun : PolSentence -> NP ;
 UsePolSentence : Pol -> PolSentence -> StmtS ;
 
 at_Prep : Prep ; 
-per_Prep : Prep ;
+per_Prep : Prep ; 
 O1 : NP ;
 O2 : NP ;
 O3 : NP ;
diff --git a/examples/SUMO/RGLExt/ExtensionEng.gf b/examples/SUMO/RGLExt/ExtensionEng.gf
index 9b1675c25..9ec992a50 100644
--- a/examples/SUMO/RGLExt/ExtensionEng.gf
+++ b/examples/SUMO/RGLExt/ExtensionEng.gf
@@ -1,20 +1,33 @@
-concrete ExtensionEng of Extension = CatEng ** open MorphoEng, ResEng, ConjunctionEng, StructuralEng, Prelude, ParadigmsEng, Coordination, ParamBasic in {
+--# -path=.:RGLExt:alltenses:../../lib/src/english
+
+concrete ExtensionEng of Extension = open CatEng, MorphoEng, ResEng, ConjunctionEng, StructuralEng, Prelude, ParadigmsEng, Coordination, ParamBasic in {
 
 
 lincat 
     PolSentence = {s : SentForm => Polarity => Str ; flag : Flag};
     [CN] = {s1,s2 : Number => Case => Str ; g : Gender} ;   
     StmtS = {s : Str};
+    NP = CatEng.NP;
+    CN = CatEng.CN; 
+    N = CatEng.N;
+    N2 = CatEng.N2;
+    A = CatEng.A;
+    V = CatEng.V;
+    V2 = CatEng.V2;
+    Cl = CatEng.Cl;
+    Pol = CatEng.Pol;
+    Prep = CatEng.Prep;
+    Conj = CatEng.Conj;
 lin 
 
-VerbToNounV2 vs = VerbToNoun vs ** {c2 = vs.c2};
+VerbToNounV2 vs = VerbToNoun vs ** {c2 = vs.c2; lock_N2=<>};
 
 VerbToNoun v = {s = \\_,_ => v.s ! VPresPart;
-                g = Masc};
+                g = Masc; lock_N=<>};
                                 
-VerbToGerundA v = {s = \\_ => v.s ! VPresPart};              
+VerbToGerundA v = {s = \\_ => v.s ! VPresPart; lock_A=<>};              
 
-VerbToParticipeA v = {s = \\_ => v.s ! VPPart};
+VerbToParticipeA v = {s = \\_ => v.s ! VPPart; lock_A=<>};
 
 mkPolSent cl = {s = \\f,b => case b of 
                               {Pos => cl.s ! Pres ! Simul ! CPos ! ODir;
@@ -23,9 +36,9 @@ mkPolSent cl = {s = \\f,b => case b of
                 lock_PolSentence = <>};
                
 sentToNoun ps = {s = \\_ => "\"" ++ ps.s ! Indep ! Pos ++ "\"";
-                 a = agrP3 Sg};               
+                 a = agrP3 Sg; lock_NP=<>};               
                
-ConjCN conj ss = conjunctDistrTable2 Number Case conj ss ** {g = ss.g};               
+ConjCN conj ss = conjunctDistrTable2 Number 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 ;   
@@ -40,19 +53,19 @@ at_Prep = mkPrep "at" ;
 per_Prep = mkPrep "per" ;  
 
 O1 = {s = \\_ => "o1" ;
-      a = agrP3 Sg};
+      a = agrP3 Sg}**{lock_NP=<>};
 
 O2 = {s = \\_ => "o2" ;
-      a = agrP3 Sg};
+      a = agrP3 Sg}**{lock_NP=<>};
 
 O3 = {s = \\_ => "o3" ;
-      a = agrP3 Sg};
+      a = agrP3 Sg}**{lock_NP=<>};
       
 O4 = {s = \\_ => "o4" ;
-      a = agrP3 Sg};      
+      a = agrP3 Sg}**{lock_NP=<>};      
       
 O5 = {s = \\_ => "o5" ;
-      a = agrP3 Sg};      
+      a = agrP3 Sg}**{lock_NP=<>};      
 
      
 } 
-- 
cgit v1.2.3