Create frontend-test directory.

.gitignore

@@ -20,3 +20,4 @@ cabal.sandbox.config
 cabal.project.local
 .HTF/
 output/
+*.ibc

.travis.yml

@@ -38,5 +38,5 @@ install:
 script:
   - mkdir output
   - stack exec grin -- grin/grin/sum_simple.grin
-  - stack exec idris -- hello.idr --codegen grin -o hello.grin
+  - stack exec idris -- frontend-test/idris/Hello.idr -i frontend-test/idris --codegen grin -o hello.grin
   - stack --no-terminal test --coverage

frontend-test/idris/GrinFFI.idr

@@ -0,0 +1,7 @@
+module GrinFFI
+
+public export
+int_print : Int -> IO Int
+int_print i
+   = foreign FFI_C "_prim_int_print" (Int -> IO Int) i
+

frontend-test/idris/Hello.idr

@@ -1,8 +1,7 @@
 module Main
 
-int_print : Int -> IO Int
+import GrinFFI
-int_print i
+
-   = foreign FFI_C "_prim_int_print" (Int -> IO Int) i
 
 fn : Int -> Int
 fn x = if x > 0

grin/src/Frontend/Idris/CodegenGrin.hs

@@ -44,15 +44,15 @@ codegenGrin CodegenInfo{..} = do
 
 idrisPrimOps = [prog|
 
-  idris_int_eq a0 b0 =
+  idris_int_eq idris_int_eq0 idris_int_eq1 =
-    res0 <- _prim_int_eq a0 b0
+    idris_int_eq2 <- _prim_int_eq idris_int_eq0 idris_int_eq1
-    case res0 of
+    case idris_int_eq2 of
       #False  -> pure 0
       #True   -> pure 1
 
-  idris_int_lt a1 b1 =
+  idris_int_lt idris_int_lt0 idris_int_lt1 =
-    res1 <- _prim_int_lt a1 b1
+    idris_int_lt2 <- _prim_int_lt idris_int_lt0 idris_int_lt1
-    case res1 of
+    case idris_int_lt2 of
       #False  -> pure 0
       #True   -> pure 1
 |]
@@ -104,8 +104,6 @@ sexp fname = \case
   SV lvar0@(Idris.Loc i)  -> SReturn (Var $ loc fname lvar0)
   SV lvar0@(Idris.Glob n) -> traceShow "Global call" $ Grin.SApp (lvar fname lvar0) []
 
-  -- Keep DExps for describing foreign things, because they get
-  -- translated differently
   --SForeign fdesc1 fdesc2 fdescLVars -> undefined
   SForeign _ (FStr "_prim_int_print") [(_,arg)] -> Grin.SApp "_prim_int_print" [Var . lvar fname $ arg]
   SNothing -> traceShow "Erased value" $ SReturn Unit
@@ -267,13 +265,13 @@ idrisPipeLine =
   , T UpdateElimination
   , T CopyPropagation
   , T ConstantPropagation
---  , T SparseCaseOptimisation: Illegal type {}
+  , T SparseCaseOptimisation
   , T EvaluatedCaseElimination
   , T ConstantPropagation
---  , T CommonSubExpressionElimination: Illegal type {}
+  , T CommonSubExpressionElimination
   , T CaseCopyPropagation
---  , T GeneralizedUnboxing: Illegal type: {}
+  , T GeneralizedUnboxing
---  , T ArityRaising: Illegal type: {}
+  , T ArityRaising
   , SaveGrin "After"
   , PrintGrin ondullblack
   , SaveLLVM "high-level-opt-code"