unoptimize for Java ; Finnish

3 files changed, 56 insertions, 5 deletions

diff --git a/doc/gf-history.html b/doc/gf-history.html
index b59ede479..e4db5129c 100644
--- a/doc/gf-history.html
+++ b/doc/gf-history.html
@@ -12,6 +12,17 @@ Changes in functionality since May 17, 2005, release of GF Version 2.2
 
 </center>
 
+29/6 (AR) The printer used by Embedded Java GF Interpreter 
+(<tt>pm -header</tt>) now produces
+working code from all optimized grammars - hence you need not select a 
+weaker optimization just to use the interpreter. However, the
+optimization <tt>-optimize=share</tt> usually produces smaller object
+grammars because the "unoptimizer" just undoes all optimizations.
+(This is to be considered a temporary solution until the interpreter
+knows how to handle stronger optimizations.)
+
+<p>
+
 27/6 (AR) The flag <tt>flags optimize=noexpand</tt> placed in a
 resource module prevents the optimization phase of the compiler when
 the <tt>.gfr</tt> file is created. This can prevent serious code
diff --git a/src/GF/UseGrammar/Custom.hs b/src/GF/UseGrammar/Custom.hs
index 40c625612..b04875e56 100644
--- a/src/GF/UseGrammar/Custom.hs
+++ b/src/GF/UseGrammar/Custom.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/06/23 14:32:44 $ 
+-- > CVS $Date: 2005/06/29 16:27:56 $ 
 -- > CVS $Author: aarne $
--- > CVS $Revision: 1.65 $
+-- > CVS $Revision: 1.66 $
 --
 -- A database for customizable GF shell commands. 
 --
@@ -39,6 +39,7 @@ import qualified GF.Grammar.MMacros as MM
 import GF.Grammar.AbsCompute
 import GF.Grammar.TypeCheck
 import GF.UseGrammar.Generate
+import GF.UseGrammar.Linear (unoptimizeCanon)
 ------import Compile
 import GF.Compile.ShellState
 import GF.UseGrammar.Editing
@@ -282,7 +283,7 @@ customMultiGrammarPrinter =
   customData "Printers for multiple grammars, selected by option -printer=x" $
   [
    (strCI "gfcm", const MC.prCanon)
-  ,(strCI "header", const MC.prCanonMGr)
+  ,(strCI "header", const (MC.prCanonMGr . unoptimizeCanon))
   ,(strCI "cfgm", prCanonAsCFGM)
   ,(strCI "graph", visualizeCanonGrammar)
   ]
diff --git a/src/GF/UseGrammar/Linear.hs b/src/GF/UseGrammar/Linear.hs
index 3899aa48f..6de767a06 100644
--- a/src/GF/UseGrammar/Linear.hs
+++ b/src/GF/UseGrammar/Linear.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/06/23 14:32:44 $ 
+-- > CVS $Date: 2005/06/29 16:27:56 $ 
 -- > CVS $Author: aarne $
--- > CVS $Revision: 1.17 $
+-- > CVS $Revision: 1.18 $
 --
 -- Linearization for canonical GF. AR 7\/6\/2003
 -----------------------------------------------------------------------------
@@ -31,6 +31,7 @@ import GF.Text.Text
 
 import GF.Data.Operations
 import GF.Data.Zipper
+import qualified GF.Infra.Modules as M
 
 import Control.Monad
 import Data.List (intersperse)
@@ -104,6 +105,11 @@ expandLinTables gr t = case t of
     ps  <- mapM term2patt vs
     ts' <- mapM (comp . S t') $ vs
     return $ T ty [Cas [p] t | (p,t) <- zip ps ts']
+  V ty ts0 -> do
+    ts  <- mapM exp ts0 -- expand from inside-out
+    vs  <- alls ty
+    ps  <- mapM term2patt vs
+    return $ T ty [Cas [p] t | (p,t) <- zip ps ts]
   FV ts -> liftM FV $ mapM exp ts
   _ -> composOp exp t
  where
@@ -111,6 +117,39 @@ expandLinTables gr t = case t of
    exp  = expandLinTables gr
    comp = ccompute gr []
 
+-- Do this for an entire grammar:
+
+unoptimizeCanon :: CanonGrammar -> CanonGrammar
+unoptimizeCanon g@(M.MGrammar ms) = M.MGrammar $ map convMod ms where
+  convMod (m, M.ModMod (M.Module (M.MTConcrete a) x flags me os defs)) = 
+    (m, M.ModMod (M.Module (M.MTConcrete a) x flags me os (mapTree convDef defs)))
+  convMod mm = mm
+  convDef (c,CncCat ty df pr) = (c,CncCat ty (convT df) (convT pr))
+  convDef (f,CncFun c xs li pr) = (f,CncFun c xs (convT li) (convT pr))
+  convDef cd = cd
+  convT = err error id . exp
+  -- a version of expandLinTables that does not destroy share optimization
+  exp t = case t of
+    R rs -> liftM (R . map (uncurry Ass)) $ mapPairsM exp [(l,r) | Ass l r <- rs]
+    T ty rs@[Cas [_] _] -> do
+      rs' <- mapPairsM exp [(l,r) | Cas l r <- rs] -- expand from inside-out
+      let t' = T ty $ map (uncurry Cas) rs'
+      vs  <- alls ty
+      ps  <- mapM term2patt vs
+      ts' <- mapM (comp . S t') $ vs
+      return $ T ty [Cas [p] t | (p,t) <- zip ps ts']
+    V ty ts0 -> do
+      ts  <- mapM exp ts0 -- expand from inside-out
+      vs  <- alls ty
+      ps  <- mapM term2patt vs
+      return $ T ty [Cas [p] t | (p,t) <- zip ps ts]
+    FV ts -> liftM FV $ mapM exp ts
+    _ -> composOp exp t
+   where
+     alls = allParamValues g
+     comp = ccompute g []
+
+
 -- | from records, one can get to records of tables of strings
 rec2strTables :: Term -> Err [[(Label,[([Patt],[Str])])]]
 rec2strTables r = do