From 370bdc57fe52951d1226f94a68fd1fa1cee0b77b Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Tue, 15 Sep 2009 15:27:42 +0000
Subject: [PATCH] make Romanian compilable for present, and Bronzeage for most
 languages

---
 src/Make.hs            |  6 +++---
 src/api/SymbolicRon.gf |  5 +++++
 src/api/TryRon.gf      | 14 +++++++-------
 src/romanian/ResRon.gf | 21 +++++++++++----------
 4 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 src/api/SymbolicRon.gf

diff --git a/src/Make.hs b/src/Make.hs
index 19d19bfa5..869a2e87f 100644
--- a/src/Make.hs
+++ b/src/Make.hs
@@ -54,13 +54,13 @@ langsCoding = [
 langs = map fst langsCoding
 
 -- languagues for which to compile Lang
-langsLang = langs `except` ["Ara","Pol","Ron","Tur"]
+langsLang = langs `except` ["Pol","Tur"]
 
 -- languages for which to compile Try 
-langsAPI  = langsLang `except` ["Bul","Hin","Ina","Lat","Rus","Tha"]
+langsAPI  = langsLang `except` ["Ara","Bul","Hin","Ina","Lat","Rus","Tha"]
 
 -- languages for which to compile minimal Syntax
-langsMinimal = langs `only` ["Eng","Bul","Ger","Ita"]
+langsMinimal = langs `only` ["Ara","Eng","Bul","Rus"]
 
 -- languages for which to run treebank test
 langsTest = langsLang `except` ["Ara","Bul","Cat","Hin","Rus","Spa","Tha"]
diff --git a/src/api/SymbolicRon.gf b/src/api/SymbolicRon.gf
new file mode 100644
index 000000000..748025880
--- /dev/null
+++ b/src/api/SymbolicRon.gf
@@ -0,0 +1,5 @@
+--# -path=.:present:mathematical:prelude
+
+resource SymbolicRon = {} -- Symbolic with 
+--  (Symbol = SymbolRon),
+--  (Grammar = GrammarRon) ;
diff --git a/src/api/TryRon.gf b/src/api/TryRon.gf
index 0464291a1..463b77ff4 100644
--- a/src/api/TryRon.gf
+++ b/src/api/TryRon.gf
@@ -1,22 +1,22 @@
 --# -path=.:alltenses:prelude
 
-resource TryRon = SyntaxRon-[mkAdN], LexiconRon, ParadigmsRon - [mkAdv,mkAdN,mkOrd] ** 
+resource TryRon = SyntaxRon-[mkAdN], LexiconRon, ParadigmsRon - [mkAdv,mkAdN,mkOrd,mkDet,mkNP] ** 
   open (P = ParadigmsRon) in {
 
 oper
 
-  mkAdv = overload SyntaxEng {
+  mkAdv = overload SyntaxRon {
     mkAdv : Str -> Adv = P.mkAdv ;
   } ;
 
   mkAdN = overload {
-    mkAdN : CAdv -> AdN = SyntaxEng.mkAdN ;
-    mkAdN : Str -> AdN = P.mkAdN ;
+    mkAdN : CAdv -> AdN = SyntaxRon.mkAdN ;
+--    mkAdN : Str -> AdN = P.mkAdN ;
   } ;
 
-  mkOrd = overload SyntaxEng {
-    mkOrd : Str -> Ord = P.mkOrd ;
-  } ;
+--  mkOrd = overload SyntaxRon {
+--    mkOrd : Str -> Ord = P.mkOrd ;
+--  } ;
 
 
 }
diff --git a/src/romanian/ResRon.gf b/src/romanian/ResRon.gf
index aadecd5e0..d9f783fcf 100644
--- a/src/romanian/ResRon.gf
+++ b/src/romanian/ResRon.gf
@@ -189,13 +189,14 @@ oper
     in {
     s = table {
       VPFinite tm Simul => case tm of 
-                             {VPres Indic => vf "" (\a -> verb ! Indi Presn a.n a.p) ;
-                              VPres Conjunct => vf "sã" (\a -> verb ! Subjo SPres a.n a.p) ;
-                              VImperff  => vf "" (\a -> verb ! Indi Imparf a.n a.p)  ;
-                              VPasse  Indic => vf "" (\a -> pComp ! a.n ! a.p ++ verb ! PPasse Masc Sg Indef ANomAcc) ; 
-                              VPasse  Conjunct => vf "sã" (\a -> copula.s! Inf ++ verb ! PPasse Masc Sg Indef ANomAcc) ;
-                              VFut => vf "" (\a -> pFut ! a.n ! a.p ++ verb ! Inf) ;
-                              VCondit => vf "" (\a -> pCond ! a.n ! a.p ++ verb ! Inf) 
+                             {
+        VPres Indic => vf "" (\a -> verb ! Indi Presn a.n a.p) ;
+        VPres Conjunct => vf "sã" (\a -> verb ! Subjo SPres a.n a.p) ;
+        VImperff  => vf "" (\a -> verb ! Indi Imparf a.n a.p)  ;
+        VPasse  Indic => vf "" (\a -> pComp ! a.n ! a.p ++ verb ! PPasse Masc Sg Indef ANomAcc) ; 
+        VPasse  Conjunct => vf "sã" (\a -> copula.s! Inf ++ verb ! PPasse Masc Sg Indef ANomAcc) ;
+        VFut => vf "" (\a -> pFut ! a.n ! a.p ++ verb ! Inf) ;
+        VCondit => vf "" (\a -> pCond ! a.n ! a.p ++ verb ! Inf) 
                               } ;  
       VPFinite tm Anter => case tm of 
                               {VPres Indic => vf "" (\a -> pComp ! a.n ! a.p ++ verb ! PPasse Masc Sg Indef ANomAcc) ; 
@@ -483,9 +484,9 @@ oper
             RCond  => VCondit ;        
             RPres  => VPres m
             } ;
-          cmp = case <t,a,m> of 
-           {<RPast,Simul,Indic> | <RPres, Anter,Indic> => True ;
-            <RCond, _, _> => True;
+          cmp = case <<t,a,m> : RTense * Anteriority * Mood> of {
+            <RPast,Simul,Indic> | <RPres, Anter,Indic> => True ; --# notpresent
+            <RCond, _, _> => True;  --# notpresent
             _             => False
             } ;
           vp    = useVP vpr ;