From af13bae2dfb9adaa7c4aa273961fc09cc7ba1b7a Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Sun, 17 Jan 2010 17:05:21 +0000
Subject: now the linearization is completely based on PMCFG

---
 src/runtime/haskell/PGF/Binary.hs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/runtime/haskell/PGF/Binary.hs')

diff --git a/src/runtime/haskell/PGF/Binary.hs b/src/runtime/haskell/PGF/Binary.hs
index 7d5db73af..a9a6a78dc 100644
--- a/src/runtime/haskell/PGF/Binary.hs
+++ b/src/runtime/haskell/PGF/Binary.hs
@@ -2,6 +2,7 @@ module PGF.Binary where
 
 import PGF.CId
 import PGF.Data
+import PGF.Macros
 import Data.Binary
 import Data.Binary.Put
 import Data.Binary.Get
@@ -28,10 +29,11 @@ instance Binary PGF where
            gflags <- get
            abstract <- get
            concretes <- get
-           return (PGF{ absname=absname, cncnames=cncnames
-                      , gflags=gflags
-                      , abstract=abstract, concretes=concretes
-                      })
+           return $ updateProductionIndices $
+                      (PGF{ absname=absname, cncnames=cncnames
+                          , gflags=gflags
+                          , abstract=abstract, concretes=concretes
+                          })
 
 instance Binary CId where
   put (CId bs) = put bs
@@ -185,15 +187,16 @@ instance Binary Production where
              _ -> decodingError
 
 instance Binary ParserInfo where
-  put p = put (functions p, sequences p, productions0 p, totalCats p, startCats p)
+  put p = put (functions p, sequences p, productions p, totalCats p, startCats p)
   get = do functions   <- get
            sequences   <- get
-           productions0<- get
+           productions <- get
            totalCats   <- get
            startCats   <- get
            return (ParserInfo{functions=functions,sequences=sequences
-                             ,productions0=productions0
-                             ,productions =filterProductions productions0
+                             ,productions = productions
+                             ,pproductions = IntMap.empty
+                             ,lproductions = Map.empty
                              ,totalCats=totalCats,startCats=startCats})
 
 decodingError = fail "This PGF file was compiled with different version of GF"
-- 
cgit v1.2.3