diff --git a/src/GF.hs b/src/GF.hs index afc914808..a3dfa2066 100644 --- a/src/GF.hs +++ b/src/GF.hs @@ -75,7 +75,7 @@ welcomeMsg = "Welcome to " ++ authorMsg ++++ welcomeArch ++ "\n\nType 'h' for help." authorMsg = unlines [ - "Grammatical Framework, Version 2.1", + "Grammatical Framework, Version 2.1.1b", "Compiled " ++ today, "Copyright (c)", "Björn Bringert, Markus Forsberg, Thomas Hallgren, Harald Hammarström,", diff --git a/src/GF/Compile/Extend.hs b/src/GF/Compile/Extend.hs index 6f76ad093..a2994c01b 100644 --- a/src/GF/Compile/Extend.hs +++ b/src/GF/Compile/Extend.hs @@ -83,8 +83,10 @@ extendAnyInfo isc n i j = errIn ("building extension for" +++ prt n) $ case (i,j (AnyInd b1 m1, AnyInd b2 m2) -> do testErr (b1 == b2) "inconsistent indirection status" - testErr (m1 == m2) $ - "different sources of indirection: " +++ show m1 +++ show m2 +---- commented out as work-around for a spurious problem in +---- TestResourceFre; should look at building of completion. 17/11/2004 +---- testErr (m1 == m2) $ +---- "different sources of indirection: " +++ show m1 +++ show m2 return i _ -> Bad $ "cannot unify information in" ++++ show i ++++ "and" ++++ show j