FixedRon

2 files changed, 31 insertions, 11 deletions

diff --git a/examples/phrasebook/SentencesRon.gf b/examples/phrasebook/SentencesRon.gf
index 7043d7982..f7c404f60 100644
--- a/examples/phrasebook/SentencesRon.gf
+++ b/examples/phrasebook/SentencesRon.gf
@@ -1,4 +1,27 @@
-concrete SentencesRon of Sentences = NumeralRon ** SentencesI with 
-  (Syntax = SyntaxRon),
-  (Symbolic = SymbolicRon),
-  (Lexicon = LexiconRon) ;
+
+concrete SentencesRon of Sentences = NumeralRon ** SentencesI - [
+  IFemale, YouFamFemale, YouPolFemale, IMale, YouFamMale, YouPolMale
+ ] 
+  with 
+    (Syntax = SyntaxRon), 
+    (Symbolic = SymbolicRon), 
+    (Lexicon = LexiconRon) ** 
+  open SyntaxRon, ExtraRon in {
+
+    lin 
+      IFemale = 
+        {name = mkNP i8fem_Pron ; isPron = True ; poss = mkQuant i_Pron} ; 
+      YouFamFemale = 
+        {name = mkNP youSg8fem_Pron ; isPron = True ; poss = mkQuant youSg_Pron} ; 
+      YouPolFemale = 
+        {name = mkNP youPol8fem_Pron ; isPron = True ; poss = mkQuant youPol_Pron};
+      IMale = 
+        {name = mkNP i_Pron ; isPron = True ; poss = mkQuant i_Pron} ; 
+      YouFamMale = 
+        {name = mkNP youSg_Pron ; isPron = True ; poss = mkQuant youSg_Pron} ; 
+      YouPolMale = 
+        {name = mkNP youPol_Pron ; isPron = True ; poss = mkQuant youPol_Pron} ;
+
+}
+
+
diff --git a/examples/phrasebook/WordsRon.gf b/examples/phrasebook/WordsRon.gf
index 7bd0ec252..b20c5df1c 100644
--- a/examples/phrasebook/WordsRon.gf
+++ b/examples/phrasebook/WordsRon.gf
@@ -1,7 +1,7 @@
 -- (c) 2009 Ramona Enache under LGPL
 
 concrete WordsRon of Words = SentencesRon ** open
-  SyntaxRon,
+  SyntaxRon, ResRon,
   (P = ParadigmsRon),
   (L = LexiconRon),
   BeschRon,
@@ -89,7 +89,7 @@ concrete WordsRon of Words = SentencesRon ** open
     AHasTable p num = mkCl p.name have_V2 
       (mkNP (mkNP a_Det (P.mkN "masa" "mese")) (SyntaxRon.mkAdv for_Prep (mkNP num (P.mkN "persoană")))) ;
     AHasName p name = mkCl p.name (P.dirV2 (mkRVAcc (v_besch119 "numi"))) name ;
-    AHungry p = DatSubjCl p.name (mkVP (mkCN (P.mkN "foame"))) ;
+    AHungry p = DatSubjCl p.name (mkVP (mkNP (P.mkN "foame"))) ;
     AIll p = mkCl p.name (P.mkA "bolnav") ;
     AKnow p = mkCl p.name (v_besch122 "şti") ;
     ALike p item = mkCl p.name (P.dirV2 (v_besch71 "plăcea")) item ;
@@ -100,7 +100,7 @@ concrete WordsRon of Words = SentencesRon ** open
     AReady p = mkCl p.name (P.mkA "gata" "gata" "gata" "gata") ;
     AScared p = mkCl p.name (P.mkA "speriat") ;
     ASpeak p lang = mkCl p.name  (P.dirV2 (P.mkV "vorbi")) lang ;
-    AThirsty p = DatSubjCl p.name (mkVP (mkCN (P.mkN "sete"))) ;
+    AThirsty p = DatSubjCl p.name (mkVP (mkNP (P.mkN "sete"))) ;
     ATired p = mkCl p.name (P.mkA "obosit") ;
     AUnderstand p = mkCl p.name (v_besch83 "înţelege") ;
     AWant p obj = mkCl p.name (P.dirV2 (v_besch74 "vrea")) obj ;
@@ -138,7 +138,7 @@ concrete WordsRon of Words = SentencesRon ** open
     Son = xOf sing (P.mkN "fiu") ;
     Daughter = xOf sing (P.mkN "fiică") ;
     Children = xOf plur L.child_N ;    
-    
+ 
 -- week days
 
     Monday = mkDay "luni" ;
@@ -166,9 +166,6 @@ open_A : A = P.mkA "deschis" ;
           ad = {s = d} in
       mkNPDay day ad ad; ---- difference is enforced by additional constructions
 
-   -- mkPlace : N -> Prep -> {name : CN ; at : Prep ; to : Prep} = \p,i ->
-   --   mkCNPlace (mkCN p) i P.dative ;
-
     xOf : GNumber -> N -> NPPerson -> NPPerson = \n,x,p -> mkRelative n (mkCN x) p ;