the compiler now compiles with the new runtime

src/compiler/GF/Grammar/BNFC.hs

@@ -25,7 +25,7 @@ data BNFCRule = BNFCRule {
                  ruleName :: CFTerm }
               | BNFCCoercions {
                  coerCat :: Cat,
-                 coerNum :: Int }
+                 coerNum :: Integer }
               | BNFCTerminator {
                  termNonEmpty :: Bool,
                  termCat :: Cat,

src/compiler/GF/Grammar/Binary.hs

@@ -22,7 +22,8 @@ import GF.Infra.Option
 import GF.Infra.UseIO(MonadIO(..))
 import GF.Grammar.Grammar
 
-import PGF2.Internal(Literal(..),Symbol(..))
+import PGF2(Literal(..))
+import PGF2.Internal(Symbol(..))
 
 -- Please change this every time when the GFO format is changed
 gfoVersion = "GF04"

src/compiler/GF/Grammar/Canonical.hs

@@ -9,9 +9,11 @@
 
 {-# LANGUAGE DeriveTraversable #-}
 module GF.Grammar.Canonical where
+
 import Prelude hiding ((<>))
 import GF.Text.Pretty
 import GF.Infra.Ident (RawIdent)
+import PGF(Literal(..))
 
 -- | A Complete grammar
 data Grammar = Grammar Abstract [Concrete] deriving Show
@@ -58,7 +60,7 @@ newtype ParamType = ParamTypeId ParamId deriving (Eq,Ord,Show)
 
 -- | Linearization value, RHS of @lin@
 data LinValue = ConcatValue LinValue LinValue
-              | LiteralValue LinLiteral
+              | LiteralValue Literal
               | ErrorValue String
               | ParamConstant ParamValue
               | PredefValue PredefId
@@ -74,11 +76,6 @@ data LinValue = ConcatValue LinValue LinValue
               | CommentedValue String LinValue
               deriving (Eq,Ord,Show)
 
-data LinLiteral = FloatConstant Float
-                | IntConstant Int
-                | StrConstant String
-                deriving (Eq,Ord,Show)
-
 data LinPattern = ParamPattern ParamPattern
                 | RecordPattern [RecordRow LinPattern]
                 | TuplePattern [LinPattern]
@@ -120,9 +117,8 @@ newtype FunId = FunId Id  deriving (Eq,Show)
 
 data VarId = Anonymous | VarId Id  deriving Show
 
-newtype Flags = Flags [(FlagName,FlagValue)] deriving Show
+newtype Flags = Flags [(FlagName,Literal)] deriving Show
 type FlagName = Id
-data FlagValue = Str String | Int Int | Flt Double deriving Show
 
 
 -- *** Identifiers
@@ -243,13 +239,13 @@ instance PPA LinValue where
              VarValue v -> pp v
              _ -> parens lv
 
-instance Pretty LinLiteral where pp = ppA
+instance Pretty Literal where pp = ppA
 
-instance PPA LinLiteral where
+instance PPA Literal where
   ppA l = case l of
-            FloatConstant f -> pp f
-            IntConstant n -> pp n
-            StrConstant s -> doubleQuotes s -- hmm
+            LFlt f -> pp f
+            LInt n -> pp n
+            LStr s -> doubleQuotes s -- hmm
 
 instance RhsSeparator LinValue where rhsSep _ = pp "="
 
@@ -298,11 +294,6 @@ instance Pretty Flags where
     where
       ppFlag (name,value) = name <+> "=" <+> value <>";"
 
-instance Pretty FlagValue where
-  pp (Str s) = pp s
-  pp (Int i) = pp i
-  pp (Flt d) = pp d
-
 --------------------------------------------------------------------------------
 -- | Pretty print atomically (i.e. wrap it in parentheses if necessary)
 class Pretty a => PPA a where ppA :: a -> Doc

src/compiler/GF/Grammar/CanonicalJSON.hs

@@ -8,7 +8,7 @@ import Data.Ratio (denominator, numerator)
 import GF.Grammar.Canonical
 import Control.Monad (guard)
 import GF.Infra.Ident (RawIdent,showRawIdent,rawIdentS)
-
+import PGF(Literal(..))
 
 encodeJSON :: FilePath -> Grammar -> IO ()
 encodeJSON fpath g = writeFile fpath (encode g)
@@ -171,13 +171,13 @@ instance JSON LinValue where
     <|>        do vs <- readJSON o :: Result [LinValue]
                   return (foldr1 ConcatValue vs)
 
-instance JSON LinLiteral where
+instance JSON Literal where
   -- basic values (Str, Float, Int) are encoded as JSON strings/numbers:
-  showJSON (StrConstant   s) = showJSON s
-  showJSON (FloatConstant f) = showJSON f
-  showJSON (IntConstant   n) = showJSON n
+  showJSON (LStr s) = showJSON s
+  showJSON (LFlt f) = showJSON f
+  showJSON (LInt n) = showJSON n
 
-  readJSON = readBasicJSON StrConstant IntConstant FloatConstant
+  readJSON = readBasicJSON LStr LInt LFlt
 
 instance JSON LinPattern where
   -- wildcards and patterns without arguments are encoded as strings:
@@ -262,15 +262,6 @@ instance JSON Flags where
     where fromRow (lbl, jsvalue) = do value <- readJSON jsvalue
                                       return (rawIdentS lbl, value)
 
-instance JSON FlagValue where
-  -- flag values are encoded as basic JSON types:
-  showJSON (Str s) = showJSON s
-  showJSON (Int i) = showJSON i
-  showJSON (Flt f) = showJSON f
-
-  readJSON = readBasicJSON Str Int Flt
-
-
 --------------------------------------------------------------------------------
 -- ** Convenience functions
 

src/compiler/GF/Grammar/Grammar.hs

@@ -354,7 +354,7 @@ data Term =
  | Cn Ident                      -- ^ constant
  | Con Ident                     -- ^ constructor
  | Sort Ident                    -- ^ basic type
- | EInt Int                      -- ^ integer literal
+ | EInt Integer                  -- ^ integer literal
  | EFloat Double                 -- ^ floating point literal
  | K String                      -- ^ string literal or token: @\"foo\"@
  | Empty                         -- ^ the empty string @[]@
@@ -409,7 +409,7 @@ data Patt =
  | PW                     -- ^ wild card pattern: @_@
  | PR [(Label,Patt)]      -- ^ record pattern: @{r = p ; ...}@  -- only concrete
  | PString String         -- ^ string literal pattern: @\"foo\"@  -- only abstract
- | PInt    Int            -- ^ integer literal pattern: @12@    -- only abstract
+ | PInt    Integer        -- ^ integer literal pattern: @12@    -- only abstract
  | PFloat Double          -- ^ float literal pattern: @1.2@    -- only abstract
  | PT Type Patt           -- ^ type-annotated pattern
 

src/compiler/GF/Grammar/Lexer.x

@@ -130,7 +130,7 @@ data Token
  | T_separator
  | T_nonempty
  | T_String  String          -- string literals
- | T_Integer Int             -- integer literals
+ | T_Integer Integer         -- integer literals
  | T_Double  Double          -- double precision float literals
  | T_Ident   Ident
  | T_EOF

src/compiler/GF/Grammar/Macros.hs

@@ -216,7 +216,7 @@ typeTok   = Sort cTok
 typeStrs  = Sort cStrs
 
 typeString, typeFloat, typeInt :: Type
-typeInts :: Int -> Type
+typeInts :: Integer -> Type
 typePBool :: Type
 typeError :: Type
 
@@ -227,7 +227,7 @@ typeInts i = App (cnPredef cInts) (EInt i)
 typePBool = cnPredef cPBool
 typeError = cnPredef cErrorType
 
-isTypeInts :: Type -> Maybe Int
+isTypeInts :: Type -> Maybe Integer
 isTypeInts (App c (EInt i)) | c == cnPredef cInts = Just i
 isTypeInts _                                      = Nothing
 
@@ -324,7 +324,7 @@ freshAsTerm s = Vr (varX (readIntArg s))
 string2term :: String -> Term
 string2term = K
 
-int2term :: Int -> Term
+int2term :: Integer -> Term
 int2term = EInt
 
 float2term :: Double -> Term