From b5539fe0dbb4fc14a3588da20be7f47fad343256 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Wed, 21 Jun 2006 07:51:44 +0000
Subject: romance ImpPlP1 corrected

---
 src/GF/Compile/ShellState.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/GF/Compile/ShellState.hs')

diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs
index 88da1283b..07ddaa97a 100644
--- a/src/GF/Compile/ShellState.hs
+++ b/src/GF/Compile/ShellState.hs
@@ -237,7 +237,8 @@ updateShellState opts ign mcnc sh ((_,sgr,gr),rts) = do
       concr0 = ifNull Nothing (return . head) concrs
       notInrts f = notElem f $ map fst rts
       subcgr = unSubelimCanon cgr
-  cf's0 <- if oElem noCF opts
+  cf's0 <- if (not (oElem (iOpt "docf") opts) &&       -- cf only built with -docf
+               (oElem noCF opts || not (hasHOAS cgr))) -- or HOAS, if not -nocf
             then return $ map snd $ cfs sh
             else mapM (canon2cf opts ign subcgr) newConcrs 
   let cf's = zip newConcrs cf's0 ++ filter toRetain (cfs sh)
-- 
cgit v1.2.3