the compiler now compiles with the new runtime

src/compiler/GF/Compile/CFGtoPGF.hs

@@ -21,7 +21,7 @@ import Data.Maybe(fromMaybe)
 --------------------------
 
 cf2pgf :: Options -> FilePath -> ParamCFG -> Map.Map Fun Double -> PGF
-cf2pgf opts fpath cf probs = 
+cf2pgf opts fpath cf probs = error "TODO: cf2pgf" {-
  build (let abstr = cf2abstr cf probs
         in newPGF [] aname abstr [(cname, cf2concr opts abstr cf)])
  where
@@ -134,3 +134,4 @@ mkRuleName rule =
   case ruleName rule of
 	CFObj n _ -> n
 	_         -> "_"
+-}

src/compiler/GF/Compile/Compute/Predef.hs

@@ -4,7 +4,7 @@ module GF.Compile.Compute.Predef(predef,predefName,delta) where
 
 import qualified Data.Map as Map
 import Data.Array(array,(!))
-import Data.List (isInfixOf)
+import Data.List (isInfixOf,genericTake,genericDrop,genericLength)
 import Data.Char (isUpper,toLower,toUpper)
 import Control.Monad(ap)
 
@@ -20,7 +20,7 @@ class Predef a where
   toValue :: a -> Value
   fromValue :: Value -> Err a
 
-instance Predef Int where
+instance Predef Integer where
   toValue = VInt
   fromValue (VInt i) = return i
   fromValue v = verror "Int" v
@@ -87,8 +87,8 @@ predefList =
 
 delta f vs =
     case f of
-      Drop    -> fromNonExist vs NonExist (ap2 (drop::Int->String->String))
-      Take    -> fromNonExist vs NonExist (ap2 (take::Int->String->String))
+      Drop    -> fromNonExist vs NonExist (ap2 (genericDrop::Integer->String->String))
+      Take    -> fromNonExist vs NonExist (ap2 (genericTake::Integer->String->String))
       Tk      -> fromNonExist vs NonExist (ap2 tk)
       Dp      -> fromNonExist vs NonExist (ap2 dp)
       EqStr   -> fromNonExist vs PFalse   (ap2 ((==)::String->String->Bool))
