FixedRon

2 files changed, 20 insertions, 18 deletions

diff --git a/examples/phrasebook/SentencesRon.gf b/examples/phrasebook/SentencesRon.gf
index f7c404f60..94c94d9eb 100644
--- a/examples/phrasebook/SentencesRon.gf
+++ b/examples/phrasebook/SentencesRon.gf
@@ -1,26 +1,27 @@
 
 concrete SentencesRon of Sentences = NumeralRon ** SentencesI - [
-  IFemale, YouFamFemale, YouPolFemale, IMale, YouFamMale, YouPolMale
- ] 
+  IFemale, YouFamFemale, YouPolFemale, IMale, YouFamMale, YouPolMale,
+  ThePlace
+] 
   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} ;
+
+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} ;
+ ThePlace kind = let name : NP = mkNP the_Quant kind.name in {
+         name = name ;
+         at = if_then_else Adv kind.at.needIndef (mkAdv kind.at name) (mkAdv kind.at (mkNP kind.name));
+         to = if_then_else Adv kind.at.needIndef (mkAdv kind.to name) (mkAdv kind.at (mkNP kind.name))
+       } ;
 
 }
 
diff --git a/examples/phrasebook/WordsRon.gf b/examples/phrasebook/WordsRon.gf
index b20c5df1c..85b88046d 100644
--- a/examples/phrasebook/WordsRon.gf
+++ b/examples/phrasebook/WordsRon.gf
@@ -88,11 +88,11 @@ concrete WordsRon of Words = SentencesRon ** open
       (mkNP (mkNP a_Det (P.mkN "cameră")) (SyntaxRon.mkAdv for_Prep (mkNP num (P.mkN "persoană")))) ;
     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 ;
+    AHasName p name = mkCl p.name (P.mmkV2 (mkRVAcc (v_besch119 "numi")) (P.noPrep P.Nom)) name ;
     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 ;
+    ALike p item = DatSubjCompCl p.name  (mkVP (v_besch71 "plăcea")) item ;
     ALive p co = 
       mkCl p.name (mkVP (mkVP (v_besch121 "locui")) (SyntaxRon.mkAdv in_Prep co)) ;
     ALove p q = mkCl p.name (P.dirV2 (P.mkV "iubi")) q.name ;
@@ -166,7 +166,8 @@ open_A : A = P.mkA "deschis" ;
           ad = {s = d} in
       mkNPDay day ad ad; ---- difference is enforced by additional constructions
 
-    xOf : GNumber -> N -> NPPerson -> NPPerson = \n,x,p -> mkRelative n (mkCN x) p ; 
+    xOf : GNumber -> N -> NPPerson -> NPPerson = \n,x,p -> mkRelative n (refCN x) p ; 
+
     
     
 -- auxiliaries