make Romanian compilable for present, and Bronzeage for most languages

examples/bronzeage/BronzeageBul.gf

@@ -0,0 +1,8 @@
+--# -path=.:minimal:present
+
+concrete BronzeageBul of Bronzeage = SwadeshBul **  
+    BronzeageI
+  with
+  (Syntax = SyntaxBul) ** open ResBul,ParamX in {
+}
+

examples/bronzeage/BronzeageCat.gf

@@ -0,0 +1,6 @@
+--# -path=.:present
+
+concrete BronzeageCat of Bronzeage = SwadeshCat ** BronzeageI with
+  (Syntax = SyntaxCat) ** open ResCat in {
+}
+

examples/bronzeage/BronzeageRon.gf

@@ -0,0 +1,6 @@
+--# -path=.:present
+
+concrete BronzeageRon of Bronzeage = SwadeshRon ** BronzeageI with
+  (Syntax = SyntaxRon) ** open ResRon in {
+}
+

examples/bronzeage/BronzeageRus.gf

@@ -1,4 +1,4 @@
---# -path=.:present
+--# -path=.:minimal:present
 
 concrete BronzeageRus of Bronzeage = SwadeshRus ** BronzeageI with
   (Syntax = SyntaxRus) ** open ResRus in {

examples/bronzeage/Makefile

@@ -1,14 +1,4 @@
-# notice: GF_LIB_PATH has to point to GF/lib
-
 all: magnet
 
 magnet:
-#	gfc --make -src --parser=off --name=fre BronzeageFre.gf +RTS -K100M
+	gf -make BronzeageBul.gf BronzeageDan.gf BronzeageEng.gf BronzeageCat.gf BronzeageFre.gf BronzeageGer.gf BronzeageIta.gf BronzeageNor.gf BronzeageRus.gf BronzeageSpa.gf BronzeageSwe.gf +RTS -K100M
-#	gfc --make -src --erasing=on --name=bul BronzeageBul.gf
-	gfc --make -src --erasing=on --name=fin BronzeageFin.gf +RTS -K100M
-	gfc --make -src --erasing=on --name=eng BronzeageEng.gf
-	gfc --make -src --erasing=on --name=ger BronzeageGer.gf 
-	gfc --make -src --erasing=on --name=scand BronzeageNor.gf BronzeageSwe.gf 
-	gfc --make -src --name=rom BronzeageIta.gf BronzeageSpa.gf BronzeageFre.gf
-	gfc --make --name=bronze eng.pgf fin.pgf ger.pgf rom.pgf scand.pgf
-

examples/bronzeage/SwadeshBul.gf

@@ -0,0 +1,5 @@
+--# -path=.:minimal:present
+
+concrete SwadeshBul of Swadesh = SwadeshI with
+  (Lexicon = LexiconBul),
+  (Syntax = SyntaxBul) ;

examples/bronzeage/SwadeshCat.gf

@@ -0,0 +1,5 @@
+--# -path=.:present
+
+concrete SwadeshCat of Swadesh = SwadeshI with
+  (Lexicon = LexiconCat),
+  (Syntax = SyntaxCat) ;

examples/bronzeage/SwadeshRon.gf

@@ -0,0 +1,5 @@
+--# -path=.:present
+
+concrete SwadeshRon of Swadesh = SwadeshI with
+  (Lexicon = LexiconRon),
+  (Syntax = SyntaxRon) ;

lib/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"]

lib/src/api/SymbolicRon.gf

@@ -0,0 +1,5 @@
+--# -path=.:present:mathematical:prelude
+
+resource SymbolicRon = {} -- Symbolic with 
+--  (Symbol = SymbolRon),
+--  (Grammar = GrammarRon) ;

lib/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 : CAdv -> AdN = SyntaxRon.mkAdN ;
-    mkAdN : Str -> AdN = P.mkAdN ;
+--    mkAdN : Str -> AdN = P.mkAdN ;
   } ;
 
-  mkOrd = overload SyntaxEng {
+--  mkOrd = overload SyntaxRon {
-    mkOrd : Str -> Ord = P.mkOrd ;
+--    mkOrd : Str -> Ord = P.mkOrd ;
-  } ;
+--  } ;
 
 
 }

lib/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) ;
+        VPres Indic => vf "" (\a -> verb ! Indi Presn a.n a.p) ;
-                              VImperff  => vf "" (\a -> verb ! Indi Imparf a.n a.p)  ;
+        VPres Conjunct => vf "sã" (\a -> verb ! Subjo SPres a.n a.p) ;
-                              VPasse  Indic => vf "" (\a -> pComp ! a.n ! a.p ++ verb ! PPasse Masc Sg Indef ANomAcc) ; 
+        VImperff  => vf "" (\a -> verb ! Indi Imparf a.n a.p)  ;
-                              VPasse  Conjunct => vf "sã" (\a -> copula.s! Inf ++ verb ! PPasse Masc Sg Indef ANomAcc) ;
+        VPasse  Indic => vf "" (\a -> pComp ! a.n ! a.p ++ verb ! PPasse Masc Sg Indef ANomAcc) ; 
-                              VFut => vf "" (\a -> pFut ! a.n ! a.p ++ verb ! Inf) ;
+        VPasse  Conjunct => vf "sã" (\a -> copula.s! Inf ++ verb ! PPasse Masc Sg Indef ANomAcc) ;
-                              VCondit => vf "" (\a -> pCond ! a.n ! a.p ++ verb ! Inf) 
+        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 
+          cmp = case <<t,a,m> : RTense * Anteriority * Mood> of {
-           {<RPast,Simul,Indic> | <RPres, Anter,Indic> => True ;
+            <RPast,Simul,Indic> | <RPres, Anter,Indic> => True ; --# notpresent
-            <RCond, _, _> => True;
+            <RCond, _, _> => True;  --# notpresent
             _             => False
             } ;
           vp    = useVP vpr ;