mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-27 08:58:55 -06:00
move NumeralX.inc to ParamX since it is used in many places
This commit is contained in:
@@ -84,10 +84,4 @@ oper
|
||||
_ => BIND
|
||||
} ;
|
||||
|
||||
inc : DTail -> DTail = \t -> case t of {
|
||||
T1 => T2 ;
|
||||
T2 => T3 ;
|
||||
T3 => T1
|
||||
} ;
|
||||
|
||||
}
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 + "ти") ;
|
||||
|
||||
|
||||
@@ -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") ;
|
||||
|
||||
@@ -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
|
||||
} ;
|
||||
|
||||
}
|
||||
|
||||
@@ -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") ;
|
||||
|
||||
|
||||
@@ -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") ;
|
||||
|
||||
@@ -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") ;
|
||||
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
|
||||
@@ -224,10 +224,4 @@ flags coding = utf8 ;
|
||||
T3 => "," ;
|
||||
_ => []
|
||||
} ;
|
||||
|
||||
inc : DTail -> DTail = \t -> case t of {
|
||||
T1 => T2 ;
|
||||
T2 => T3 ;
|
||||
T3 => T1
|
||||
} ;
|
||||
}
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
|
||||
@@ -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 ;
|
||||
--
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 + "م") ;
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
} ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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") ;
|
||||
|
||||
|
||||
@@ -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") ;
|
||||
|
||||
@@ -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") ;
|
||||
----
|
||||
|
||||
@@ -92,10 +92,4 @@ oper
|
||||
T3 => BIND++","++BIND ;
|
||||
_ => BIND
|
||||
} ;
|
||||
|
||||
inc : DTail -> DTail = \t -> case t of {
|
||||
T1 => T2 ;
|
||||
T2 => T3 ;
|
||||
T3 => T1
|
||||
} ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user