From cd671c58a959e97aa75cb501b3fd090094562114 Mon Sep 17 00:00:00 2001
From: normundsg <normundsg@gmail.com>
Date: Mon, 19 Dec 2011 14:11:46 +0000
Subject: [PATCH] Latvian API compiles! Does it? :)

---
 lib/src/api/TryLav.gf           |  8 ++++----
 lib/src/latvian/NumeralLav.gf   | 14 +++++++-------
 lib/src/latvian/ParadigmsLav.gf |  2 +-
 lib/src/latvian/SentenceLav.gf  |  5 ++---
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/src/api/TryLav.gf b/lib/src/api/TryLav.gf
index d52c1c313..5170db91b 100644
--- a/lib/src/api/TryLav.gf
+++ b/lib/src/api/TryLav.gf
@@ -1,6 +1,6 @@
 --# -path=.:alltenses:prelude:../latvian
 
-resource TryLav = SyntaxLav-[mkAdN], LexiconLav, ParadigmsLav - [mkAdv,mkAdN,mkOrd,mkQuant] **
+resource TryLav = SyntaxLav-[mkAdN], LexiconLav, ParadigmsLav-[mkAdv,mkAdN,mkOrd,mkQuant] **
   open (P = ParadigmsLav) in {
 
 oper
@@ -14,9 +14,9 @@ oper
     mkAdN : Str -> AdN = P.mkAdN ;
   } ;
 
-  mkOrd = overload SyntaxLav {
-    mkOrd : Str -> Ord = P.mkOrd ;
-  } ;
+  --mkOrd = overload SyntaxLav {
+  --  mkOrd : Str -> Ord = P.mkOrd ;
+  --} ;
 
 
 }
diff --git a/lib/src/latvian/NumeralLav.gf b/lib/src/latvian/NumeralLav.gf
index 76c134e80..d9e72dca5 100644
--- a/lib/src/latvian/NumeralLav.gf
+++ b/lib/src/latvian/NumeralLav.gf
@@ -19,7 +19,7 @@ lincat
 lin
   num x = x ;
 
-  n2 = mkNum "divi" "otrais" Pl ;
+  n2 = mkNumReg "divi" "otrais" Pl ;
 
   n3 =
     let trijs = mkNumSpec "trijs" "trešais" "trīs" "trīs" Pl
@@ -37,12 +37,12 @@ lin
     }
   } ;
 
-  n4 = mkNum "četri" "ceturtais" Pl ;
-  n5 = mkNum "pieci" "piektais" Pl ;
-  n6 = mkNum "seši" "sestais" Pl ;
-  n7 = mkNum "septiņi" "septītais" Pl ;
-  n8 = mkNum "astoņi" "astotais" Pl ;
-  n9 = mkNum "deviņi" "devītais" Pl ;
+  n4 = mkNumReg "četri" "ceturtais" Pl ;
+  n5 = mkNumReg "pieci" "piektais" Pl ;
+  n6 = mkNumReg "seši" "sestais" Pl ;
+  n7 = mkNumReg "septiņi" "septītais" Pl ;
+  n8 = mkNumReg "astoņi" "astotais" Pl ;
+  n9 = mkNumReg "deviņi" "devītais" Pl ;
 
   pot01 = { s = viens.s ! unit } ** { n = Sg } ;
   pot0 d = { s = d.s ! unit } ** { n = Pl } ;
diff --git a/lib/src/latvian/ParadigmsLav.gf b/lib/src/latvian/ParadigmsLav.gf
index 5a4ef7759..ac88e7936 100644
--- a/lib/src/latvian/ParadigmsLav.gf
+++ b/lib/src/latvian/ParadigmsLav.gf
@@ -133,7 +133,7 @@ oper
 
   viens = mkNumSpec "viens" "pirmais" "vien" "" Sg ;
 
-  mkNum : Str -> Str -> Number -> { s : DForm => CardOrd => Gender => Case => Str } =
+  mkNumReg : Str -> Str -> Number -> { s : DForm => CardOrd => Gender => Case => Str } =
     \pieci,piektais,n -> mkNumSpec pieci piektais (cutStem pieci) (cutStem pieci) n ;
 
   mkNumSpec : Str -> Str -> Str -> Str -> Number -> { s : DForm => CardOrd => Gender => Case => Str } =
diff --git a/lib/src/latvian/SentenceLav.gf b/lib/src/latvian/SentenceLav.gf
index f6fa7f591..e2f3fa39b 100644
--- a/lib/src/latvian/SentenceLav.gf
+++ b/lib/src/latvian/SentenceLav.gf
@@ -1,7 +1,6 @@
 --# -path=.:../abstract:../common:../prelude
 
 concrete SentenceLav of Sentence = CatLav ** open
-  Prelude,
   ResLav,
   VerbLav
   in {
@@ -52,7 +51,7 @@ lin
   AdvS a s = { s = NON_EXISTENT } ;
 
 oper
-  mkClause : NP -> VP -> Cl = \np,vp -> lin Cl {
+  mkClause : NP -> CatLav.VP -> Cl = \np,vp -> lin Cl {
     s = \\mood,pol =>
       case mood of {					-- Subject
         -- FIXME: jāčeko valences, reizēm arī īstenības izteiksmē - 'man patīk kaut kas'
@@ -66,7 +65,7 @@ oper
   -- FIXME: quick&dirty - lai kompilētos pret RGL API
   -- Eng: PredSCVP sc vp = mkClause sc.s (agrP3 Sg) vp
   -- Ar SC nav iespējams neko saskaņot (sk. Cat.gf un Common.gf)
-  mkClauseSC : SC -> VP -> Cl = \sc,vp -> lin Cl {
+  mkClauseSC : SC -> CatLav.VP -> Cl = \sc,vp -> lin Cl {
     s = \\mood,pol => sc.s ++ buildVerb vp.v mood pol (AgP3 Sg Masc) ++ vp.s2 ! (AgP3 Sg Masc)
   } ;