From 1ea9f7cea7a1667fdb899f722ac922d56aa07b44 Mon Sep 17 00:00:00 2001 From: hallgren Date: Wed, 26 Aug 2015 13:53:16 +0200 Subject: [PATCH] lib/src/*/Numeral*.gf: fix inconsistent inheritance form Cat While the abstract Numeral inherits only Cat[Numeral,Digits], some of the concrete NumeralNNN of Numeral inherited everything from CatNNN. Normally the compiler outputs a warning message when a concrete syntax contains superflous lincats, but apparently not when they get included through inheritance... This does not seem to cause problems in the Haskell run-time system, but the C run-time system fails to load PGFs with superflous lincats. This problems shows up when creating application grammars that inherit Numeral. The Phrasebook is an example of such a grammar. --- lib/src/afrikaans/NumeralAfr.gf | 2 +- lib/src/amharic/NumeralAmh.gf | 2 +- lib/src/arabic/NumeralAra.gf | 2 +- lib/src/bulgarian/NumeralBul.gf | 2 +- lib/src/chinese/NumeralChi.gf | 2 +- lib/src/danish/NumeralDan.gf | 2 +- lib/src/greek/NumeralGre.gf | 2 +- lib/src/hindi/NumeralHin.gf | 2 +- lib/src/interlingua/NumeralIna.gf | 2 +- lib/src/japanese/NumeralJpn.gf | 2 +- lib/src/latin/NumeralLat.gf | 2 +- lib/src/mongolian/NumeralMon.gf | 2 +- lib/src/nepali/NumeralNep.gf | 2 +- lib/src/norwegian/NumeralNor.gf | 2 +- lib/src/polish/NumeralPol.gf | 2 +- lib/src/punjabi/NumeralPnb.gf | 2 +- lib/src/romanian/NumeralRon.gf | 2 +- lib/src/russian/NumeralRus.gf | 2 +- lib/src/sindhi/NumeralSnd.gf | 2 +- lib/src/swahili/NumeralSwa.gf | 2 +- lib/src/telugu/NumeralTel.gf | 2 +- lib/src/thai/NumeralTha.gf | 2 +- lib/src/turkish/NumeralTur.gf | 2 +- lib/src/urdu/NumeralUrd.gf | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/src/afrikaans/NumeralAfr.gf b/lib/src/afrikaans/NumeralAfr.gf index f257be4dc1..e4aca3883f 100644 --- a/lib/src/afrikaans/NumeralAfr.gf +++ b/lib/src/afrikaans/NumeralAfr.gf @@ -1,5 +1,5 @@ -concrete NumeralAfr of Numeral = CatAfr ** open ResAfr, Prelude in { +concrete NumeralAfr of Numeral = CatAfr [Numeral,Digits] ** open ResAfr, Prelude in { flags optimize = all_subs ; coding=utf8 ; diff --git a/lib/src/amharic/NumeralAmh.gf b/lib/src/amharic/NumeralAmh.gf index c0d8abfb98..79cad2e3a5 100644 --- a/lib/src/amharic/NumeralAmh.gf +++ b/lib/src/amharic/NumeralAmh.gf @@ -1,5 +1,5 @@ -concrete NumeralAmh of Numeral = CatAmh ** open ResAmh,ParamX,Prelude in { +concrete NumeralAmh of Numeral = CatAmh [Numeral,Digits] ** open ResAmh,ParamX,Prelude in { flags coding = utf8; lincat diff --git a/lib/src/arabic/NumeralAra.gf b/lib/src/arabic/NumeralAra.gf index daf799a87d..c2e7df741f 100644 --- a/lib/src/arabic/NumeralAra.gf +++ b/lib/src/arabic/NumeralAra.gf @@ -1,4 +1,4 @@ -concrete NumeralAra of Numeral = CatAra ** +concrete NumeralAra of Numeral = CatAra [Numeral,Digits] ** open Predef, Prelude, ResAra, MorphoAra in { flags coding=utf8 ; diff --git a/lib/src/bulgarian/NumeralBul.gf b/lib/src/bulgarian/NumeralBul.gf index 355fa8c88d..0091426af3 100644 --- a/lib/src/bulgarian/NumeralBul.gf +++ b/lib/src/bulgarian/NumeralBul.gf @@ -1,5 +1,5 @@ --# -coding=cp1251 -concrete NumeralBul of Numeral = CatBul ** open Prelude, ResBul in { +concrete NumeralBul of Numeral = CatBul [Numeral,Digits] ** open Prelude, ResBul in { flags coding=cp1251 ; diff --git a/lib/src/chinese/NumeralChi.gf b/lib/src/chinese/NumeralChi.gf index 05704a023a..4ac534b922 100644 --- a/lib/src/chinese/NumeralChi.gf +++ b/lib/src/chinese/NumeralChi.gf @@ -1,4 +1,4 @@ -concrete NumeralChi of Numeral = CatChi ** open ResChi, Prelude in { +concrete NumeralChi of Numeral = CatChi [Numeral,Digits] ** open ResChi, Prelude in { flags coding = utf8 ; diff --git a/lib/src/danish/NumeralDan.gf b/lib/src/danish/NumeralDan.gf index 769c000b8b..3e8a84f285 100644 --- a/lib/src/danish/NumeralDan.gf +++ b/lib/src/danish/NumeralDan.gf @@ -1,4 +1,4 @@ -concrete NumeralDan of Numeral = CatDan ** open MorphoDan,Prelude in { +concrete NumeralDan of Numeral = CatDan [Numeral,Digits] ** open MorphoDan,Prelude in { flags coding=utf8 ; diff --git a/lib/src/greek/NumeralGre.gf b/lib/src/greek/NumeralGre.gf index b20d97a318..6473c1f633 100644 --- a/lib/src/greek/NumeralGre.gf +++ b/lib/src/greek/NumeralGre.gf @@ -1,4 +1,4 @@ -concrete NumeralGre of Numeral = CatGre ** open ResGre,Prelude in { +concrete NumeralGre of Numeral = CatGre [Numeral,Digits] ** open ResGre,Prelude in { flags coding= utf8 ; diff --git a/lib/src/hindi/NumeralHin.gf b/lib/src/hindi/NumeralHin.gf index ac1abdf734..4818d26a90 100644 --- a/lib/src/hindi/NumeralHin.gf +++ b/lib/src/hindi/NumeralHin.gf @@ -2,7 +2,7 @@ -- Modification for Urdu Shafqat Virk -concrete NumeralHin of Numeral = CatHin ** open ResHin,CommonHindustani,ParamX, Prelude in { +concrete NumeralHin of Numeral = CatHin [Numeral,Digits] ** open ResHin,CommonHindustani,ParamX, Prelude in { flags coding=utf8 ; param DForm = unit | ten ; diff --git a/lib/src/interlingua/NumeralIna.gf b/lib/src/interlingua/NumeralIna.gf index 6d03107b24..dbec5cf30c 100644 --- a/lib/src/interlingua/NumeralIna.gf +++ b/lib/src/interlingua/NumeralIna.gf @@ -1,4 +1,4 @@ -concrete NumeralIna of Numeral = CatIna ** open ResIna,Prelude in { +concrete NumeralIna of Numeral = CatIna [Numeral,Digits] ** open ResIna,Prelude in { lincat Digit = {s : DForm => CardOrd => Str} ; diff --git a/lib/src/japanese/NumeralJpn.gf b/lib/src/japanese/NumeralJpn.gf index d4f0cdeec8..90ce9a46c5 100644 --- a/lib/src/japanese/NumeralJpn.gf +++ b/lib/src/japanese/NumeralJpn.gf @@ -1,4 +1,4 @@ -concrete NumeralJpn of Numeral = CatJpn ** open ResJpn, ParadigmsJpn, Prelude in { +concrete NumeralJpn of Numeral = CatJpn [Numeral,Digits] ** open ResJpn, ParadigmsJpn, Prelude in { flags coding = utf8 ; diff --git a/lib/src/latin/NumeralLat.gf b/lib/src/latin/NumeralLat.gf index ca05f7d4ca..c0d59a3d03 100644 --- a/lib/src/latin/NumeralLat.gf +++ b/lib/src/latin/NumeralLat.gf @@ -1,4 +1,4 @@ -concrete NumeralLat of Numeral = CatLat ** open ResLat,Prelude in { +concrete NumeralLat of Numeral = CatLat [Numeral,Digits] ** open ResLat,Prelude in { -- --lincat -- Digit = {s : DForm => CardOrd => Str} ; diff --git a/lib/src/mongolian/NumeralMon.gf b/lib/src/mongolian/NumeralMon.gf index d6873ce20b..2c2d941b73 100644 --- a/lib/src/mongolian/NumeralMon.gf +++ b/lib/src/mongolian/NumeralMon.gf @@ -1,6 +1,6 @@ --# -path=.:../abstract:../common:../prelude -concrete NumeralMon of Numeral = CatMon ** open ResMon, MorphoMon, Prelude in { +concrete NumeralMon of Numeral = CatMon [Numeral,Digits] ** open ResMon, MorphoMon, Prelude in { flags coding=utf8 ; diff --git a/lib/src/nepali/NumeralNep.gf b/lib/src/nepali/NumeralNep.gf index d423972663..b9778f70bc 100644 --- a/lib/src/nepali/NumeralNep.gf +++ b/lib/src/nepali/NumeralNep.gf @@ -1,4 +1,4 @@ -concrete NumeralNep of Numeral = CatNep ** open ResNep, Prelude in { +concrete NumeralNep of Numeral = CatNep [Numeral,Digits] ** open ResNep, Prelude in { -- By Harald Hammarstroem -- Modification for Nepali by Dinesh Simkhada and Shafqat Virk - 2011 flags coding=utf8 ; diff --git a/lib/src/norwegian/NumeralNor.gf b/lib/src/norwegian/NumeralNor.gf index 910bd32427..4091c3f59c 100644 --- a/lib/src/norwegian/NumeralNor.gf +++ b/lib/src/norwegian/NumeralNor.gf @@ -1,4 +1,4 @@ -concrete NumeralNor of Numeral = CatNor ** open MorphoNor, Prelude in { +concrete NumeralNor of Numeral = CatNor [Numeral,Digits] ** open MorphoNor, Prelude in { flags coding=utf8 ; lincat diff --git a/lib/src/polish/NumeralPol.gf b/lib/src/polish/NumeralPol.gf index c2a5bf0000..c4766a0db9 100644 --- a/lib/src/polish/NumeralPol.gf +++ b/lib/src/polish/NumeralPol.gf @@ -2,7 +2,7 @@ -- Adam Slaski, 2009, 2010 -concrete NumeralPol of Numeral = CatPol ** open ResPol,Prelude, AdjectiveMorphoPol in { +concrete NumeralPol of Numeral = CatPol [Numeral,Digits] ** open ResPol,Prelude, AdjectiveMorphoPol in { flags coding=utf8 ; diff --git a/lib/src/punjabi/NumeralPnb.gf b/lib/src/punjabi/NumeralPnb.gf index da1b0f04b1..8dcdb71f21 100644 --- a/lib/src/punjabi/NumeralPnb.gf +++ b/lib/src/punjabi/NumeralPnb.gf @@ -1,4 +1,4 @@ -concrete NumeralPnb of Numeral = CatPnb ** open ResPnb, Prelude in { +concrete NumeralPnb of Numeral = CatPnb [Numeral,Digits] ** open ResPnb, Prelude in { -- By Harald Hammarstroem -- Modification for Punjabi by Shafqat Virk flags coding=utf8 ; diff --git a/lib/src/romanian/NumeralRon.gf b/lib/src/romanian/NumeralRon.gf index f4299ae830..b0feae9cbd 100644 --- a/lib/src/romanian/NumeralRon.gf +++ b/lib/src/romanian/NumeralRon.gf @@ -1,4 +1,4 @@ -concrete NumeralRon of Numeral = CatRon ** +concrete NumeralRon of Numeral = CatRon [Numeral,Digits] ** open MorphoRon, CatRon, Prelude in { flags coding = utf8 ; diff --git a/lib/src/russian/NumeralRus.gf b/lib/src/russian/NumeralRus.gf index 3e1effc076..8fec45eaa0 100644 --- a/lib/src/russian/NumeralRus.gf +++ b/lib/src/russian/NumeralRus.gf @@ -1,6 +1,6 @@ --# -path=.:../abstract:../common:../../prelude -concrete NumeralRus of Numeral = CatRus ** open ResRus, Prelude in { +concrete NumeralRus of Numeral = CatRus [Numeral,Digits] ** open ResRus, Prelude in { flags coding=utf8 ; diff --git a/lib/src/sindhi/NumeralSnd.gf b/lib/src/sindhi/NumeralSnd.gf index c0eca24d86..0a1201a50a 100644 --- a/lib/src/sindhi/NumeralSnd.gf +++ b/lib/src/sindhi/NumeralSnd.gf @@ -1,4 +1,4 @@ -concrete NumeralSnd of Numeral = CatSnd ** open ResSnd, Prelude in { +concrete NumeralSnd of Numeral = CatSnd [Numeral,Digits] ** open ResSnd, Prelude in { -- By Harald Hammarstroem -- Modification for Punjabi by Shafqat Virk flags coding=utf8 ; diff --git a/lib/src/swahili/NumeralSwa.gf b/lib/src/swahili/NumeralSwa.gf index 8d9d259d16..4641a51738 100644 --- a/lib/src/swahili/NumeralSwa.gf +++ b/lib/src/swahili/NumeralSwa.gf @@ -1,4 +1,4 @@ -concrete NumeralSwa of Numeral = CatSwa ** open ResSwa in { +concrete NumeralSwa of Numeral = CatSwa [Numeral,Digits] ** open ResSwa in { } diff --git a/lib/src/telugu/NumeralTel.gf b/lib/src/telugu/NumeralTel.gf index cc243cc770..21510fa653 100644 --- a/lib/src/telugu/NumeralTel.gf +++ b/lib/src/telugu/NumeralTel.gf @@ -1,4 +1,4 @@ ---concrete NumeralTel of Numeral = CatTel ** open ResTel in { +--concrete NumeralTel of Numeral = CatTel [Numeral,Digits] ** open ResTel in { ---- ----lincat ---- Digit = {s : DForm => CardOrd => Str} ; diff --git a/lib/src/thai/NumeralTha.gf b/lib/src/thai/NumeralTha.gf index 470628688a..9451106845 100644 --- a/lib/src/thai/NumeralTha.gf +++ b/lib/src/thai/NumeralTha.gf @@ -1,4 +1,4 @@ -concrete NumeralTha of Numeral = CatTha ** open ResTha, StringsTha, Prelude in { +concrete NumeralTha of Numeral = CatTha [Numeral,Digits] ** open ResTha, StringsTha, Prelude in { flags coding = utf8 ; diff --git a/lib/src/turkish/NumeralTur.gf b/lib/src/turkish/NumeralTur.gf index a09a7aa99a..3f10e5eda1 100644 --- a/lib/src/turkish/NumeralTur.gf +++ b/lib/src/turkish/NumeralTur.gf @@ -1,6 +1,6 @@ --# -path=.:../abstract:../common:../../prelude -concrete NumeralTur of Numeral = CatTur ** open Prelude, ResTur, ParadigmsTur in { +concrete NumeralTur of Numeral = CatTur [Numeral,Digits] ** open Prelude, ResTur, ParadigmsTur in { flags coding = utf8 ; diff --git a/lib/src/urdu/NumeralUrd.gf b/lib/src/urdu/NumeralUrd.gf index e7bd2b5673..a4e6cfc028 100644 --- a/lib/src/urdu/NumeralUrd.gf +++ b/lib/src/urdu/NumeralUrd.gf @@ -2,7 +2,7 @@ -- Modification for Urdu Shafqat Virk -concrete NumeralUrd of Numeral = CatUrd ** open ResUrd,CommonHindustani,ParamX, Prelude in { +concrete NumeralUrd of Numeral = CatUrd [Numeral,Digits] ** open ResUrd,CommonHindustani,ParamX, Prelude in { flags coding=utf8 ; param DForm = unit | ten ;