From 1d5043bde20599ae3f8d4ebd9ece78a741b1137f Mon Sep 17 00:00:00 2001 From: krasimir Date: Wed, 17 Jun 2015 12:58:46 +0000 Subject: [PATCH] forgot changes in the serialization in the Haskell runtime --- src/runtime/haskell/PGF/Binary.hs | 16 ++++++++-------- src/runtime/haskell/PGF/Data.hs | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/runtime/haskell/PGF/Binary.hs b/src/runtime/haskell/PGF/Binary.hs index e1054447e..a7f6bf881 100644 --- a/src/runtime/haskell/PGF/Binary.hs +++ b/src/runtime/haskell/PGF/Binary.hs @@ -213,10 +213,10 @@ instance Binary Symbol where put (SymKP d vs) = putWord8 4 >> put (d,vs) put SymBIND = putWord8 5 put SymSOFT_BIND = putWord8 6 - put SymSOFT_SPACE = putWord8 7 - put SymCAPIT = putWord8 8 - put SymALL_CAPIT = putWord8 9 - put SymNE = putWord8 10 + put SymNE = putWord8 7 + put SymSOFT_SPACE = putWord8 8 + put SymCAPIT = putWord8 9 + put SymALL_CAPIT = putWord8 10 get = do tag <- getWord8 case tag of 0 -> liftM2 SymCat get get @@ -226,10 +226,10 @@ instance Binary Symbol where 4 -> liftM2 (\d vs -> SymKP d vs) get get 5 -> return SymBIND 6 -> return SymSOFT_BIND - 7 -> return SymSOFT_SPACE - 8 -> return SymCAPIT - 9 -> return SymALL_CAPIT - 10-> return SymNE + 7 -> return SymNE + 8 -> return SymSOFT_SPACE + 9 -> return SymCAPIT + 10-> return SymALL_CAPIT _ -> decodingError instance Binary PArg where diff --git a/src/runtime/haskell/PGF/Data.hs b/src/runtime/haskell/PGF/Data.hs index 426936cba..bd818ea1b 100644 --- a/src/runtime/haskell/PGF/Data.hs +++ b/src/runtime/haskell/PGF/Data.hs @@ -61,11 +61,11 @@ data Symbol | SymKS Token | SymKP [Symbol] [([Symbol],[String])] | SymBIND -- the special BIND token + | SymNE -- non exist | SymSOFT_BIND -- the special SOFT_BIND token | SymSOFT_SPACE -- the special SOFT_SPACE token | SymCAPIT -- the special CAPIT token | SymALL_CAPIT -- the special ALL_CAPIT token - | SymNE -- non exist (this should be last constructor to simplify the binary search in the runtime) deriving (Eq,Ord,Show) data Production = PApply {-# UNPACK #-} !FunId [PArg]