diff --git a/examples/bronzeage/BronzeageBul.gf b/examples/bronzeage/BronzeageBul.gf new file mode 100644 index 000000000..0dd97c075 --- /dev/null +++ b/examples/bronzeage/BronzeageBul.gf @@ -0,0 +1,8 @@ +--# -path=.:minimal:present + +concrete BronzeageBul of Bronzeage = SwadeshBul ** + BronzeageI + with + (Syntax = SyntaxBul) ** open ResBul,ParamX in { +} + diff --git a/examples/bronzeage/BronzeageCat.gf b/examples/bronzeage/BronzeageCat.gf new file mode 100644 index 000000000..6c38f96dc --- /dev/null +++ b/examples/bronzeage/BronzeageCat.gf @@ -0,0 +1,6 @@ +--# -path=.:present + +concrete BronzeageCat of Bronzeage = SwadeshCat ** BronzeageI with + (Syntax = SyntaxCat) ** open ResCat in { +} + diff --git a/examples/bronzeage/BronzeageRon.gf b/examples/bronzeage/BronzeageRon.gf new file mode 100644 index 000000000..a0c88b007 --- /dev/null +++ b/examples/bronzeage/BronzeageRon.gf @@ -0,0 +1,6 @@ +--# -path=.:present + +concrete BronzeageRon of Bronzeage = SwadeshRon ** BronzeageI with + (Syntax = SyntaxRon) ** open ResRon in { +} + diff --git a/examples/bronzeage/BronzeageRus.gf b/examples/bronzeage/BronzeageRus.gf index c611133ef..876786f50 100644 --- a/examples/bronzeage/BronzeageRus.gf +++ b/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 { diff --git a/examples/bronzeage/Makefile b/examples/bronzeage/Makefile index 2c6d60e9d..5856b553d 100644 --- a/examples/bronzeage/Makefile +++ b/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 -# 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 - + 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 diff --git a/examples/bronzeage/SwadeshBul.gf b/examples/bronzeage/SwadeshBul.gf new file mode 100644 index 000000000..c1060ffa2 --- /dev/null +++ b/examples/bronzeage/SwadeshBul.gf @@ -0,0 +1,5 @@ +--# -path=.:minimal:present + +concrete SwadeshBul of Swadesh = SwadeshI with + (Lexicon = LexiconBul), + (Syntax = SyntaxBul) ; diff --git a/examples/bronzeage/SwadeshCat.gf b/examples/bronzeage/SwadeshCat.gf new file mode 100644 index 000000000..1ebeddd04 --- /dev/null +++ b/examples/bronzeage/SwadeshCat.gf @@ -0,0 +1,5 @@ +--# -path=.:present + +concrete SwadeshCat of Swadesh = SwadeshI with + (Lexicon = LexiconCat), + (Syntax = SyntaxCat) ; diff --git a/examples/bronzeage/SwadeshRon.gf b/examples/bronzeage/SwadeshRon.gf new file mode 100644 index 000000000..0ce46286b --- /dev/null +++ b/examples/bronzeage/SwadeshRon.gf @@ -0,0 +1,5 @@ +--# -path=.:present + +concrete SwadeshRon of Swadesh = SwadeshI with + (Lexicon = LexiconRon), + (Syntax = SyntaxRon) ; diff --git a/lib/src/Make.hs b/lib/src/Make.hs index 19d19bfa5..869a2e87f 100644 --- a/lib/src/Make.hs +++ b/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"] diff --git a/lib/src/api/SymbolicRon.gf b/lib/src/api/SymbolicRon.gf new file mode 100644 index 000000000..748025880 --- /dev/null +++ b/lib/src/api/SymbolicRon.gf @@ -0,0 +1,5 @@ +--# -path=.:present:mathematical:prelude + +resource SymbolicRon = {} -- Symbolic with +-- (Symbol = SymbolRon), +-- (Grammar = GrammarRon) ; diff --git a/lib/src/api/TryRon.gf b/lib/src/api/TryRon.gf index 0464291a1..463b77ff4 100644 --- a/lib/src/api/TryRon.gf +++ b/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 : 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/lib/src/romanian/ResRon.gf b/lib/src/romanian/ResRon.gf index aadecd5e0..d9f783fcf 100644 --- a/lib/src/romanian/ResRon.gf +++ b/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) ; - 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 of - { | => True ; - => True; + cmp = case < : RTense * Anteriority * Mood> of { + | => True ; --# notpresent + => True; --# notpresent _ => False } ; vp = useVP vpr ;