another fix for teyjus

2 files changed, 5 insertions, 3 deletions

diff --git a/src/compiler/GF/Compile/GenerateBC.hs b/src/compiler/GF/Compile/GenerateBC.hs
index d5b18c725..160c13893 100644
--- a/src/compiler/GF/Compile/GenerateBC.hs
+++ b/src/compiler/GF/Compile/GenerateBC.hs
@@ -17,7 +17,7 @@ type BCLabel = (Int, BCAddr)
 
 genFun (id,info@(AbsFun (Just (L _ ty)) ma pty _)) = do
   l1 <- newLabel
-  emitLabel l1
+{-  emitLabel l1
   emit Ins_fail
   l2 <- newLabel
   l3 <- newLabel
@@ -31,7 +31,7 @@ genFun (id,info@(AbsFun (Just (L _ ty)) ma pty _)) = do
   l5 <- newLabel
   emit (Ins_switch_on_term (addr l4,addr l5,addr l1,addr l4))
   emitLabel l4
-  emitLabel l5
+  emitLabel l5-}
   return (id,info,addr l1)
 genFun (id,info@(AbsCat (Just (L _ cont)))) = do
   l1 <- newLabel
diff --git a/src/runtime/haskell/PGF/Binary.hs b/src/runtime/haskell/PGF/Binary.hs
index 4f67df42b..0d743c1f4 100644
--- a/src/runtime/haskell/PGF/Binary.hs
+++ b/src/runtime/haskell/PGF/Binary.hs
@@ -38,7 +38,9 @@ instance Binary CId where
   get    = liftM CId get

 

 instance Binary Abstr where

-  put abs = put (aflags abs, funs abs, cats abs)

+  put abs = put (aflags abs, 

+                 fmap (\(w,x,y,z,_) -> (w,x,y,z)) (funs abs),

+                 fmap (\(x,y,_) -> (x,y)) (cats abs))

   get = do aflags <- get

            funs <- get

            cats <- get