ordinals

lib/resource/english/MorphoEng.gf

@@ -310,12 +310,32 @@ oper
 
 -- From $numerals$.
 
-param DForm = unit  | teen  | ten  ;
-oper mkNum : Str -> Str -> Str -> {s : DForm => Str} = 
-  \two -> \twelve -> \twenty -> 
-  {s = table {unit => two ; teen => twelve ; ten => twenty}} ;
-oper regNum : Str -> {s : DForm => Str} = 
-  \six -> mkNum six (six + "teen") (six + "ty") ;
+param 
+  DForm = unit  | teen  | ten  ;
+  CardOrd = NCard | NOrd ;
+
+oper 
+  mkNum : Str -> Str -> Str -> Str -> {s : DForm => CardOrd => Str} = 
+  \two -> \twelve -> \twenty -> \second ->
+  {s = table {
+     unit => table {NCard => two ; NOrd => second} ; 
+     teen => \\c => mkCard c twelve ; 
+     ten  => \\c => mkCard c twenty
+     }
+   } ;
+
+  regNum : Str -> {s : DForm => CardOrd => Str} = 
+    \six -> mkNum six (six + "teen") (six + "ty") (regOrd six) ;
+
+  regCardOrd : Str -> {s : CardOrd => Str} = \ten ->
+    {s = table {NCard => ten ; NOrd => regOrd ten}} ;
+
+  mkCard : CardOrd -> Str -> Str = \c,ten -> (regCardOrd ten).s ! c ; 
+
+  regOrd : Str -> Str = \ten -> case last ten of {
+    "y" => init ten + "ieth" ;
+    _   => ten + "th"
+    } ;
 
 } ;