the compiler now allows + to be used as a floating point addition in the abstract syntax

6 files changed, 20 insertions, 1 deletions

diff --git a/src/compiler/GF/Compile/GenerateBC.hs b/src/compiler/GF/Compile/GenerateBC.hs
index a121a3d5e..1f1e81ab9 100644
--- a/src/compiler/GF/Compile/GenerateBC.hs
+++ b/src/compiler/GF/Compile/GenerateBC.hs
@@ -131,6 +131,11 @@ compileFun gr arity st vs (Let (x, (_, e1)) e2) h0 bs args =
   let (h1,bs1,arg,is1) = compileLambda gr st vs [] e1 h0 bs
       (h2,bs2,is2) = compileFun gr arity st ((x,arg):vs) e2 h1 bs1 args
   in (h2,bs2,is1++is2)
+compileFun gr arity st vs (Glue e1 e2) h0 bs args =
+  let (h1,bs1,arg1,is1) = compileArg gr st vs e1 h0 bs
+      (h2,bs2,arg2,is2) = compileArg gr st vs e2 h1 bs1
+      (st1,is3) = pushArgs st [arg2,arg1]
+  in (h2,bs2,is1++is2++is3++[ADD])
 compileFun gr arity st vs e _ _ _ = error (show e)
 
 compileArg gr st vs (Q(m,id)) h0 bs =
diff --git a/src/compiler/GF/Compile/TypeCheck/TC.hs b/src/compiler/GF/Compile/TypeCheck/TC.hs
index 9a3cb7103..531d862f4 100644
--- a/src/compiler/GF/Compile/TypeCheck/TC.hs
+++ b/src/compiler/GF/Compile/TypeCheck/TC.hs
@@ -46,6 +46,7 @@ data AExp =
    | ARecType [ALabelling]
    | AR    [AAssign]
    | AP    AExp Label Val
+   | AGlue AExp AExp
    | AData Val
   deriving (Eq,Show)
 
@@ -162,6 +163,10 @@ checkExp th tenv@(k,rho,gamma) e ty = do
     P r l -> do (r',cs) <- checkExp th tenv r (VRecType [(l,typ)])
                 return (AP r' l typ,cs)
 
+    Glue x y -> do cs1 <- eqVal k valAbsFloat typ
+                   (x,cs2) <- checkExp th tenv x typ
+                   (y,cs3) <- checkExp th tenv y typ
+                   return (AGlue x y,cs1++cs2++cs3)
     _ -> checkInferExp th tenv e typ
 
 checkInferExp :: Theory -> TCEnv -> Exp -> Val -> Err (AExp, [(Val,Val)])
diff --git a/src/runtime/c/pgf/data.h b/src/runtime/c/pgf/data.h
index e734434cd..8e2b726a7 100644
--- a/src/runtime/c/pgf/data.h
+++ b/src/runtime/c/pgf/data.h
@@ -136,7 +136,8 @@ typedef enum {
   PGF_INSTR_PUSH        =  9,
   PGF_INSTR_EVAL        = 10,
   PGF_INSTR_DROP        = 13,
-  PGF_INSTR_FAIL        = 14
+  PGF_INSTR_FAIL        = 14,
+  PGF_INSTR_ADD         = 15
 } PgfInstruction;
 
 typedef GuSeq PgfConcrs;
diff --git a/src/runtime/c/pgf/jit.c b/src/runtime/c/pgf/jit.c
index c97113b5a..8cb2257d6 100644
--- a/src/runtime/c/pgf/jit.c
+++ b/src/runtime/c/pgf/jit.c
@@ -1160,6 +1160,11 @@ pgf_jit_function(PgfReader* rdr, PgfAbstr* abstr,
 #endif
 				jit_jmpi(abstr->eval_gates->mk_const);
 				break;
+			case PGF_INSTR_ADD:
+#ifdef PGF_JIT_DEBUG
+				gu_printf(out, err, "ADD\n");
+#endif
+				break;
 			default:
 				gu_impossible();
 			}
diff --git a/src/runtime/haskell/PGF/Binary.hs b/src/runtime/haskell/PGF/Binary.hs
index ca2784da2..9a74ac2f2 100644
--- a/src/runtime/haskell/PGF/Binary.hs
+++ b/src/runtime/haskell/PGF/Binary.hs
@@ -170,6 +170,7 @@ instance Binary Instr where
   put (EVAL (GLOBAL  id) (UpdateCall b c)) = putWord8 51 >> put id >> put (b,c)

   put (DROP n l           ) = putWord8 52  >> put (n,l)

   put (FAIL               ) = putWord8 56

+  put (ADD                ) = putWord8 60

 

 instance Binary Type where

   put (DTyp hypos cat exps) = put (hypos,cat,exps)

diff --git a/src/runtime/haskell/PGF/ByteCode.hs b/src/runtime/haskell/PGF/ByteCode.hs
index 393efa5b9..ababdde0d 100644
--- a/src/runtime/haskell/PGF/ByteCode.hs
+++ b/src/runtime/haskell/PGF/ByteCode.hs
@@ -28,6 +28,7 @@ data Instr
   | EVAL IVal TailInfo
   | DROP {-# UNPACK #-} !Int  {-# UNPACK #-} !CodeLabel
   | FAIL
+  | ADD
 
 data IVal
   = HEAP     {-# UNPACK #-} !Int
@@ -61,6 +62,7 @@ ppInstr (PUSH          v) = text "PUSH       " <+> ppIVal v
 ppInstr (EVAL       v ti) = text "EVAL       " <+> ppIVal v <+> ppTailInfo ti
 ppInstr (DROP n l       ) = text "DROP       " <+> int n <+> ppLabel l
 ppInstr (FAIL           ) = text "FAIL"
+ppInstr (ADD            ) = text "ADD"
 
 ppIVal (HEAP     n) = text "hp"  <> parens (int n)
 ppIVal (ARG_VAR  n) = text "stk" <> parens (int n)