From 24ba17ba39fc99fada4333d33f1822575aa4b742 Mon Sep 17 00:00:00 2001 From: aarne Date: Sat, 13 Sep 2008 06:33:42 +0000 Subject: [PATCH] removed inheritance of Numerals in Syntax, added Combinators (for all langs now) --- resource/api/CombinatorsAra.gf | 3 +++ resource/api/CombinatorsBul.gf | 3 +++ resource/api/CombinatorsCat.gf | 3 +++ resource/api/CombinatorsDan.gf | 3 +++ resource/api/CombinatorsFin.gf | 3 +++ resource/api/CombinatorsFre.gf | 3 +++ resource/api/CombinatorsGer.gf | 3 +++ resource/api/CombinatorsHin.gf | 3 +++ resource/api/CombinatorsIna.gf | 3 +++ resource/api/CombinatorsIta.gf | 3 +++ resource/api/CombinatorsNor.gf | 3 +++ resource/api/CombinatorsRus.gf | 3 +++ resource/api/CombinatorsSpa.gf | 3 +++ resource/api/CombinatorsTha.gf | 3 +++ resource/api/Syntax.gf | 2 +- resource/api/SyntaxBul.gf | 2 +- resource/api/SyntaxCat.gf | 2 +- resource/api/SyntaxDan.gf | 2 +- resource/api/SyntaxEng.gf | 3 ++- resource/api/SyntaxFin.gf | 2 +- resource/api/SyntaxFre.gf | 2 +- resource/api/SyntaxGer.gf | 2 +- resource/api/SyntaxIta.gf | 2 +- resource/api/SyntaxNor.gf | 2 +- resource/api/SyntaxRus.gf | 2 +- resource/api/SyntaxSpa.gf | 3 ++- resource/api/SyntaxSwe.gf | 3 ++- 27 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 resource/api/CombinatorsAra.gf create mode 100644 resource/api/CombinatorsBul.gf create mode 100644 resource/api/CombinatorsCat.gf create mode 100644 resource/api/CombinatorsDan.gf create mode 100644 resource/api/CombinatorsFin.gf create mode 100644 resource/api/CombinatorsFre.gf create mode 100644 resource/api/CombinatorsGer.gf create mode 100644 resource/api/CombinatorsHin.gf create mode 100644 resource/api/CombinatorsIna.gf create mode 100644 resource/api/CombinatorsIta.gf create mode 100644 resource/api/CombinatorsNor.gf create mode 100644 resource/api/CombinatorsRus.gf create mode 100644 resource/api/CombinatorsSpa.gf create mode 100644 resource/api/CombinatorsTha.gf diff --git a/resource/api/CombinatorsAra.gf b/resource/api/CombinatorsAra.gf new file mode 100644 index 00000000..707b6be7 --- /dev/null +++ b/resource/api/CombinatorsAra.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsAra = Combinators with (Grammar = GrammarAra) ; diff --git a/resource/api/CombinatorsBul.gf b/resource/api/CombinatorsBul.gf new file mode 100644 index 00000000..882a7c87 --- /dev/null +++ b/resource/api/CombinatorsBul.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsBul = Combinators with (Grammar = GrammarBul) ; diff --git a/resource/api/CombinatorsCat.gf b/resource/api/CombinatorsCat.gf new file mode 100644 index 00000000..af78ebfd --- /dev/null +++ b/resource/api/CombinatorsCat.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsCat = Combinators with (Grammar = GrammarCat) ; diff --git a/resource/api/CombinatorsDan.gf b/resource/api/CombinatorsDan.gf new file mode 100644 index 00000000..dff911eb --- /dev/null +++ b/resource/api/CombinatorsDan.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsDan = Combinators with (Grammar = GrammarDan) ; diff --git a/resource/api/CombinatorsFin.gf b/resource/api/CombinatorsFin.gf new file mode 100644 index 00000000..e5da9640 --- /dev/null +++ b/resource/api/CombinatorsFin.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsFin = Combinators with (Grammar = GrammarFin) ; diff --git a/resource/api/CombinatorsFre.gf b/resource/api/CombinatorsFre.gf new file mode 100644 index 00000000..48d2166e --- /dev/null +++ b/resource/api/CombinatorsFre.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsFre = Combinators with (Grammar = GrammarFre) ; diff --git a/resource/api/CombinatorsGer.gf b/resource/api/CombinatorsGer.gf new file mode 100644 index 00000000..e209fa13 --- /dev/null +++ b/resource/api/CombinatorsGer.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsGer = Combinators with (Grammar = GrammarGer) ; diff --git a/resource/api/CombinatorsHin.gf b/resource/api/CombinatorsHin.gf new file mode 100644 index 00000000..e75f470c --- /dev/null +++ b/resource/api/CombinatorsHin.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsHin = Combinators with (Grammar = GrammarHin) ; diff --git a/resource/api/CombinatorsIna.gf b/resource/api/CombinatorsIna.gf new file mode 100644 index 00000000..43db76ef --- /dev/null +++ b/resource/api/CombinatorsIna.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsIna = Combinators with (Grammar = GrammarIna) ; diff --git a/resource/api/CombinatorsIta.gf b/resource/api/CombinatorsIta.gf new file mode 100644 index 00000000..40c8ec88 --- /dev/null +++ b/resource/api/CombinatorsIta.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsIta = Combinators with (Grammar = GrammarIta) ; diff --git a/resource/api/CombinatorsNor.gf b/resource/api/CombinatorsNor.gf new file mode 100644 index 00000000..780c88ab --- /dev/null +++ b/resource/api/CombinatorsNor.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsNor = Combinators with (Grammar = GrammarNor) ; diff --git a/resource/api/CombinatorsRus.gf b/resource/api/CombinatorsRus.gf new file mode 100644 index 00000000..b99b5555 --- /dev/null +++ b/resource/api/CombinatorsRus.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsRus = Combinators with (Grammar = GrammarRus) ; diff --git a/resource/api/CombinatorsSpa.gf b/resource/api/CombinatorsSpa.gf new file mode 100644 index 00000000..43b881b5 --- /dev/null +++ b/resource/api/CombinatorsSpa.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsSpa = Combinators with (Grammar = GrammarSpa) ; diff --git a/resource/api/CombinatorsTha.gf b/resource/api/CombinatorsTha.gf new file mode 100644 index 00000000..5c77348b --- /dev/null +++ b/resource/api/CombinatorsTha.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource CombinatorsTha = Combinators with (Grammar = GrammarTha) ; diff --git a/resource/api/Syntax.gf b/resource/api/Syntax.gf index 0350a978..1302e639 100644 --- a/resource/api/Syntax.gf +++ b/resource/api/Syntax.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -interface Syntax = Constructors, Cat, Structural, Numeral ; +interface Syntax = Constructors, Cat, Structural, Combinators ; diff --git a/resource/api/SyntaxBul.gf b/resource/api/SyntaxBul.gf index 03e9dff6..ff11f688 100644 --- a/resource/api/SyntaxBul.gf +++ b/resource/api/SyntaxBul.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxBul of Syntax = ConstructorsBul, CatBul, StructuralBul, NumeralBul ; +instance SyntaxBul of Syntax = ConstructorsBul, CatBul, StructuralBul, CombinatorsBul ; diff --git a/resource/api/SyntaxCat.gf b/resource/api/SyntaxCat.gf index a1872680..73ff4829 100644 --- a/resource/api/SyntaxCat.gf +++ b/resource/api/SyntaxCat.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxCat of Syntax = ConstructorsCat, CatCat, StructuralCat, NumeralCat ; +instance SyntaxCat of Syntax = ConstructorsCat, CatCat, StructuralCat, CombinatorsCat ; diff --git a/resource/api/SyntaxDan.gf b/resource/api/SyntaxDan.gf index 43430ce0..83d07d82 100644 --- a/resource/api/SyntaxDan.gf +++ b/resource/api/SyntaxDan.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxDan of Syntax = ConstructorsDan, CatDan, StructuralDan, NumeralDan ; +instance SyntaxDan of Syntax = ConstructorsDan, CatDan, StructuralDan, CombinatorsDan ; diff --git a/resource/api/SyntaxEng.gf b/resource/api/SyntaxEng.gf index 0ee6e55b..940ee057 100644 --- a/resource/api/SyntaxEng.gf +++ b/resource/api/SyntaxEng.gf @@ -1,4 +1,5 @@ --# -path=.:alltenses:prelude -instance SyntaxEng of Syntax = ConstructorsEng, CatEng, StructuralEng, NumeralEng ; +instance SyntaxEng of Syntax = + ConstructorsEng, CatEng, StructuralEng, CombinatorsEng ; diff --git a/resource/api/SyntaxFin.gf b/resource/api/SyntaxFin.gf index eef68d09..300c5617 100644 --- a/resource/api/SyntaxFin.gf +++ b/resource/api/SyntaxFin.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxFin of Syntax = ConstructorsFin, CatFin, StructuralFin, NumeralFin ; +instance SyntaxFin of Syntax = ConstructorsFin, CatFin, StructuralFin, CombinatorsFin ; diff --git a/resource/api/SyntaxFre.gf b/resource/api/SyntaxFre.gf index 52fd7435..8f5ffa20 100644 --- a/resource/api/SyntaxFre.gf +++ b/resource/api/SyntaxFre.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxFre of Syntax = ConstructorsFre, CatFre, StructuralFre, NumeralFre ; +instance SyntaxFre of Syntax = ConstructorsFre, CatFre, StructuralFre, CombinatorsFre ; diff --git a/resource/api/SyntaxGer.gf b/resource/api/SyntaxGer.gf index 87b3d03a..59f49527 100644 --- a/resource/api/SyntaxGer.gf +++ b/resource/api/SyntaxGer.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxGer of Syntax = ConstructorsGer, CatGer, StructuralGer, NumeralGer ; +instance SyntaxGer of Syntax = ConstructorsGer, CatGer, StructuralGer, CombinatorsGer ; diff --git a/resource/api/SyntaxIta.gf b/resource/api/SyntaxIta.gf index 6b0f99b3..3bba98dd 100644 --- a/resource/api/SyntaxIta.gf +++ b/resource/api/SyntaxIta.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxIta of Syntax = ConstructorsIta, CatIta, StructuralIta, NumeralIta ; +instance SyntaxIta of Syntax = ConstructorsIta, CatIta, StructuralIta, CombinatorsIta ; diff --git a/resource/api/SyntaxNor.gf b/resource/api/SyntaxNor.gf index ee2ad1bb..98b4d41c 100644 --- a/resource/api/SyntaxNor.gf +++ b/resource/api/SyntaxNor.gf @@ -1,5 +1,5 @@ --# -path=.:alltenses:prelude -instance SyntaxNor of Syntax = ConstructorsNor, CatNor, StructuralNor, NumeralNor +instance SyntaxNor of Syntax = ConstructorsNor, CatNor, StructuralNor, CombinatorsNor ; diff --git a/resource/api/SyntaxRus.gf b/resource/api/SyntaxRus.gf index 0804e209..56f750ac 100644 --- a/resource/api/SyntaxRus.gf +++ b/resource/api/SyntaxRus.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxRus of Syntax = ConstructorsRus, CatRus, StructuralRus, NumeralRus ; +instance SyntaxRus of Syntax = ConstructorsRus, CatRus, StructuralRus, CombinatorsRus ; diff --git a/resource/api/SyntaxSpa.gf b/resource/api/SyntaxSpa.gf index 7cf6b764..40315b43 100644 --- a/resource/api/SyntaxSpa.gf +++ b/resource/api/SyntaxSpa.gf @@ -1,4 +1,5 @@ --# -path=.:alltenses:prelude -instance SyntaxSpa of Syntax = ConstructorsSpa, CatSpa, StructuralSpa, NumeralSpa ; +instance SyntaxSpa of Syntax = + ConstructorsSpa, CatSpa, StructuralSpa, CombinatorsSpa ; diff --git a/resource/api/SyntaxSwe.gf b/resource/api/SyntaxSwe.gf index ecf6bbb0..b1b603f8 100644 --- a/resource/api/SyntaxSwe.gf +++ b/resource/api/SyntaxSwe.gf @@ -1,4 +1,5 @@ --# -path=.:alltenses:prelude -instance SyntaxSwe of Syntax = ConstructorsSwe, CatSwe, StructuralSwe, NumeralSwe ; +instance SyntaxSwe of Syntax = + ConstructorsSwe, CatSwe, StructuralSwe, CombinatorsSwe ;