mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-29 04:38:55 -06:00
error msg in update
This commit is contained in:
@@ -139,7 +139,9 @@ updateShellState opts mcnc sh ((_,sgr,gr),rts) = do
|
|||||||
Just a -> do
|
Just a -> do
|
||||||
-- test that abstract is compatible --- unsafe exception for old?
|
-- test that abstract is compatible --- unsafe exception for old?
|
||||||
--- if True oElem showOld opts then return () else
|
--- if True oElem showOld opts then return () else
|
||||||
testErr (maybe True (a==) a') ("expected abstract" +++ P.prt a)
|
case a' of
|
||||||
|
Nothing -> return ()
|
||||||
|
Just b -> testErr (a==b) ("expected abstract" +++ P.prt a +++ "but found " +++ P.prt b)
|
||||||
return $ Just a
|
return $ Just a
|
||||||
_ -> return a'
|
_ -> return a'
|
||||||
let cgr = filterAbstracts abstr0 cgr0
|
let cgr = filterAbstracts abstr0 cgr0
|
||||||
@@ -185,6 +187,20 @@ prShellStateInfo sh = unlines [
|
|||||||
"global options : " +++ prOpts (gloptions sh)
|
"global options : " +++ prOpts (gloptions sh)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
{- ---- should be called from IOGrammar *before* compiling
|
||||||
|
testSameAbstract :: ShellState -> Maybe Ident -> Err (Maybe Ident)
|
||||||
|
testSameAbstract sh mcnc = do
|
||||||
|
abstr0 <- case abstract sh of
|
||||||
|
Just a -> do
|
||||||
|
-- test that abstract is compatible --- unsafe exception for old?
|
||||||
|
--- if True oElem showOld opts then return () else
|
||||||
|
case a' of
|
||||||
|
Nothing -> return ()
|
||||||
|
Just b -> testErr (a==b) ("expected abstract" +++ P.prt a +++ "but found " +++ P.prt b)
|
||||||
|
return $ Just a
|
||||||
|
_ -> return a'
|
||||||
|
-}
|
||||||
|
|
||||||
abstractName sh = maybe "(none)" P.prt (abstract sh)
|
abstractName sh = maybe "(none)" P.prt (abstract sh)
|
||||||
|
|
||||||
-- | throw away those abstracts that are not needed --- could be more aggressive
|
-- | throw away those abstracts that are not needed --- could be more aggressive
|
||||||
|
|||||||
Reference in New Issue
Block a user