782d0f7 · Idris-dev · git.iko.soy

src/Idris/AbsSyntax.hs+1−1

compare with master

unifiedsplit

@@ -67,7 +67,7 @@ data IState = IState { tt_ctxt :: Context,

67 syntax_keywords :: [String],

68 imported :: [FilePath],

69 idris_prims :: [(Name, ([E.Name], E.Term))],

70− idris_scprims :: [(Name, ([CType], CType, SPrim))],

70+ idris_scprims :: Prims,

71 idris_objs :: [FilePath],

72 idris_libs :: [String],

73 idris_hdrs :: [String],

src/Idris/REPL.hs+3−2

@@ -199,9 +199,10 @@ process fn (DebugInfo n)

199 let d = lookupDef Nothing n (tt_ctxt i)

200 when (not (null d)) $ liftIO $

201 do print (head d)

202+ let prims = idris_scprims i

202− print (toSC i (n, head d))

203+ print (toSC prims (n, head d))

203 putStrLn (showSep "\n"

204 putStrLn (showSep "\n"

204− (map show (bcdefs (toSC i (n, head d)))))

205+ (map show (bcdefs (toSC prims (n, head d)))))

205process fn (Info n) = do i <- get

206process fn (Info n) = do i <- get

206 case lookupCtxt Nothing n (idris_classes i) of

207 case lookupCtxt Nothing n (idris_classes i) of

207 [c] -> classInfo c

208 [c] -> classInfo c

src/RTS/Bytecode.hs−8

@@ -42,14 +42,6 @@ type Bytecode = [BCOp]

42data BCProg = BCProg [(Name, Bytecode)]

43 deriving Show

44

45−toSC :: IState -> (Name, Def) -> [(Name, SCDef)]

46−toSC i (n, d) = case lookup n (idris_scprims i) of

47− Nothing -> sclift (n, d)

48− Just (args, rt, op) ->

49− let anames = zipWith mkA args [0..] in

50− [(n, SCDef anames (SPrimOp op (map (SRef . fst) anames)))]

51− where mkA t i = (MN i "primArg", t)

52−

53bcdefs :: [(Name, SCDef)] -> [(Name, Bytecode)]

45bcdefs :: [(Name, SCDef)] -> [(Name, Bytecode)]

54bcdefs = map (\ (n, s) -> (n, bc [] s))

46bcdefs = map (\ (n, s) -> (n, bc [] s))

55

47

src/RTS/SC.hs+11

@@ -52,6 +52,8 @@ data SAlt = SConCase Tag [Name] SCExp

52 | SDefaultCase SCExp

53 deriving Show

54

55+type Prims = [(Name, ([CType], CType, SPrim))]

56+

55sInt, sFloat, sChar, sString, sPtr, sBigInt :: CType

57sInt, sFloat, sChar, sString, sPtr, sBigInt :: CType

56sInt = Just IType

58sInt = Just IType

57sFloat = Just FlType

59sFloat = Just FlType

@@ -62,6 +64,15 @@ sBigInt = Just BIType

62

64

63type SCState = ([(Name, SCDef)], Name)

65type SCState = ([(Name, SCDef)], Name)

64

66

67+toSC :: Prims -> (Name, Def) -> [(Name, SCDef)]

68+toSC prims (n, d)

69+ = case lookup n prims of

70+ Nothing -> sclift (n, d)

71+ Just (args, rt, op) ->

72+ let anames = zipWith mkA args [0..] in

73+ [(n, SCDef anames (SPrimOp op (map (SRef . fst) anames)))]

74+ where mkA t i = (MN i "primArg", t)

75+

65sclift :: (Name, Def) -> [(Name, SCDef)]

76sclift :: (Name, Def) -> [(Name, SCDef)]

66sclift (n, d) = fst (execState (sc [] d) ([], n))

77sclift (n, d) = fst (execState (sc [] d) ([], n))

67

78