From 761597ad8c64eb6c5a3f5d9864f0ede5fb51daf2 Mon Sep 17 00:00:00 2001 From: Krasimir Angelov Date: Tue, 3 Mar 2026 14:34:52 +0100 Subject: [PATCH] move NumeralX.inc to ParamX since it is used in many places --- src/albanian/NumeralSqi.gf | 6 ------ src/amharic/NumeralAmh.gf | 5 ----- src/ancient_greek/ResGrc.gf | 2 +- src/bulgarian/NumeralBul.gf | 6 ------ src/catalan/NumeralCat.gf | 6 ------ src/common/ParamX.gf | 6 ++++++ src/english/NumeralEng.gf | 6 ------ src/french/NumeralFre.gf | 6 ------ src/interlingua/NumeralIna.gf | 6 ------ src/italian/NumeralIta.gf | 6 ------ src/japanese/NumeralJpn.gf | 6 ------ src/japanese/ResJpn.gf | 4 +--- src/latin/CatLat.gf | 2 +- src/latin/MorphoLat.gf | 2 +- src/latin/NumeralLat.gf | 2 +- src/latin/ResLat.gf | 2 +- src/maltese/NumeralMlt.gf | 5 ----- src/persian/NumeralPes.gf | 6 ------ src/portuguese/NumeralPor.gf | 6 ------ src/rukiga/NumeralCgg.gf | 6 ------ src/russian/NumeralRus.gf | 8 +------- src/scots/NumeralSco.gf | 6 ------ src/spanish/NumeralSpa.gf | 6 ------ src/telugu/NumeralTel.gf | 6 ------ src/turkish/NumeralTur.gf | 6 ------ 25 files changed, 13 insertions(+), 115 deletions(-) diff --git a/src/albanian/NumeralSqi.gf b/src/albanian/NumeralSqi.gf index 13c06c20..20457b40 100644 --- a/src/albanian/NumeralSqi.gf +++ b/src/albanian/NumeralSqi.gf @@ -84,10 +84,4 @@ oper _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - } diff --git a/src/amharic/NumeralAmh.gf b/src/amharic/NumeralAmh.gf index 421227a2..c9c41cf2 100644 --- a/src/amharic/NumeralAmh.gf +++ b/src/amharic/NumeralAmh.gf @@ -109,11 +109,6 @@ lin pot3plus n m = { _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; ------------------ :) what a releif mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o ; diff --git a/src/ancient_greek/ResGrc.gf b/src/ancient_greek/ResGrc.gf index 5e22b3c2..11078570 100644 --- a/src/ancient_greek/ResGrc.gf +++ b/src/ancient_greek/ResGrc.gf @@ -18,7 +18,7 @@ -- Author: Hans Leiß, LMU Munich, CIS -resource ResGrc = ParamX - [Number,Sg,Pl,ImpForm,numImp,Tense,ImpF] +resource ResGrc = ParamX - [Number,Sg,Pl,ImpForm,numImp,Tense,ImpF,inc,DTail] ** open Prelude, PhonoGrc, Predef in { flags optimize = noexpand ; -- optimize=all is impossible with addAccent diff --git a/src/bulgarian/NumeralBul.gf b/src/bulgarian/NumeralBul.gf index 4a4fb4e2..20228705 100644 --- a/src/bulgarian/NumeralBul.gf +++ b/src/bulgarian/NumeralBul.gf @@ -200,12 +200,6 @@ lin pot5decimal d = { _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c (c+"ма") o Pl ; mkDig : Str -> TDigit = \c -> mk2Dig c (c + "ти") ; diff --git a/src/catalan/NumeralCat.gf b/src/catalan/NumeralCat.gf index d1bc08be..5b561b0a 100644 --- a/src/catalan/NumeralCat.gf +++ b/src/catalan/NumeralCat.gf @@ -179,12 +179,6 @@ param _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - oper mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ; mkDig : Str -> TDigit = \c -> mk2Dig c (c + ":o") ; diff --git a/src/common/ParamX.gf b/src/common/ParamX.gf index 20cd9eba..b99439c1 100644 --- a/src/common/ParamX.gf +++ b/src/common/ParamX.gf @@ -64,5 +64,11 @@ resource ParamX = open Prelude in { param DTail = T1 | T2 | T3 ; + oper + inc : DTail -> DTail = \t -> case t of { + T1 => T2 ; + T2 => T3 ; + T3 => T1 + } ; } diff --git a/src/english/NumeralEng.gf b/src/english/NumeralEng.gf index e71e80bd..9820faab 100644 --- a/src/english/NumeralEng.gf +++ b/src/english/NumeralEng.gf @@ -134,12 +134,6 @@ lin PosDecimal d = d ** {hasDot=False} ; _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ; mkDig : Str -> TDigit = \c -> mk2Dig c (c + "th") ; diff --git a/src/french/NumeralFre.gf b/src/french/NumeralFre.gf index 6ad455d3..d086af23 100644 --- a/src/french/NumeralFre.gf +++ b/src/french/NumeralFre.gf @@ -192,12 +192,6 @@ oper hyphen = BIND ++ "-" ++ BIND ; _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - oper mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ; mkDig : Str -> TDigit = \c -> mk2Dig c (c + "ème") ; diff --git a/src/interlingua/NumeralIna.gf b/src/interlingua/NumeralIna.gf index c486598e..bfc54a67 100644 --- a/src/interlingua/NumeralIna.gf +++ b/src/interlingua/NumeralIna.gf @@ -86,12 +86,6 @@ concrete NumeralIna of Numeral = CatIna [Numeral,Digits,Decimal] ** open ResIna, _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ; mkDig : Str -> TDigit = \c -> mk2Dig c (c + "e") ; diff --git a/src/italian/NumeralIta.gf b/src/italian/NumeralIta.gf index db458899..ec675f80 100644 --- a/src/italian/NumeralIta.gf +++ b/src/italian/NumeralIta.gf @@ -159,12 +159,6 @@ param Pred = pred | indip ; _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - oper mkDig : Str -> TDigit = \c -> mk2Dig c Pl ; diff --git a/src/japanese/NumeralJpn.gf b/src/japanese/NumeralJpn.gf index 32c873a6..a0a8262a 100644 --- a/src/japanese/NumeralJpn.gf +++ b/src/japanese/NumeralJpn.gf @@ -224,10 +224,4 @@ flags coding = utf8 ; T3 => "," ; _ => [] } ; - - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; } diff --git a/src/japanese/ResJpn.gf b/src/japanese/ResJpn.gf index 5af987fb..b7f206f3 100644 --- a/src/japanese/ResJpn.gf +++ b/src/japanese/ResJpn.gf @@ -1,9 +1,8 @@ -resource ResJpn = open Prelude in { +resource ResJpn = ParamX [Number,Sg,Pl,DTail,T1,T2,T3,inc] ** open Prelude in { flags coding = utf8 ; param - Number = Sg | Pl ; Style = Plain | Resp ; Animateness = Anim | Inanim ; Mood = Ind | Con ; @@ -15,7 +14,6 @@ param Particle = Wa | Ga ; Anteriority = Simul | Anter ; NumeralType = EndZero | EndNotZero | SingleDigit ; - DTail = T1 | T2 | T3 ; ConjType = And | Or | Both | IfConj ; SubjType = That | If | OtherSubj ; VocType = VocPres | Please | VocAbs ; diff --git a/src/latin/CatLat.gf b/src/latin/CatLat.gf index 9c8436ea..9afb005a 100644 --- a/src/latin/CatLat.gf +++ b/src/latin/CatLat.gf @@ -1,4 +1,4 @@ -concrete CatLat of Cat = CommonX-[Adv] ** open ResLat, ParamX, Prelude in { +concrete CatLat of Cat = CommonX-[Adv] ** open ResLat, Prelude in { flags optimize=all_subs ; diff --git a/src/latin/MorphoLat.gf b/src/latin/MorphoLat.gf index d3d502a8..51579fc1 100644 --- a/src/latin/MorphoLat.gf +++ b/src/latin/MorphoLat.gf @@ -8,7 +8,7 @@ -- syntax. To build a lexicon, it is better to use $ParadigmsLat$, which -- gives a higher-level access to this module. -resource MorphoLat = ParamX, ResLat ** open Prelude, Predef in { +resource MorphoLat = ResLat ** open Prelude, Predef in { -- -- flags optimize=all ; -- diff --git a/src/latin/NumeralLat.gf b/src/latin/NumeralLat.gf index cb25237a..6c62f531 100644 --- a/src/latin/NumeralLat.gf +++ b/src/latin/NumeralLat.gf @@ -1,4 +1,4 @@ -concrete NumeralLat of Numeral = CatLat, ParamX[Number] ** open ParadigmsLat, Prelude, ResLat, Predef in { +concrete NumeralLat of Numeral = CatLat ** open ParadigmsLat, Prelude, ResLat, Predef in { lincat Digit = TDigit ; Sub10 = TNumeral ; diff --git a/src/latin/ResLat.gf b/src/latin/ResLat.gf index 67d55879..b5dcfb65 100644 --- a/src/latin/ResLat.gf +++ b/src/latin/ResLat.gf @@ -2,7 +2,7 @@ --1 Latin auxiliary operations. -resource ResLat = ParamX ** open Prelude, Predef, (C=CommonX) in { +resource ResLat = ParamX - [DTail,T1,T2,T3,inc] ** open Prelude, Predef, (C=CommonX) in { param Case = Nom | Acc | Gen | Dat | Abl | Voc ; diff --git a/src/maltese/NumeralMlt.gf b/src/maltese/NumeralMlt.gf index 313f3a4d..52dead12 100644 --- a/src/maltese/NumeralMlt.gf +++ b/src/maltese/NumeralMlt.gf @@ -388,11 +388,6 @@ concrete NumeralMlt of Numeral = CatMlt [Numeral,Digits,Decimal] ** open Prelude T3 => BIND++","++BIND ; _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; lin -- Dig diff --git a/src/persian/NumeralPes.gf b/src/persian/NumeralPes.gf index 1305364f..1a31d9a7 100644 --- a/src/persian/NumeralPes.gf +++ b/src/persian/NumeralPes.gf @@ -105,12 +105,6 @@ lin pot3plus n m = { _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ; mkDig : Str -> TDigit = \c -> mk2Dig c (c + "م") ; diff --git a/src/portuguese/NumeralPor.gf b/src/portuguese/NumeralPor.gf index 91e0abd3..71e5e3f7 100644 --- a/src/portuguese/NumeralPor.gf +++ b/src/portuguese/NumeralPor.gf @@ -228,12 +228,6 @@ concrete NumeralPor of Numeral = CatPor [Numeral,Digits,Decimal] ** _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - oper mk4Dig : Str -> Str -> Str -> Number -> TDigit = \c,o,a,n -> { s = table { diff --git a/src/rukiga/NumeralCgg.gf b/src/rukiga/NumeralCgg.gf index be0e1961..20e3c3f4 100644 --- a/src/rukiga/NumeralCgg.gf +++ b/src/rukiga/NumeralCgg.gf @@ -116,12 +116,6 @@ lin pot3plus n m = let _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - }; - mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ; mkDig : Str -> TDigit = \c -> mk2Dig c c; diff --git a/src/russian/NumeralRus.gf b/src/russian/NumeralRus.gf index 93f2bd6f..6cbf4f4c 100644 --- a/src/russian/NumeralRus.gf +++ b/src/russian/NumeralRus.gf @@ -455,12 +455,6 @@ lincat _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - oper mk3Dig : Str -> Str -> NumSize -> TDigit = \c,o,size -> mk4Dig c o Pl size ; @@ -476,4 +470,4 @@ lincat s : Str ; size : NumSize } ; -} \ No newline at end of file +} diff --git a/src/scots/NumeralSco.gf b/src/scots/NumeralSco.gf index 4e8a325a..bb78ebec 100644 --- a/src/scots/NumeralSco.gf +++ b/src/scots/NumeralSco.gf @@ -134,12 +134,6 @@ lin PosDecimal d = d ** {hasDot=False} ; _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ; mkDig : Str -> TDigit = \c -> mk2Dig c (c + "th") ; diff --git a/src/spanish/NumeralSpa.gf b/src/spanish/NumeralSpa.gf index fbdb1ad2..1822fcef 100644 --- a/src/spanish/NumeralSpa.gf +++ b/src/spanish/NumeralSpa.gf @@ -153,12 +153,6 @@ param _ => BIND } ; - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; - oper mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ; mkDig : Str -> TDigit = \c -> mk2Dig c (c + ":o") ; diff --git a/src/telugu/NumeralTel.gf b/src/telugu/NumeralTel.gf index 21510fa6..75a40369 100644 --- a/src/telugu/NumeralTel.gf +++ b/src/telugu/NumeralTel.gf @@ -73,12 +73,6 @@ ---- _ => BIND ---- } ; ---- ----- inc : DTail -> DTail = \t -> case t of { ----- T1 => T2 ; ----- T2 => T3 ; ----- T3 => T1 ----- } ; ----- ---- mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ; ---- mkDig : Str -> TDigit = \c -> mk2Dig c (c + "th") ; ---- diff --git a/src/turkish/NumeralTur.gf b/src/turkish/NumeralTur.gf index 5f833aae..b16bef6d 100644 --- a/src/turkish/NumeralTur.gf +++ b/src/turkish/NumeralTur.gf @@ -92,10 +92,4 @@ oper T3 => BIND++","++BIND ; _ => BIND } ; - - inc : DTail -> DTail = \t -> case t of { - T1 => T2 ; - T2 => T3 ; - T3 => T1 - } ; }