error msg in update

lib/resource/doc/gf-resource.html

@@ -481,7 +481,7 @@ Source modules:
 
 <p>
 
-<a href=example/AnimalsFre.gf>AnimalsFre</a>
+<a href=example/AnimalsFre.gf>AnimalsFre</a> (does not compile yet)
 
 <p>
 
@@ -502,7 +502,7 @@ which is almost one thousand times smaller and faster to load.
 Just issue the following GF commands 
 <pre>
   i AnimalsEng.gf
-  i AnimalsFre.gf
+  -- i AnimalsFre.gf -- does not compile yet
   i AnimalsSwe.gf
   pm | wf animals.gfcm
 </pre>

lib/resource/romance/RulesRomance.gf

@@ -46,8 +46,9 @@ lin
   UseV2 = transAsVerb ;
 
 -- Formation of infinitival phrases.
-{- ----
+
   UseCl tp cl = {s = \\o => tp.s ++ cl.s ! tp.b ! ClFinite tp.t tp.a o} ;
+{- ----
   UseRCl tp cl = 
     {s = \\gn,p => tp.s ++ cl.s ! tp.b ! VFinite tp.t tp.a ! gn ! p} ;
   UseQCl tp cl = {s = \\q => tp.s ++ cl.s ! tp.b ! VFinite tp.t tp.a ! q} ;

lib/resource/romance/VerbphraseRomance.gf

@@ -50,8 +50,6 @@ incomplete concrete VerbphraseRomance of Verbphrase = CategoriesRomance **
 
 ----  PredProgVP = progressiveVerbPhrase ;
 
-----  SPredProgVP = progressiveClause ;
-
 -- Use VPs
 
   PredVP = predVerbGroupClause ;

src/GF/Compile/ShellState.hs

@@ -139,7 +139,9 @@ updateShellState opts mcnc sh ((_,sgr,gr),rts) = do
     Just a -> do
       -- test that abstract is compatible --- unsafe exception for old? 
       --- 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 a'
   let cgr = filterAbstracts abstr0 cgr0
@@ -185,6 +187,20 @@ prShellStateInfo sh = unlines [
   "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)
 
 -- | throw away those abstracts that are not needed --- could be more aggressive