@@ -97,10 +97,10 @@ delta f vs =
       ToUpper -> fromNonExist vs NonExist (ap1 (map toUpper))
       ToLower -> fromNonExist vs NonExist (ap1 (map toLower))
       IsUpper -> fromNonExist vs PFalse   (ap1 (all' isUpper))
-      Length  -> fromNonExist vs (0::Int) (ap1 (length::String->Int))
-      Plus    -> ap2 ((+)::Int->Int->Int)
-      EqInt   -> ap2 ((==)::Int->Int->Bool)
-      LessInt -> ap2 ((<)::Int->Int->Bool)
+      Length  -> fromNonExist vs (0::Integer) (ap1 (genericLength::String->Integer))
+      Plus    -> ap2 ((+)::Integer->Integer->Integer)
+      EqInt   -> ap2 ((==)::Integer->Integer->Bool)
+      LessInt -> ap2 ((<)::Integer->Integer->Bool)
     {- -- | Show | Read | ToStr | MapStr | EqVal -}
       Error   -> ap1 VError
       Trace   -> ap2 vtrace
@@ -139,8 +139,12 @@ delta f vs =
 --  unimpl id = bug $ "unimplemented predefined function: "++showIdent id
 --  problem id vs = bug $ "unexpected arguments: Predef."++showIdent id++" "++show vs
 
-    tk i s = take (max 0 (length s - i)) s :: String
-    dp i s = drop (max 0 (length s - i)) s :: String
+    tk :: Integer -> String -> String
+    tk i s = genericTake (max 0 (genericLength s - i)) s
+
+    dp :: Integer -> String -> String
+    dp i s = genericDrop (max 0 (genericLength s - i)) s
+
     occur s t = isInfixOf (s::String) (t::String)
     occurs s t = any (`elem` (t::String)) (s::String)
     all' = all :: (a->Bool) -> [a] -> Bool

src/compiler/GF/Compile/Compute/Value.hs

@@ -14,7 +14,7 @@ data Value
 -- -- | VClosure Env Term -- used in Typecheck.ConcreteNew
   | VAbs BindType Ident Binding -- used in Compute.Concrete
   | VProd BindType Value Ident Binding -- used in Compute.Concrete
-  | VInt Int
+  | VInt Integer
   | VFloat Double
   | VString String
   | VSort Ident

src/compiler/GF/Compile/ConcreteToHaskell.hs

@@ -1,5 +1,7 @@
 -- | Translate concrete syntax to Haskell
 module GF.Compile.ConcreteToHaskell(concretes2haskell,concrete2haskell) where
+
+import PGF2(Literal(..))
 import Data.List(isPrefixOf,sort,sortOn)
 import qualified Data.Map as M
 import qualified Data.Set as S
@@ -181,9 +183,9 @@ concrete2haskell opts
 
         ppL l =
           case l of
-            FloatConstant x -> pure (lit x)
-            IntConstant n -> pure (lit n)
-            StrConstant s -> pure (token s)
+            LFlt x -> pure (lit x)
+            LInt n -> pure (lit n)
+            LStr s -> pure (token s)
 
         pId p@(ParamId s) =
           if "to_R_" `isPrefixOf` unqual s then toIdent p else gId p -- !! a hack

src/compiler/GF/Compile/GenerateBC.hs

@@ -4,7 +4,8 @@ module GF.Compile.GenerateBC(generateByteCode) where
 import GF.Grammar
 import GF.Grammar.Lookup(lookupAbsDef,lookupFunType)
 import GF.Data.Operations
-import PGF2.Internal(CodeLabel,Instr(..),IVal(..),TailInfo(..),Literal(..))
+import PGF2(Literal(..))
+import PGF2.Internal(CodeLabel,Instr(..),IVal(..),TailInfo(..))
 import qualified Data.Map as Map
 import Data.List(nub,mapAccumL)
 import Data.Maybe(fromMaybe)

src/compiler/GF/Compile/GrammarToCanonical.hs

@@ -19,7 +19,7 @@ import GF.Compile.Compute.Predef(predef)
 import GF.Compile.Compute.Value(Predefined(..))
 import GF.Infra.Ident(ModuleName(..),Ident,ident2raw,rawIdentS,showIdent,isWildIdent)
 import GF.Infra.Option(Options,optionsPGF)
-import PGF2.Internal(Literal(..))
+import PGF2(Literal(..))
 import GF.Compile.Compute.Concrete(GlobalEnv,normalForm,resourceValues)
 import GF.Grammar.Canonical as C
 import System.FilePath ((</>), (<.>))
@@ -193,11 +193,11 @@ convert' gr vs = ppT
         Cn x -> VarValue (gId x) -- hmm
         Con c -> ParamConstant (Param (gId c) [])
         Sort k -> VarValue (gId k)
-        EInt n -> LiteralValue (IntConstant n)
+        EInt n -> LiteralValue (LInt n)
         Q (m,n) -> if m==cPredef then ppPredef n else VarValue (gQId m n)
         QC (m,n) -> ParamConstant (Param (gQId m n) [])
-        K s -> LiteralValue (StrConstant s)
-        Empty -> LiteralValue (StrConstant "")
+        K s -> LiteralValue (LStr s)
+        Empty -> LiteralValue (LStr "")
         FV ts -> VariantValue (map ppT ts)
         Alts t' vs -> alts vs (ppT t')
         _ -> error $ "convert' ppT: " ++ show t
@@ -265,8 +265,8 @@ convert' gr vs = ppT
 concatValue :: LinValue -> LinValue -> LinValue
 concatValue v1 v2 =
   case (v1,v2) of
-    (LiteralValue (StrConstant ""),_) -> v2
-    (_,LiteralValue (StrConstant "")) -> v1
+    (LiteralValue (LStr ""),_) -> v2
+    (_,LiteralValue (LStr "")) -> v1
     _ -> ConcatValue v1 v2
 
 -- | Smart constructor for projections
@@ -429,11 +429,5 @@ unqual n = Unqual (ident2raw n)
 
 convFlags :: G.Grammar -> ModuleName -> Flags
 convFlags gr mn =
-  Flags [(rawIdentS n,convLit v) |
+  Flags [(rawIdentS n,v) |
          (n,v)<-err (const []) (optionsPGF.mflags) (lookupModule gr mn)]
-  where
-    convLit l =
-      case l of
-        LStr s -> Str s
-        LInt i -> C.Int i
-        LFlt d -> Flt d

src/compiler/GF/Compile/GrammarToPGF.hs

@@ -30,7 +30,7 @@ import GHC.Prim
 import GHC.Base(getTag)
 
 grammar2PGF :: Options -> SourceGrammar -> ModuleName -> Map.Map PGF2.Fun Double -> IO PGF
-grammar2PGF opts gr am probs = do
+grammar2PGF opts gr am probs = error "TODO: grammar2PGF" {-do
   cnc_infos <- getConcreteInfos gr am
   return $
     build (let gflags   = if flag optSplitPGF opts 
@@ -445,3 +445,4 @@ compareCaseInsensitive (x:xs) (y:ys) =
                               EQ -> compare x y
                               x  -> x
                       x  -> x
+-}

src/compiler/GF/Compile/OptimizePGF.hs

@@ -20,7 +20,7 @@ type ConcrData = ([(FId,[FunId])],          -- ^ Lindefs
                   [(Cat,FId,FId,[String])]) -- ^ Concrete categories
 
 optimizePGF :: Cat -> ConcrData -> ConcrData
-optimizePGF startCat = topDownFilter startCat . bottomUpFilter
+optimizePGF startCat = error "TODO: optimizePGF" {- topDownFilter startCat . bottomUpFilter
 
 catString = "String"
 catInt    = "Int"
@@ -187,3 +187,4 @@ filterProductions prods0 hoc0 prods
 
     accumHOC hoc (PApply funid args) = List.foldl' (\hoc (PArg hypos _) -> List.foldl' (\hoc fid -> IntSet.insert fid hoc) hoc (map snd hypos)) hoc args
     accumHOC hoc _                   = hoc
+-}

src/compiler/GF/Compile/PGFtoJSON.hs

@@ -6,8 +6,8 @@ import Text.JSON
 import qualified Data.Map as Map
 
 pgf2json :: PGF -> String
-pgf2json pgf =
-  encode $ makeObj
+pgf2json pgf = error "TODO: pgf2json"
+{-  encode $ makeObj
     [ ("abstract", abstract2json pgf)
     , ("concretes", makeObj $ map concrete2json
                                 (Map.toList (languages pgf)))
@@ -108,3 +108,4 @@ new f xs =
     [ ("type", showJSON f)
     , ("args", showJSON xs)
     ]
+-}

src/compiler/GF/Compile/TypeCheck/TC.hs

@@ -35,7 +35,7 @@ data AExp =
      AVr   Ident Val
    | ACn   QIdent Val
    | AType
-   | AInt  Int
+   | AInt  Integer
    | AFloat Double
    | AStr  String
    | AMeta MetaId Val