From 1ccd47784d27e0e4a8c19e384be59ef3a3420c62 Mon Sep 17 00:00:00 2001 From: hallgren Date: Mon, 25 Nov 2013 18:17:12 +0000 Subject: [PATCH] Add explicit character encoding specifications in 39 more RGL modules To silence warnings and avoid potential problems after changing the default encoding to UTF-8. --- src/amharic/IdiomAmh.gf | 1 + src/amharic/RelativeAmh.gf | 1 + src/arabic/AdverbAra.gf | 1 + src/arabic/IdiomAra.gf | 1 + src/arabic/PhraseAra.gf | 1 + src/arabic/RelativeAra.gf | 1 + src/catalan/ExtraCatAbs.gf | 1 + src/chinese/IdiomChi.gf | 2 +- src/danish/DiffDan.gf | 1 + src/danish/ParadigmsDan.gf | 1 + src/dutch/ExtraDutAbs.gf | 2 +- src/dutch/IrregDutAbs.gf | 1 + src/estonian/ConjunctionEst.gf | 2 +- src/estonian/ExtraEst.gf | 2 +- src/estonian/ExtraEstAbs.gf | 1 + src/finnish/CatFin.gf | 1 + src/finnish/ExtraFinAbs.gf | 1 + src/finnish/IdiomFin.gf | 2 +- src/finnish/QuestionFin.gf | 1 + src/finnish/VerbFin.gf | 1 + src/french/NumeralFre.gf | 1 + src/german/ExtraGerAbs.gf | 2 +- src/german/IdiomGer.gf | 1 + src/maltese/AdverbMlt.gf | 2 +- src/maltese/IrregMlt.gf | 2 +- src/persian/TextPes.gf | 2 +- src/polish/ExtraPolAbs.gf | 1 + src/romance/AdjectiveRomance.gf | 2 +- src/romance/CommonRomance.gf | 1 + src/romance/ResRomance.gf | 1 + src/romanian/BeschRon.gf | 1 + src/romanian/SymbolRon.gf | 2 +- src/russian/SymbolRus.gf | 2 +- src/scandinavian/CatScand.gf | 1 + src/scandinavian/CommonScand.gf | 1 + src/scandinavian/DiffScand.gf | 1 + src/spanish/NumeralSpa.gf | 1 + src/swedish/ExtraSweAbs.gf | 2 +- src/turkish/IrregTurAbs.gf | 1 + 39 files changed, 39 insertions(+), 13 deletions(-) diff --git a/src/amharic/IdiomAmh.gf b/src/amharic/IdiomAmh.gf index bcdf28f7..bbb98411 100644 --- a/src/amharic/IdiomAmh.gf +++ b/src/amharic/IdiomAmh.gf @@ -1,4 +1,5 @@ concrete IdiomAmh of Idiom = CatAmh ** open Prelude, ResAmh in { + flags coding=utf8; ---- ---- flags optimize=all_subs ; ---- diff --git a/src/amharic/RelativeAmh.gf b/src/amharic/RelativeAmh.gf index 9558ba0d..b92b3f50 100644 --- a/src/amharic/RelativeAmh.gf +++ b/src/amharic/RelativeAmh.gf @@ -1,4 +1,5 @@ concrete RelativeAmh of Relative = CatAmh ** open ResAmh in { + flags coding=utf8; ---- ---- flags optimize=all_subs ; ---- diff --git a/src/arabic/AdverbAra.gf b/src/arabic/AdverbAra.gf index 5c2cbdfb..d7a90387 100644 --- a/src/arabic/AdverbAra.gf +++ b/src/arabic/AdverbAra.gf @@ -1,4 +1,5 @@ concrete AdverbAra of Adverb = CatAra ** open ResAra, Prelude in { + flags coding=utf8; lin PositAdvAdj a = {s = a.s ! APosit Masc Sg Indef Acc} ; diff --git a/src/arabic/IdiomAra.gf b/src/arabic/IdiomAra.gf index d185c5aa..fbfc5f9b 100644 --- a/src/arabic/IdiomAra.gf +++ b/src/arabic/IdiomAra.gf @@ -1,4 +1,5 @@ concrete IdiomAra of Idiom = CatAra ** open Prelude, ResAra in { + flags coding=utf8; -- -- flags optimize=all_subs ; -- diff --git a/src/arabic/PhraseAra.gf b/src/arabic/PhraseAra.gf index 2604ac4c..4eb8e914 100644 --- a/src/arabic/PhraseAra.gf +++ b/src/arabic/PhraseAra.gf @@ -2,6 +2,7 @@ concrete PhraseAra of Phrase = CatAra ** open ParamX, Prelude, ResAra in { + flags coding=utf8; lin PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ! Masc ++ voc.s} ;--FIXME diff --git a/src/arabic/RelativeAra.gf b/src/arabic/RelativeAra.gf index 13cf7c5f..3cc0a9cd 100644 --- a/src/arabic/RelativeAra.gf +++ b/src/arabic/RelativeAra.gf @@ -1,4 +1,5 @@ concrete RelativeAra of Relative = CatAra ** open ResAra in { + flags coding=utf8; -- -- flags optimize=all_subs ; -- diff --git a/src/catalan/ExtraCatAbs.gf b/src/catalan/ExtraCatAbs.gf index d9d37150..892d3bac 100644 --- a/src/catalan/ExtraCatAbs.gf +++ b/src/catalan/ExtraCatAbs.gf @@ -2,6 +2,7 @@ -- Romance languages. abstract ExtraCatAbs = ExtraRomanceAbs ** { + flags coding=utf8; fun diff --git a/src/chinese/IdiomChi.gf b/src/chinese/IdiomChi.gf index b1591af6..2fd5ccb5 100644 --- a/src/chinese/IdiomChi.gf +++ b/src/chinese/IdiomChi.gf @@ -1,5 +1,5 @@ concrete IdiomChi of Idiom = CatChi ** open Prelude, ResChi in { - + flags coding=utf8; lin ---- formal subject, e.g. it is hot ?? now empty subject ImpersCl vp = mkClause [] vp ; diff --git a/src/danish/DiffDan.gf b/src/danish/DiffDan.gf index 47584fd5..daf6157a 100644 --- a/src/danish/DiffDan.gf +++ b/src/danish/DiffDan.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 instance DiffDan of DiffScand = open CommonScand, Prelude in { -- Parameters. diff --git a/src/danish/ParadigmsDan.gf b/src/danish/ParadigmsDan.gf index 9ce6ceef..dd6a89df 100644 --- a/src/danish/ParadigmsDan.gf +++ b/src/danish/ParadigmsDan.gf @@ -1,4 +1,5 @@ --# -path=.:../scandinavian:../common:../abstract:../../prelude +--# -coding=latin1 --1 Danish Lexical Paradigms -- diff --git a/src/dutch/ExtraDutAbs.gf b/src/dutch/ExtraDutAbs.gf index 1d088653..df65c8c3 100644 --- a/src/dutch/ExtraDutAbs.gf +++ b/src/dutch/ExtraDutAbs.gf @@ -5,7 +5,7 @@ abstract ExtraDutAbs = Extra [ VV,VP,Conj,IComp,ICompAP,IAdvAdv,Adv,AP,IAdv, VPSlash, NominalizeVPSlashNP] ** { - + flags coding=utf8; --{ -- -- fun diff --git a/src/dutch/IrregDutAbs.gf b/src/dutch/IrregDutAbs.gf index bd6b3f61..ba27a6df 100644 --- a/src/dutch/IrregDutAbs.gf +++ b/src/dutch/IrregDutAbs.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 abstract IrregDutAbs = Cat ** { fun bakken_V : V ; -- to fry diff --git a/src/estonian/ConjunctionEst.gf b/src/estonian/ConjunctionEst.gf index 015494a6..043da648 100644 --- a/src/estonian/ConjunctionEst.gf +++ b/src/estonian/ConjunctionEst.gf @@ -1,7 +1,7 @@ concrete ConjunctionEst of Conjunction = CatEst ** open ResEst, Coordination, Prelude in { - flags optimize=all_subs ; + flags optimize=all_subs ; coding=utf8; lin diff --git a/src/estonian/ExtraEst.gf b/src/estonian/ExtraEst.gf index d6d1157a..d1b67f89 100644 --- a/src/estonian/ExtraEst.gf +++ b/src/estonian/ExtraEst.gf @@ -1,6 +1,6 @@ concrete ExtraEst of ExtraEstAbs = CatEst ** open ResEst, MorphoEst, Coordination, Prelude, NounEst, StructuralEst, (R = ParamX) in { - + flags coding=utf8; lin GenNP np = { s,sp = \\_,_ => np.s ! NPCase Gen ; diff --git a/src/estonian/ExtraEstAbs.gf b/src/estonian/ExtraEstAbs.gf index 7c6e5878..0f16b97b 100644 --- a/src/estonian/ExtraEstAbs.gf +++ b/src/estonian/ExtraEstAbs.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 abstract ExtraEstAbs = Extra [ GenNP, VPI,ListVPI,BaseVPI,ConsVPI,MkVPI,ComplVPIVV,ConjVPI, diff --git a/src/finnish/CatFin.gf b/src/finnish/CatFin.gf index 162cdad4..34ac724c 100644 --- a/src/finnish/CatFin.gf +++ b/src/finnish/CatFin.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 concrete CatFin of Cat = CommonX ** open ResFin, StemFin, Prelude in { flags optimize=all_subs ; diff --git a/src/finnish/ExtraFinAbs.gf b/src/finnish/ExtraFinAbs.gf index d8b7cfb4..2432e06d 100644 --- a/src/finnish/ExtraFinAbs.gf +++ b/src/finnish/ExtraFinAbs.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 abstract ExtraFinAbs = Extra [ GenNP,GenIP,GenRP, VPI,ListVPI,BaseVPI,ConsVPI,MkVPI,ComplVPIVV,ConjVPI, diff --git a/src/finnish/IdiomFin.gf b/src/finnish/IdiomFin.gf index e485e5d3..145b09a7 100644 --- a/src/finnish/IdiomFin.gf +++ b/src/finnish/IdiomFin.gf @@ -1,7 +1,7 @@ concrete IdiomFin of Idiom = CatFin ** open MorphoFin, ParadigmsFin, Prelude in { - flags optimize=all_subs ; + flags optimize=all_subs ; coding=utf8; lin ExistNP np = diff --git a/src/finnish/QuestionFin.gf b/src/finnish/QuestionFin.gf index dd736cf4..264f33e2 100644 --- a/src/finnish/QuestionFin.gf +++ b/src/finnish/QuestionFin.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 concrete QuestionFin of Question = CatFin ** open ResFin, Prelude in { flags optimize=all_subs ; diff --git a/src/finnish/VerbFin.gf b/src/finnish/VerbFin.gf index 69bb63ee..1ac36ab2 100644 --- a/src/finnish/VerbFin.gf +++ b/src/finnish/VerbFin.gf @@ -1,5 +1,6 @@ --1 Verb Phrases in Finnish +--# -coding=latin1 concrete VerbFin of Verb = CatFin ** open Prelude, ResFin, StemFin in { flags optimize=all_subs ; diff --git a/src/french/NumeralFre.gf b/src/french/NumeralFre.gf index dd7ad376..81d849b1 100644 --- a/src/french/NumeralFre.gf +++ b/src/french/NumeralFre.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 concrete NumeralFre of Numeral = CatFre [Numeral,Digits] ** open CommonRomance, ResRomance, MorphoFre, Prelude in { diff --git a/src/german/ExtraGerAbs.gf b/src/german/ExtraGerAbs.gf index 09c1100b..d2e15702 100644 --- a/src/german/ExtraGerAbs.gf +++ b/src/german/ExtraGerAbs.gf @@ -3,7 +3,7 @@ abstract ExtraGerAbs = Extra [ VPS,ListVPS,BaseVPS,ConsVPS,ConjVPS,MkVPS,PredVPS,EmptyRelSlash, VPSlash,PassVPSlash,CompIQuant, Temp,Tense,Pol,S,NP,VV,VP,Conj,IAdv,IQuant,IComp,ICompAP,IAdvAdv,Adv,AP] ** { - + flags coding=utf8; fun PPzuAdv : CN -> Adv ; -- zum Lied, zur Flasche TImpfSubj : Tense ; -- ich möchte... --# notpresent diff --git a/src/german/IdiomGer.gf b/src/german/IdiomGer.gf index aa984511..8edde356 100644 --- a/src/german/IdiomGer.gf +++ b/src/german/IdiomGer.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 concrete IdiomGer of Idiom = CatGer ** open MorphoGer, ParadigmsGer, Prelude in { diff --git a/src/maltese/AdverbMlt.gf b/src/maltese/AdverbMlt.gf index b1f570c3..e0bf8f2b 100644 --- a/src/maltese/AdverbMlt.gf +++ b/src/maltese/AdverbMlt.gf @@ -5,7 +5,7 @@ -- Licensed under LGPL concrete AdverbMlt of Adverb = CatMlt ** open ResMlt, Prelude in { - + flags coding=utf8; lin -- A -> Adv diff --git a/src/maltese/IrregMlt.gf b/src/maltese/IrregMlt.gf index 2390a916..34b58065 100644 --- a/src/maltese/IrregMlt.gf +++ b/src/maltese/IrregMlt.gf @@ -7,7 +7,7 @@ --# -path=.:prelude:../abstract:../common concrete IrregMlt of IrregMltAbs = CatMlt ** open ParadigmsMlt in { - + flags coding=utf8; {- Known irregular verbs in Maltese: - ĦA diff --git a/src/persian/TextPes.gf b/src/persian/TextPes.gf index aecef148..4601a928 100644 --- a/src/persian/TextPes.gf +++ b/src/persian/TextPes.gf @@ -1,5 +1,5 @@ concrete TextPes of Text = CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** { - + flags coding=utf8; -- This works for the special punctuation marks of Persian. lin diff --git a/src/polish/ExtraPolAbs.gf b/src/polish/ExtraPolAbs.gf index 6b7b7dc0..12deee7a 100644 --- a/src/polish/ExtraPolAbs.gf +++ b/src/polish/ExtraPolAbs.gf @@ -1,5 +1,6 @@ abstract ExtraPolAbs = Cat, Extra [AP,CN,Pron,ProDrop] ** { +flags coding=utf8; -- in Polish there exists a distinction between -- attributes describing a quality of some object (e.g. cold water) -- and qualifying that object (e.g. sparkling water). diff --git a/src/romance/AdjectiveRomance.gf b/src/romance/AdjectiveRomance.gf index 03aa4b5b..5be6fe69 100644 --- a/src/romance/AdjectiveRomance.gf +++ b/src/romance/AdjectiveRomance.gf @@ -1,6 +1,6 @@ incomplete concrete AdjectiveRomance of Adjective = CatRomance ** open CommonRomance, ResRomance, Prelude in { - + flags coding=utf8; lin PositA a = { diff --git a/src/romance/CommonRomance.gf b/src/romance/CommonRomance.gf index 421cf12f..0761067b 100644 --- a/src/romance/CommonRomance.gf +++ b/src/romance/CommonRomance.gf @@ -6,6 +6,7 @@ -- which depends on [DiffRomance DiffRomance.html]. -- +--# -coding=latin1 resource CommonRomance = ParamX ** open Prelude in { flags optimize=all ; diff --git a/src/romance/ResRomance.gf b/src/romance/ResRomance.gf index bc01c81f..61d4e7f6 100644 --- a/src/romance/ResRomance.gf +++ b/src/romance/ResRomance.gf @@ -1,6 +1,7 @@ --1 Romance auxiliary operations. -- +--# -coding=latin1 interface ResRomance = DiffRomance ** open CommonRomance, Prelude in { flags optimize=all ; diff --git a/src/romanian/BeschRon.gf b/src/romanian/BeschRon.gf index 66042ead..9efb10e7 100644 --- a/src/romanian/BeschRon.gf +++ b/src/romanian/BeschRon.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 resource BeschRon = open Prelude, MorphoRon,CatRon in { flags optimize=noexpand ; diff --git a/src/romanian/SymbolRon.gf b/src/romanian/SymbolRon.gf index 4de701c1..69a32cdc 100644 --- a/src/romanian/SymbolRon.gf +++ b/src/romanian/SymbolRon.gf @@ -1,7 +1,7 @@ --# -path=.:../abstract:../common:../prelude concrete SymbolRon of Symbol = CatRon ** open Prelude, ResRon in { - +flags coding=utf8; lin SymbPN i = mkSymb i.s ; IntPN i = mkSymb i.s ; diff --git a/src/russian/SymbolRus.gf b/src/russian/SymbolRus.gf index 4af44b31..3ee9bab7 100644 --- a/src/russian/SymbolRus.gf +++ b/src/russian/SymbolRus.gf @@ -1,7 +1,7 @@ --# -path=.:../abstract:../common concrete SymbolRus of Symbol = CatRus ** open Prelude, ResRus in { - +flags coding=utf8; {- TODO! -} lin SymbPN i = {s = table {_ => i.s} ; g = Neut; anim = Inanimate } ; diff --git a/src/scandinavian/CatScand.gf b/src/scandinavian/CatScand.gf index 6f5f8e5f..157e7cd4 100644 --- a/src/scandinavian/CatScand.gf +++ b/src/scandinavian/CatScand.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 incomplete concrete CatScand of Cat = CommonX -[Tense,Temp] ** open (RS = ResScand), Prelude, CommonScand, (R = ParamX) in { diff --git a/src/scandinavian/CommonScand.gf b/src/scandinavian/CommonScand.gf index 4f246ab0..a66ccbdf 100644 --- a/src/scandinavian/CommonScand.gf +++ b/src/scandinavian/CommonScand.gf @@ -3,6 +3,7 @@ -- This module contains operations that are shared by the Scandinavian -- languages, without dependence on parameters. +--# -coding=latin1 resource CommonScand = ParamX ** open Prelude in { flags optimize=all ; diff --git a/src/scandinavian/DiffScand.gf b/src/scandinavian/DiffScand.gf index 4010b7c1..e60a896d 100644 --- a/src/scandinavian/DiffScand.gf +++ b/src/scandinavian/DiffScand.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 interface DiffScand = open CommonScand, Prelude in { --1 Differences between Scandinavian languages diff --git a/src/spanish/NumeralSpa.gf b/src/spanish/NumeralSpa.gf index fea62d40..1f6924a8 100644 --- a/src/spanish/NumeralSpa.gf +++ b/src/spanish/NumeralSpa.gf @@ -1,3 +1,4 @@ +--# -coding=latin1 concrete NumeralSpa of Numeral = CatSpa [Numeral,Digits] ** open CommonRomance, ResRomance, MorphoSpa, Prelude in { diff --git a/src/swedish/ExtraSweAbs.gf b/src/swedish/ExtraSweAbs.gf index 2a2cf34b..331d01d3 100644 --- a/src/swedish/ExtraSweAbs.gf +++ b/src/swedish/ExtraSweAbs.gf @@ -3,7 +3,7 @@ -- Scandinavian languages. abstract ExtraSweAbs = ExtraScandAbs -[FocAP] ** { - +flags coding=utf8; cat ReflNP ; PronAD ; -- relational pronouns which can act like adjectives and -- determiners. 'fler' diff --git a/src/turkish/IrregTurAbs.gf b/src/turkish/IrregTurAbs.gf index 91b14e95..38931119 100644 --- a/src/turkish/IrregTurAbs.gf +++ b/src/turkish/IrregTurAbs.gf @@ -3,6 +3,7 @@ -- (c) 2009 Server Çimen under LGPL abstract IrregTurAbs = Cat ** { + flags coding=utf8; fun eat_V : V ; fear_V : V ;