Merge branch 'master' of https://github.com/GrammaticalFramework/gf-core

2 files changed, 3 insertions, 2 deletions

diff --git a/src/runtime/haskell/PGF/Binary.hs b/src/runtime/haskell/PGF/Binary.hs
index e0e50f4be..a78472ea9 100644
--- a/src/runtime/haskell/PGF/Binary.hs
+++ b/src/runtime/haskell/PGF/Binary.hs
@@ -28,7 +28,7 @@ instance Binary PGF where
            let v = (major,minor)

            if major==pgfMajorVersion && minor<=pgfMinorVersion

              then getPGF'

-             else if v==Old.version 

+             else if v==Old.version

                   then Old.getPGF'

                   else fail $ "Unsupported PGF version "++show (major,minor)

 

@@ -185,6 +185,7 @@ instance Binary Instr where
   put (PUSH_ACCUM (LFlt d)) = putWord8 78 >> put d

   put (POP_ACCUM          ) = putWord8 80

   put (ADD                ) = putWord8 84

+  get = fail "Missing implementation for ‘get’ in the instance declaration for ‘Binary Instr’"

 

 instance Binary Type where

   put (DTyp hypos cat exps) = put (hypos,cat,exps)

diff --git a/src/runtime/haskell/PGF/TypeCheck.hs b/src/runtime/haskell/PGF/TypeCheck.hs
index 5db4ef439..c5cc44b4e 100644
--- a/src/runtime/haskell/PGF/TypeCheck.hs
+++ b/src/runtime/haskell/PGF/TypeCheck.hs
@@ -41,7 +41,7 @@ import Control.Applicative
 import Control.Monad
 --import Control.Monad.Identity
 import Control.Monad.State
-import Control.Monad.Error
+import Control.Monad.Except
 import Text.PrettyPrint
 
 -----------------------------------------------------