773e454 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

Make ChType a member of IntTy ITChar.

773e454Jan Bessai13 years ago

effects/Effect/Memory.idr+3−3

compare with master

unifiedsplit

@@ -48,7 +48,7 @@ do_malloc size with (fromInteger (cast size) == size)

48private

49do_memset : Ptr -> Nat -> Bits8 -> Nat -> IO ()

50do_memset ptr offset c size

51− = mkForeign (FFun "idris_memset" [FPtr, FInt, FChar, FInt] FUnit)

51+ = mkForeign (FFun "idris_memset" [FPtr, FInt, FByte, FInt] FUnit)

52 ptr (fromInteger $ cast offset) c (fromInteger $ cast size)

54private

@@ -65,7 +65,7 @@ private

65do_peek : Ptr -> Nat -> (size : Nat) -> IO (Vect Bits8 size)

66do_peek _ _ O = return (Prelude.Vect.Nil)

67do_peek ptr offset (S n)

68− = do b <- mkForeign (FFun "idris_peek" [FPtr, FInt] FChar) ptr (fromInteger $ cast offset)

68+ = do b <- mkForeign (FFun "idris_peek" [FPtr, FInt] FByte) ptr (fromInteger $ cast offset)

69 bs <- do_peek ptr (S offset) n

70 Prelude.Monad.return (Prelude.Vect.(::) b bs)

@@ -73,7 +73,7 @@ private

73do_poke : Ptr -> Nat -> Vect Bits8 size -> IO ()

74do_poke _ _ [] = return ()

75do_poke ptr offset (b::bs)

76− = do mkForeign (FFun "idris_poke" [FPtr, FInt, FChar] FUnit) ptr (fromInteger $ cast offset) b

76+ = do mkForeign (FFun "idris_poke" [FPtr, FInt, FByte] FUnit) ptr (fromInteger $ cast offset) b

77 do_poke ptr (S offset) bs

79instance Handler RawMemory (IOExcept String) where

lib/IO.idr+6−2

@@ -21,7 +21,7 @@ io_return x = prim__IO x

21run__IO : IO () -> IO ()

22run__IO v = io_bind v (\v' => io_return v')

24−data IntTy = ITNative | IT8 | IT16 | IT32 | IT64

24+data IntTy = ITChar | ITNative | IT8 | IT16 | IT32 | IT64

25data FTy = FIntT IntTy

26 | FFunction FTy FTy

27 | FFloat

@@ -34,7 +34,10 @@ FInt : FTy

34FInt = FIntT ITNative

36FChar : FTy

37−FChar = FIntT IT8

37+FChar = FIntT ITChar

38+

39+FByte : FTy

40+FByte = FIntT IT8

39FShort : FTy

42FShort : FTy

40FShort = FIntT IT16

43FShort = FIntT IT16

@@ -44,6 +47,7 @@ FLong = FIntT IT64

45interpFTy : FTy -> Type

48interpFTy : FTy -> Type

46interpFTy (FIntT ITNative) = Int

49interpFTy (FIntT ITNative) = Int

50+interpFTy (FIntT ITChar) = Char

47interpFTy (FIntT IT8) = Bits8

51interpFTy (FIntT IT8) = Bits8

48interpFTy (FIntT IT16) = Bits16

52interpFTy (FIntT IT16) = Bits16

49interpFTy (FIntT IT32) = Bits32

53interpFTy (FIntT IT32) = Bits32

src/Core/CaseTree.hs+1−1

@@ -231,7 +231,7 @@ toPat tc tms = evalState (mapM (\x -> toPat' x []) tms) []

231 toPat' (Constant (AType (ATInt ITNative))) []

232 | tc = return $ PCon (UN "Int") 1 []

233 toPat' (Constant (AType ATFloat)) [] | tc = return $ PCon (UN "Float") 2 []

234− toPat' (Constant ChType) [] | tc = return $ PCon (UN "Char") 3 []

234+ toPat' (Constant (AType (ATInt ITChar))) [] | tc = return $ PCon (UN "Char") 3 []

235 toPat' (Constant StrType) [] | tc = return $ PCon (UN "String") 4 []

236 toPat' (Constant PtrType) [] | tc = return $ PCon (UN "Ptr") 5 []

237 toPat' (Constant (AType (ATInt ITBig))) []

src/Core/Evaluate.hs+2−2

@@ -331,7 +331,7 @@ eval traceon ctxt ntimes genv tm opts = ev ntimes [] True [] tm where

331 findConst c (ConstCase c' v : xs) | c == c' = Just v

332 findConst (AType (ATInt ITNative)) (ConCase n 1 [] v : xs) = Just v

333 findConst (AType ATFloat) (ConCase n 2 [] v : xs) = Just v

334− findConst ChType (ConCase n 3 [] v : xs) = Just v

334+ findConst (AType (ATInt ITChar)) (ConCase n 3 [] v : xs) = Just v

335 findConst StrType (ConCase n 4 [] v : xs) = Just v

336 findConst PtrType (ConCase n 5 [] v : xs) = Just v

337 findConst (AType (ATInt ITBig)) (ConCase n 6 [] v : xs) = Just v

@@ -524,7 +524,7 @@ eval_hnf ctxt statics genv tm = ev [] tm where

524 findConst c (ConstCase c' v : xs) | c == c' = Just v

525 findConst (AType (ATInt ITNative)) (ConCase n 1 [] v : xs) = Just v

526 findConst (AType ATFloat) (ConCase n 2 [] v : xs) = Just v

527− findConst ChType (ConCase n 3 [] v : xs) = Just v

527+ findConst (AType (ATInt ITChar)) (ConCase n 3 [] v : xs) = Just v

528 findConst StrType (ConCase n 4 [] v : xs) = Just v

529 findConst PtrType (ConCase n 5 [] v : xs) = Just v

530 findConst (AType (ATInt ITBig)) (ConCase n 6 [] v : xs) = Just v

src/Core/Execute.hs+4−3

@@ -386,7 +386,6 @@ idrisType :: FType -> ExecVal

386idrisType FUnit = EP Ref unitTy EErased

387idrisType ft = EConstant (idr ft)

388 where idr (FArith ty) = AType ty

389− idr FChar = ChType

390 idr FString = StrType

389 idr FString = StrType

391 idr FPtr = PtrType

390 idr FPtr = PtrType

392

391

@@ -419,8 +418,9 @@ call (FFun name argTypes retType) args =

419 call' (Fun _ h) args (FArith ATFloat) = do

418 call' (Fun _ h) args (FArith ATFloat) = do

420 res <- execIO $ callFFI h retCDouble (prepArgs args)

419 res <- execIO $ callFFI h retCDouble (prepArgs args)

421 return (EConstant (Fl (realToFrac res)))

420 return (EConstant (Fl (realToFrac res)))

421+ call' (Fun _ h) args (FArith (ATInt ITChar)) = do

422− call' (Fun _ h) args FChar = do res <- execIO $ callFFI h retCChar (prepArgs args)

422+ res <- execIO $ callFFI h retCChar (prepArgs args)

423− return (EConstant (Ch (castCCharToChar res)))

423+ return (EConstant (Ch (castCCharToChar res)))

424 call' (Fun _ h) args FString = do res <- execIO $ callFFI h retCString (prepArgs args)

425 hStr <- execIO $ peekCString res

426-- lift $ free res

@@ -460,6 +460,7 @@ getFTy :: ExecVal -> Maybe FType

460getFTy (EApp (EP _ (UN "FIntT") _) (EP _ (UN intTy) _)) =

461 case intTy of

462 "ITNative" -> Just (FArith (ATInt ITNative))

463+ "ITChar" -> Just (FArith (ATInt ITChar))

463 "IT8" -> Just (FArith (ATInt (ITFixed IT8)))

464 "IT8" -> Just (FArith (ATInt (ITFixed IT8)))

464 "IT16" -> Just (FArith (ATInt (ITFixed IT16)))

465 "IT16" -> Just (FArith (ATInt (ITFixed IT16)))

465 "IT32" -> Just (FArith (ATInt (ITFixed IT32)))

466 "IT32" -> Just (FArith (ATInt (ITFixed IT32)))

src/Core/TT.hs+5−4

@@ -288,7 +288,7 @@ instance Pretty NativeTy where

288 pretty IT32 = text "Bits32"

289 pretty IT64 = text "Bits64"

290

291−data IntTy = ITFixed NativeTy | ITNative | ITBig

291+data IntTy = ITFixed NativeTy | ITNative | ITBig | ITChar

292 | ITVec NativeTy Int

293 deriving (Show, Eq, Ord)

294

@@ -298,6 +298,7 @@ data ArithTy = ATInt IntTy | ATFloat -- TODO: Float vectors

298instance Pretty ArithTy where

299 pretty (ATInt ITNative) = text "Int"

300 pretty (ATInt ITBig) = text "BigInt"

301+ pretty (ATInt ITChar) = text "Char"

301 pretty (ATInt (ITFixed n)) = pretty n

302 pretty (ATInt (ITFixed n)) = pretty n

302 pretty (ATInt (ITVec e c)) = pretty e <> text "x" <> (text . show $ c)

303 pretty (ATInt (ITVec e c)) = pretty e <> text "x" <> (text . show $ c)

303 pretty ATFloat = text "Float"

304 pretty ATFloat = text "Float"

@@ -312,13 +313,14 @@ nativeTyWidth IT64 = 64

312intTyWidth :: IntTy -> Int

313intTyWidth :: IntTy -> Int

313intTyWidth (ITFixed n) = nativeTyWidth n

314intTyWidth (ITFixed n) = nativeTyWidth n

314intTyWidth ITNative = 8 * sizeOf (0 :: Int)

315intTyWidth ITNative = 8 * sizeOf (0 :: Int)

316+intTyWidth ITChar = error "IRTS.Lang.intTyWidth: Characters have platform and backend dependent width"

315intTyWidth ITBig = error "IRTS.Lang.intTyWidth: Big integers have variable width"

317intTyWidth ITBig = error "IRTS.Lang.intTyWidth: Big integers have variable width"

316

318

317data Const = I Int | BI Integer | Fl Double | Ch Char | Str String

319data Const = I Int | BI Integer | Fl Double | Ch Char | Str String

318 | B8 Word8 | B16 Word16 | B32 Word32 | B64 Word64

320 | B8 Word8 | B16 Word16 | B32 Word32 | B64 Word64

319 | B8V (Vector Word8) | B16V (Vector Word16)

321 | B8V (Vector Word8) | B16V (Vector Word16)

320 | B32V (Vector Word32) | B64V (Vector Word64)

322 | B32V (Vector Word32) | B64V (Vector Word64)

321− | AType ArithTy | ChType | StrType

323+ | AType ArithTy | StrType

322 | PtrType | VoidType | Forgot

324 | PtrType | VoidType | Forgot

323 deriving (Eq, Ord)

325 deriving (Eq, Ord)

324{-!

326{-!

@@ -335,7 +337,6 @@ instance Pretty Const where

335 pretty (Ch c) = text . show $ c

337 pretty (Ch c) = text . show $ c

336 pretty (Str s) = text s

338 pretty (Str s) = text s

337 pretty (AType a) = pretty a

339 pretty (AType a) = pretty a

338− pretty ChType = text "Char"

339 pretty StrType = text "String"

340 pretty StrType = text "String"

340 pretty PtrType = text "Ptr"

341 pretty PtrType = text "Ptr"

341 pretty VoidType = text "Void"

342 pretty VoidType = text "Void"

@@ -783,9 +784,9 @@ instance Show Const where

783 show (AType ATFloat) = "Float"

784 show (AType ATFloat) = "Float"

784 show (AType (ATInt ITBig)) = "Integer"

785 show (AType (ATInt ITBig)) = "Integer"

785 show (AType (ATInt ITNative)) = "Int"

786 show (AType (ATInt ITNative)) = "Int"

787+ show (AType (ATInt ITChar)) = "Char"

786 show (AType (ATInt (ITFixed it))) = itBitsName it

788 show (AType (ATInt (ITFixed it))) = itBitsName it

787 show (AType (ATInt (ITVec it c))) = itBitsName it ++ "x" ++ show c

789 show (AType (ATInt (ITVec it c))) = itBitsName it ++ "x" ++ show c

788− show ChType = "Char"

789 show StrType = "String"

790 show StrType = "String"

790 show PtrType = "Ptr"

791 show PtrType = "Ptr"

791 show VoidType = "Void"

792 show VoidType = "Void"

src/Core/Typecheck.hs+1−1

@@ -102,7 +102,7 @@ check' holes ctxt env top = chk env top where

102 where constType (I _) = Constant (AType (ATInt ITNative))

103 constType (BI _) = Constant (AType (ATInt ITBig))

104 constType (Fl _) = Constant (AType ATFloat)

105− constType (Ch _) = Constant ChType

105+ constType (Ch _) = Constant (AType (ATInt ITChar))

106 constType (Str _) = Constant StrType

107 constType (B8 _) = Constant (AType (ATInt (ITFixed IT8)))

108 constType (B16 _) = Constant (AType (ATInt (ITFixed IT16)))

src/IRTS/CodegenC.hs+36

@@ -230,6 +230,7 @@ bcc i (ERROR str) = indent i ++ "fprintf(stderr, " ++ show str ++ "); assert(0);

230

231

232c_irts (FArith (ATInt ITNative)) l x = l ++ "MKINT((i_int)(" ++ x ++ "))"

233+c_irts (FArith (ATInt ITChar)) l x = c_irts (FArith (ATInt ITNative)) l x

233c_irts (FArith (ATInt (ITFixed ity))) l x

234c_irts (FArith (ATInt (ITFixed ity))) l x

234 = l ++ "idris_b" ++ show (nativeTyWidth ity) ++ "const(vm, " ++ x ++ ")"

235 = l ++ "idris_b" ++ show (nativeTyWidth ity) ++ "const(vm, " ++ x ++ ")"

235c_irts FChar l x = l ++ "MKINT((i_int)(" ++ x ++ "))"

236c_irts FChar l x = l ++ "MKINT((i_int)(" ++ x ++ "))"

@@ -240,6 +241,7 @@ c_irts (FArith ATFloat) l x = l ++ "MKFLOAT(vm, " ++ x ++ ")"

240c_irts FAny l x = l ++ x

241c_irts FAny l x = l ++ x

241

242

242irts_c (FArith (ATInt ITNative)) x = "GETINT(" ++ x ++ ")"

243irts_c (FArith (ATInt ITNative)) x = "GETINT(" ++ x ++ ")"

244+irts_c (FArith (ATInt ITChar)) x = irts_c (FArith (ATInt ITNative)) x

243irts_c (FArith (ATInt (ITFixed ity))) x

245irts_c (FArith (ATInt (ITFixed ity))) x

244 = "(" ++ x ++ "->info.bits" ++ show (nativeTyWidth ity) ++ ")"

246 = "(" ++ x ++ "->info.bits" ++ show (nativeTyWidth ity) ++ ")"

245irts_c FChar x = "GETINT(" ++ x ++ ")"

247irts_c FChar x = "GETINT(" ++ x ++ ")"

@@ -277,6 +279,26 @@ doOp v (LLe (ATInt ITNative)) [l, r] = v ++ "INTOP(<=," ++ creg l ++ ", " ++ cre

277doOp v (LGt (ATInt ITNative)) [l, r] = v ++ "INTOP(>," ++ creg l ++ ", " ++ creg r ++ ")"

279doOp v (LGt (ATInt ITNative)) [l, r] = v ++ "INTOP(>," ++ creg l ++ ", " ++ creg r ++ ")"

278doOp v (LGe (ATInt ITNative)) [l, r] = v ++ "INTOP(>=," ++ creg l ++ ", " ++ creg r ++ ")"

280doOp v (LGe (ATInt ITNative)) [l, r] = v ++ "INTOP(>=," ++ creg l ++ ", " ++ creg r ++ ")"

279

281

282+doOp v (LPlus (ATInt ITChar)) [l, r] = doOp v (LPlus (ATInt ITNative)) [l, r]

283+doOp v (LMinus (ATInt ITChar)) [l, r] = doOp v (LMinus (ATInt ITNative)) [l, r]

284+doOp v (LTimes (ATInt ITChar)) [l, r] = doOp v (LTimes (ATInt ITNative)) [l, r]

285+doOp v (LUDiv ITChar) [l, r] = doOp v (LUDiv ITNative) [l, r]

286+doOp v (LSDiv (ATInt ITChar)) [l, r] = doOp v (LSDiv (ATInt ITNative)) [l, r]

287+doOp v (LURem ITChar) [l, r] = doOp v (LURem ITNative) [l, r]

288+doOp v (LSRem (ATInt ITChar)) [l, r] = doOp v (LSRem (ATInt ITNative)) [l, r]

289+doOp v (LAnd ITChar) [l, r] = doOp v (LAnd ITNative) [l, r]

290+doOp v (LOr ITChar) [l, r] = doOp v (LOr ITNative) [l, r]

291+doOp v (LXOr ITChar) [l, r] = doOp v (LXOr ITNative) [l, r]

292+doOp v (LSHL ITChar) [l, r] = doOp v (LSHL ITNative) [l, r]

293+doOp v (LLSHR ITChar) [l, r] = doOp v (LLSHR ITNative) [l, r]

294+doOp v (LASHR ITChar) [l, r] = doOp v (LASHR ITNative) [l, r]

295+doOp v (LCompl ITChar) [x] = doOp v (LCompl ITNative) [x]

296+doOp v (LEq (ATInt ITChar)) [l, r] = doOp v (LEq (ATInt ITNative)) [l, r]

297+doOp v (LLt (ATInt ITChar)) [l, r] = doOp v (LLt (ATInt ITNative)) [l, r]

298+doOp v (LLe (ATInt ITChar)) [l, r] = doOp v (LLe (ATInt ITNative)) [l, r]

299+doOp v (LGt (ATInt ITChar)) [l, r] = doOp v (LGt (ATInt ITNative)) [l, r]

300+doOp v (LGe (ATInt ITChar)) [l, r] = doOp v (LGe (ATInt ITNative)) [l, r]

301+

280doOp v (LPlus ATFloat) [l, r] = v ++ "FLOATOP(+," ++ creg l ++ ", " ++ creg r ++ ")"

302doOp v (LPlus ATFloat) [l, r] = v ++ "FLOATOP(+," ++ creg l ++ ", " ++ creg r ++ ")"

281doOp v (LMinus ATFloat) [l, r] = v ++ "FLOATOP(-," ++ creg l ++ ", " ++ creg r ++ ")"

303doOp v (LMinus ATFloat) [l, r] = v ++ "FLOATOP(-," ++ creg l ++ ", " ++ creg r ++ ")"

282doOp v (LTimes ATFloat) [l, r] = v ++ "FLOATOP(*," ++ creg l ++ ", " ++ creg r ++ ")"

304doOp v (LTimes ATFloat) [l, r] = v ++ "FLOATOP(*," ++ creg l ++ ", " ++ creg r ++ ")"

@@ -346,22 +368,34 @@ doOp v (LSExt (ITFixed from) ITBig) [x]

346 = v ++ "MKBIGSI(vm, (" ++ signedTy from ++ ")" ++ creg x ++ "->info.bits" ++ show (nativeTyWidth from) ++ ")"

368 = v ++ "MKBIGSI(vm, (" ++ signedTy from ++ ")" ++ creg x ++ "->info.bits" ++ show (nativeTyWidth from) ++ ")"

347doOp v (LSExt ITNative (ITFixed to)) [x]

369doOp v (LSExt ITNative (ITFixed to)) [x]

348 = v ++ "idris_b" ++ show (nativeTyWidth to) ++ "const(vm, GETINT(" ++ creg x ++ "))"

370 = v ++ "idris_b" ++ show (nativeTyWidth to) ++ "const(vm, GETINT(" ++ creg x ++ "))"

371+doOp v (LSExt ITChar (ITFixed to)) [x]

372+ = doOp v (LSExt ITNative (ITFixed to)) [x]

349doOp v (LSExt (ITFixed from) ITNative) [x]

373doOp v (LSExt (ITFixed from) ITNative) [x]

350 = v ++ "MKINT((i_int)((" ++ signedTy from ++ ")" ++ creg x ++ "->info.bits" ++ show (nativeTyWidth from) ++ "))"

374 = v ++ "MKINT((i_int)((" ++ signedTy from ++ ")" ++ creg x ++ "->info.bits" ++ show (nativeTyWidth from) ++ "))"

375+doOp v (LSExt (ITFixed from) ITChar) [x]

376+ = doOp v (LSExt (ITFixed from) ITNative) [x]

351doOp v (LSExt (ITFixed from) (ITFixed to)) [x]

377doOp v (LSExt (ITFixed from) (ITFixed to)) [x]

352 | nativeTyWidth from < nativeTyWidth to = bitCoerce v "S" from to x

378 | nativeTyWidth from < nativeTyWidth to = bitCoerce v "S" from to x

353doOp v (LZExt ITNative (ITFixed to)) [x]

379doOp v (LZExt ITNative (ITFixed to)) [x]

354 = v ++ "idris_b" ++ show (nativeTyWidth to) ++ "const(vm, (uintptr_t)GETINT(" ++ creg x ++ ")"

380 = v ++ "idris_b" ++ show (nativeTyWidth to) ++ "const(vm, (uintptr_t)GETINT(" ++ creg x ++ ")"

381+doOp v (LZExt ITChar (ITFixed to)) [x]

382+ = doOp v (LZExt ITNative (ITFixed to)) [x]

355doOp v (LZExt (ITFixed from) ITNative) [x]

383doOp v (LZExt (ITFixed from) ITNative) [x]

356 = v ++ "MKINT((i_int)" ++ creg x ++ "->info.bits" ++ show (nativeTyWidth from) ++ ")"

384 = v ++ "MKINT((i_int)" ++ creg x ++ "->info.bits" ++ show (nativeTyWidth from) ++ ")"

385+doOp v (LZExt (ITFixed from) ITChar) [x]

386+ = doOp v (LZExt (ITFixed from) ITNative) [x]

357doOp v (LZExt (ITFixed from) ITBig) [x]

387doOp v (LZExt (ITFixed from) ITBig) [x]

358 = v ++ "MKBIGUI(vm, " ++ creg x ++ "->info.bits" ++ show (nativeTyWidth from) ++ ")"

388 = v ++ "MKBIGUI(vm, " ++ creg x ++ "->info.bits" ++ show (nativeTyWidth from) ++ ")"

359doOp v (LZExt (ITFixed from) (ITFixed to)) [x]

389doOp v (LZExt (ITFixed from) (ITFixed to)) [x]

360 | nativeTyWidth from < nativeTyWidth to = bitCoerce v "Z" from to x

390 | nativeTyWidth from < nativeTyWidth to = bitCoerce v "Z" from to x

361doOp v (LTrunc ITNative (ITFixed to)) [x]

391doOp v (LTrunc ITNative (ITFixed to)) [x]

362 = v ++ "idris_b" ++ show (nativeTyWidth to) ++ "const(vm, GETINT(" ++ creg x ++ "))"

392 = v ++ "idris_b" ++ show (nativeTyWidth to) ++ "const(vm, GETINT(" ++ creg x ++ "))"

393+doOp v (LTrunc ITChar (ITFixed to)) [x]

394+ = doOp v (LTrunc ITNative (ITFixed to)) [x]

363doOp v (LTrunc (ITFixed from) ITNative) [x]

395doOp v (LTrunc (ITFixed from) ITNative) [x]

364 = v ++ "MKINT((i_int)" ++ creg x ++ "->info.bits" ++ show (nativeTyWidth from) ++ ")"

396 = v ++ "MKINT((i_int)" ++ creg x ++ "->info.bits" ++ show (nativeTyWidth from) ++ ")"

397+doOp v (LTrunc (ITFixed from) ITChar) [x]

398+ = doOp v (LTrunc (ITFixed from) ITNative) [x]

365doOp v (LTrunc ITBig (ITFixed to)) [x]

399doOp v (LTrunc ITBig (ITFixed to)) [x]

366 = v ++ "idris_b" ++ show (nativeTyWidth to) ++ "const(vm, ISINT(" ++ creg x ++ ") ? GETINT(" ++ creg x ++ ") : mpz_get_ui(GETMPZ(" ++ creg x ++ ")))"

400 = v ++ "idris_b" ++ show (nativeTyWidth to) ++ "const(vm, ISINT(" ++ creg x ++ ") ? GETINT(" ++ creg x ++ ") : mpz_get_ui(GETMPZ(" ++ creg x ++ ")))"

367doOp v (LTrunc (ITFixed from) (ITFixed to)) [x]

401doOp v (LTrunc (ITFixed from) (ITFixed to)) [x]

@@ -393,7 +427,9 @@ doOp v LFork [x] = v ++ "MKPTR(vm, vmThread(vm, " ++ cname (MN 0 "EVAL") ++ ", "

393doOp v LPar [x] = v ++ creg x -- "MKPTR(vm, vmThread(vm, " ++ cname (MN 0 "EVAL") ++ ", " ++ creg x ++ "))"

427doOp v LPar [x] = v ++ creg x -- "MKPTR(vm, vmThread(vm, " ++ cname (MN 0 "EVAL") ++ ", " ++ creg x ++ "))"

394doOp v LVMPtr [] = v ++ "MKPTR(vm, vm)"

428doOp v LVMPtr [] = v ++ "MKPTR(vm, vm)"

395doOp v (LChInt ITNative) args = v ++ creg (last args)

429doOp v (LChInt ITNative) args = v ++ creg (last args)

430+doOp v (LChInt ITChar) args = doOp v (LChInt ITNative) args

396doOp v (LIntCh ITNative) args = v ++ creg (last args)

431doOp v (LIntCh ITNative) args = v ++ creg (last args)

432+doOp v (LIntCh ITChar) args = doOp v (LIntCh ITNative) args

397doOp v LNoOp args = v ++ creg (last args)

433doOp v LNoOp args = v ++ creg (last args)

398doOp _ op _ = "FAIL /* " ++ show op ++ " */"

434doOp _ op _ = "FAIL /* " ++ show op ++ " */"

399

435

src/IRTS/CodegenJavaScript.hs+1−2

@@ -144,7 +144,6 @@ translateConstant (Fl f) = show f

144translateConstant (Ch c) = show c

145translateConstant (Str s) = show s

146translateConstant (AType (ATInt ITNative)) = "__IDRRT__.Int"

147−translateConstant ChType = "__IDRRT__.Char"

148translateConstant StrType = "__IDRRT__.String"

147translateConstant StrType = "__IDRRT__.String"

149translateConstant (AType (ATInt ITBig)) = "__IDRRT__.Integer"

148translateConstant (AType (ATInt ITBig)) = "__IDRRT__.Integer"

150translateConstant (AType ATFloat) = "__IDRRT__.Float"

149translateConstant (AType ATFloat) = "__IDRRT__.Float"

@@ -470,13 +469,13 @@ translateCase _ (SDefaultCase e) =

470 createIfBlock "true" (translateExpression e)

469 createIfBlock "true" (translateExpression e)

471

470

472translateCase var (SConstCase ty e)

471translateCase var (SConstCase ty e)

473− | ChType <- ty = matchHelper "Char"

474 | StrType <- ty = matchHelper "String"

472 | StrType <- ty = matchHelper "String"

475 | PtrType <- ty = matchHelper "Ptr"

473 | PtrType <- ty = matchHelper "Ptr"

476 | Forgot <- ty = matchHelper "Forgot"

474 | Forgot <- ty = matchHelper "Forgot"

477 | (AType ATFloat) <- ty = matchHelper "Float"

475 | (AType ATFloat) <- ty = matchHelper "Float"

478 | (AType (ATInt ITBig)) <- ty = matchHelper "Integer"

476 | (AType (ATInt ITBig)) <- ty = matchHelper "Integer"

479 | (AType (ATInt ITNative)) <- ty = matchHelper "Int"

477 | (AType (ATInt ITNative)) <- ty = matchHelper "Int"

478+ | (AType (ATInt ITChar)) <- ty = matchHelper "Char"

480 where

479 where

481 matchHelper tyName = translateTypeMatch var tyName e

480 matchHelper tyName = translateTypeMatch var tyName e

482

481

src/IRTS/CodegenLLVM.hs+2−1

@@ -794,7 +794,7 @@ ftyToTy (FArith (ATInt ITBig)) = PointerType mpzTy (AddrSpace 0)

794ftyToTy (FArith (ATInt (ITFixed ty))) = IntegerType (fromIntegral $ nativeTyWidth ty)

795ftyToTy (FArith (ATInt (ITVec e c)))

796 = VectorType (fromIntegral c) (IntegerType (fromIntegral $ nativeTyWidth e))

797−ftyToTy FChar = IntegerType 32

797+ftyToTy (FArith (ATInt ITChar)) = IntegerType 32

798ftyToTy FString = PointerType (IntegerType 8) (AddrSpace 0)

799ftyToTy FUnit = VoidType

800ftyToTy FPtr = PointerType (IntegerType 8) (AddrSpace 0)

@@ -804,6 +804,7 @@ ftyToTy FAny = valueType

804-- Only use when known not to be ITBig

805itWidth :: IntTy -> Word32

806itWidth ITNative = 32

807+itWidth ITChar = 32

807itWidth (ITFixed x) = fromIntegral $ nativeTyWidth x

808itWidth (ITFixed x) = fromIntegral $ nativeTyWidth x

808

809

809cgOp :: PrimFn -> [Operand] -> Codegen Operand

810cgOp :: PrimFn -> [Operand] -> Codegen Operand

src/IRTS/Compiler.hs+4−2

@@ -301,7 +301,8 @@ mkIty' _ = FAny

301

302mkIty "FFloat" = FArith ATFloat

303mkIty "FInt" = mkIntIty "ITNative"

304−mkIty "FChar" = mkIntIty "IT8"

304+mkIty "FChar" = mkIntIty "ITChar"

305+mkIty "FByte" = mkIntIty "IT8"

305mkIty "FShort" = mkIntIty "IT16"

306mkIty "FShort" = mkIntIty "IT16"

306mkIty "FLong" = mkIntIty "IT64"

307mkIty "FLong" = mkIntIty "IT64"

307mkIty "FString" = FString

308mkIty "FString" = FString

@@ -312,6 +313,7 @@ mkIty "FFunctionIO" = FFunctionIO

312mkIty x = error $ "Unknown type " ++ x

313mkIty x = error $ "Unknown type " ++ x

313

314

314mkIntIty "ITNative" = FArith (ATInt ITNative)

315mkIntIty "ITNative" = FArith (ATInt ITNative)

316+mkIntIty "ITChar" = FArith (ATInt ITChar)

315mkIntIty "IT8" = FArith (ATInt (ITFixed IT8))

317mkIntIty "IT8" = FArith (ATInt (ITFixed IT8))

316mkIntIty "IT16" = FArith (ATInt (ITFixed IT16))

318mkIntIty "IT16" = FArith (ATInt (ITFixed IT16))

317mkIntIty "IT32" = FArith (ATInt (ITFixed IT32))

319mkIntIty "IT32" = FArith (ATInt (ITFixed IT32))

@@ -371,7 +373,7 @@ instance ToIR SC where

371

373

372 matchableTy (AType (ATInt ITNative)) = True

374 matchableTy (AType (ATInt ITNative)) = True

373 matchableTy (AType (ATInt ITBig)) = True

375 matchableTy (AType (ATInt ITBig)) = True

374− matchableTy ChType = True

376+ matchableTy (AType (ATInt ITChar)) = True

375 matchableTy StrType = True

377 matchableTy StrType = True

376

378

377 matchableTy (AType (ATInt (ITFixed IT8))) = True

379 matchableTy (AType (ATInt (ITFixed IT8))) = True

src/IRTS/LParser.hs+14−3

@@ -97,7 +97,9 @@ optable = [[binary "*" (\x y -> LOp (LTimes (ATInt ITNative)) [x,y]) AssocLeft,

97 binary "*." (\x y -> LOp (LTimes ATFloat) [x,y]) AssocLeft,

98 binary "/." (\x y -> LOp (LSDiv ATFloat) [x,y]) AssocLeft,

99 binary "*:" (\x y -> LOp (LTimes (ATInt ITBig)) [x,y]) AssocLeft,

100− binary "/:" (\x y -> LOp (LSDiv (ATInt ITBig)) [x,y]) AssocLeft

100+ binary "/:" (\x y -> LOp (LSDiv (ATInt ITBig)) [x,y]) AssocLeft,

101+ binary "*," (\x y -> LOp (LTimes (ATInt ITChar)) [x, y]) AssocLeft,

102+ binary "/," (\x y -> LOp (LSDiv (ATInt ITChar)) [x, y]) AssocLeft

101 ],

103 ],

102 [

104 [

103 binary "+" (\x y -> LOp (LPlus (ATInt ITNative)) [x,y]) AssocLeft,

105 binary "+" (\x y -> LOp (LPlus (ATInt ITNative)) [x,y]) AssocLeft,

@@ -106,7 +108,9 @@ optable = [[binary "*" (\x y -> LOp (LTimes (ATInt ITNative)) [x,y]) AssocLeft,

106 binary "+." (\x y -> LOp (LPlus ATFloat) [x,y]) AssocLeft,

108 binary "+." (\x y -> LOp (LPlus ATFloat) [x,y]) AssocLeft,

107 binary "-." (\x y -> LOp (LMinus ATFloat) [x,y]) AssocLeft,

109 binary "-." (\x y -> LOp (LMinus ATFloat) [x,y]) AssocLeft,

108 binary "+:" (\x y -> LOp (LPlus (ATInt ITBig)) [x,y]) AssocLeft,

110 binary "+:" (\x y -> LOp (LPlus (ATInt ITBig)) [x,y]) AssocLeft,

109− binary "-:" (\x y -> LOp (LMinus (ATInt ITBig)) [x,y]) AssocLeft

111+ binary "-:" (\x y -> LOp (LMinus (ATInt ITBig)) [x,y]) AssocLeft,

112+ binary "+," (\x y -> LOp (LPlus (ATInt ITChar)) [x,y]) AssocLeft,

113+ binary "-," (\x y -> LOp (LMinus (ATInt ITChar)) [x,y]) AssocLeft

110 ],

114 ],

111 [

115 [

112 binary "==" (\x y -> LOp (LEq (ATInt ITNative)) [x, y]) AssocNone,

116 binary "==" (\x y -> LOp (LEq (ATInt ITNative)) [x, y]) AssocNone,

@@ -124,7 +128,13 @@ optable = [[binary "*" (\x y -> LOp (LTimes (ATInt ITNative)) [x,y]) AssocLeft,

124 binary "<:" (\x y -> LOp (LLt (ATInt ITBig)) [x, y]) AssocNone,

128 binary "<:" (\x y -> LOp (LLt (ATInt ITBig)) [x, y]) AssocNone,

125 binary ">:" (\x y -> LOp (LGt (ATInt ITBig)) [x, y]) AssocNone,

129 binary ">:" (\x y -> LOp (LGt (ATInt ITBig)) [x, y]) AssocNone,

126 binary "<=:" (\x y -> LOp (LLe (ATInt ITBig)) [x, y]) AssocNone,

130 binary "<=:" (\x y -> LOp (LLe (ATInt ITBig)) [x, y]) AssocNone,

127− binary ">=:" (\x y -> LOp (LGe (ATInt ITBig)) [x, y]) AssocNone

131+ binary ">=:" (\x y -> LOp (LGe (ATInt ITBig)) [x, y]) AssocNone,

132+

133+ binary "==," (\x y -> LOp (LEq (ATInt ITChar)) [x, y]) AssocNone,

134+ binary "<," (\x y -> LOp (LLt (ATInt ITChar)) [x, y]) AssocNone,

135+ binary ">," (\x y -> LOp (LGt (ATInt ITChar)) [x, y]) AssocNone,

136+ binary "<=," (\x y -> LOp (LLe (ATInt ITChar)) [x, y]) AssocNone,

137+ binary ">=," (\x y -> LOp (LGe (ATInt ITChar)) [x, y]) AssocNone

128 ]]

138 ]]

129

139

130binary name f assoc = Infix (do reservedOp name; return f) assoc

140binary name f assoc = Infix (do reservedOp name; return f) assoc

@@ -165,6 +175,7 @@ pLExp' = try (do lchar '%'; pCast)

165pLang = do reserved "C"; return LANG_C

175pLang = do reserved "C"; return LANG_C

166

176

167pType = do reserved "Int"; return (FArith (ATInt ITNative))

177pType = do reserved "Int"; return (FArith (ATInt ITNative))

178+ <|> do reserved "Char"; return (FArith (ATInt ITChar))

168 <|> do reserved "Float"; return (FArith ATFloat)

179 <|> do reserved "Float"; return (FArith ATFloat)

169 <|> do reserved "String"; return FString

180 <|> do reserved "String"; return FString

170 <|> do reserved "Unit"; return FUnit

181 <|> do reserved "Unit"; return FUnit

src/Idris/ElabTerm.hs+2−2

@@ -1065,7 +1065,7 @@ reifyTTConst :: Term -> ElabD Const

1065reifyTTConst (P _ n _) | n == reflm "IType" = return (AType (ATInt ITNative))

1066reifyTTConst (P _ n _) | n == reflm "BIType" = return (AType (ATInt ITBig))

1067reifyTTConst (P _ n _) | n == reflm "FlType" = return (AType ATFloat)

1068−reifyTTConst (P _ n _) | n == reflm "ChType" = return $ ChType

1068+reifyTTConst (P _ n _) | n == reflm "ChType" = return (AType (ATInt ITChar))

1069reifyTTConst (P _ n _) | n == reflm "StrType" = return $ StrType

1070reifyTTConst (P _ n _) | n == reflm "B8Type" = return (AType (ATInt (ITFixed IT8)))

1071reifyTTConst (P _ n _) | n == reflm "B16Type" = return (AType (ATInt (ITFixed IT16)))

@@ -1183,7 +1183,7 @@ reflectConstant c@(Str _) = reflCall "Str" [RConstant c]

1183reflectConstant (AType (ATInt ITNative)) = Var (reflm "IType")

1184reflectConstant (AType (ATInt ITBig)) = Var (reflm "BIType")

1185reflectConstant (AType ATFloat) = Var (reflm "FlType")

1186−reflectConstant (ChType) = Var (reflm "ChType")

1186+reflectConstant (AType (ATInt ITChar)) = Var (reflm "ChType")

1187reflectConstant (StrType) = Var (reflm "StrType")

1188reflectConstant c@(B8 _) = reflCall "B8" [RConstant c]

1189reflectConstant c@(B16 _) = reflCall "B16" [RConstant c]

src/Idris/IBC.hs+3−3

@@ -24,7 +24,7 @@ import Debug.Trace

24import Paths_idris

26ibcVersion :: Word8

27−ibcVersion = 30

27+ibcVersion = 31

29data IBCFile = IBCFile { ver :: Word8,

30 sourcefile :: FilePath,

@@ -387,7 +387,7 @@ instance Binary Const where

387 (AType (ATInt ITNative)) -> putWord8 9

388 (AType (ATInt ITBig)) -> putWord8 10

389 (AType ATFloat) -> putWord8 11

390− ChType -> putWord8 12

390+ (AType (ATInt ITChar)) -> putWord8 12

391 StrType -> putWord8 13

392 PtrType -> putWord8 14

393 Forgot -> putWord8 15

@@ -422,7 +422,7 @@ instance Binary Const where

422 9 -> return (AType (ATInt ITNative))

423 10 -> return (AType (ATInt ITBig))

424 11 -> return (AType ATFloat)

425− 12 -> return ChType

425+ 12 -> return (AType (ATInt ITChar))

426 13 -> return StrType

427 14 -> return PtrType

428 15 -> return Forgot

src/Idris/Parser.hs+1−1

@@ -1141,7 +1141,7 @@ pIdiom syn

1141pConstant :: IParser Const

1142pConstant = do reserved "Integer";return (AType (ATInt ITBig))

1143 <|> do reserved "Int"; return (AType (ATInt ITNative))

1144− <|> do reserved "Char"; return ChType

1144+ <|> do reserved "Char"; return (AType (ATInt ITChar))

1145 <|> do reserved "Float"; return (AType ATFloat)

1146 <|> do reserved "String"; return StrType

1147 <|> do reserved "Ptr"; return PtrType

src/Idris/Primitives.hs+21−19

@@ -11,6 +11,7 @@ import Core.Evaluate

11import Data.Bits

12import Data.Word

13import Data.Int

14+import Data.Char

14import qualified Data.Vector.Unboxed as V

15import qualified Data.Vector.Unboxed as V

16data Prim = Prim { p_name :: Name,

17data Prim = Prim { p_name :: Name,

@@ -32,18 +33,7 @@ partial = Partial NotCovering

32primitives :: [Prim]

33primitives :: [Prim]

33primitives =

34primitives =

34 -- operators

35 -- operators

35− [Prim (UN "prim__eqChar") (ty [ChType, ChType] (AType (ATInt ITNative))) 2 (bcBin (==))

36− (2, LEq (ATInt ITNative)) total,

37− Prim (UN "prim__ltChar") (ty [ChType, ChType] (AType (ATInt ITNative))) 2 (bcBin (<))

38− (2, LLt (ATInt ITNative)) total,

39− Prim (UN "prim__lteChar") (ty [ChType, ChType] (AType (ATInt ITNative))) 2 (bcBin (<=))

40− (2, LLe (ATInt ITNative)) total,

41− Prim (UN "prim__gtChar") (ty [ChType, ChType] (AType (ATInt ITNative))) 2 (bcBin (>))

42− (2, LGt (ATInt ITNative)) total,

43− Prim (UN "prim__gteChar") (ty [ChType, ChType] (AType (ATInt ITNative))) 2 (bcBin (>=))

44− (2, LGe (ATInt ITNative)) total,

45−

46− iCoerce (ITFixed IT8) (ITFixed IT16) "zext" zext LZExt,

36+ [iCoerce (ITFixed IT8) (ITFixed IT16) "zext" zext LZExt,

47 iCoerce (ITFixed IT8) (ITFixed IT32) "zext" zext LZExt,

37 iCoerce (ITFixed IT8) (ITFixed IT32) "zext" zext LZExt,

48 iCoerce (ITFixed IT8) (ITFixed IT64) "zext" zext LZExt,

38 iCoerce (ITFixed IT8) (ITFixed IT64) "zext" zext LZExt,

49 iCoerce (ITFixed IT8) ITBig "zext" zext LZExt,

39 iCoerce (ITFixed IT8) ITBig "zext" zext LZExt,

@@ -60,6 +50,7 @@ primitives =

60 iCoerce ITNative (ITFixed IT64) "zext" zext LZExt,

50 iCoerce ITNative (ITFixed IT64) "zext" zext LZExt,

61 iCoerce ITNative (ITFixed IT32) "zext" zext LZExt,

51 iCoerce ITNative (ITFixed IT32) "zext" zext LZExt,

62 iCoerce ITNative (ITFixed IT16) "zext" zext LZExt,

52 iCoerce ITNative (ITFixed IT16) "zext" zext LZExt,

53+ iCoerce ITChar ITBig "zext" zext LZExt,

64 iCoerce (ITFixed IT8) (ITFixed IT16) "sext" sext LSExt,

55 iCoerce (ITFixed IT8) (ITFixed IT16) "sext" sext LSExt,

65 iCoerce (ITFixed IT8) (ITFixed IT32) "sext" sext LSExt,

56 iCoerce (ITFixed IT8) (ITFixed IT32) "sext" sext LSExt,

@@ -79,6 +70,7 @@ primitives =

79 iCoerce ITNative (ITFixed IT64) "sext" sext LSExt,

70 iCoerce ITNative (ITFixed IT64) "sext" sext LSExt,

80 iCoerce ITNative (ITFixed IT32) "sext" sext LSExt,

71 iCoerce ITNative (ITFixed IT32) "sext" sext LSExt,

81 iCoerce ITNative (ITFixed IT16) "sext" sext LSExt,

72 iCoerce ITNative (ITFixed IT16) "sext" sext LSExt,

73+ iCoerce ITChar ITBig "sext" sext LSExt,

83 iCoerce (ITFixed IT16) (ITFixed IT8) "trunc" trunc LTrunc,

75 iCoerce (ITFixed IT16) (ITFixed IT8) "trunc" trunc LTrunc,

84 iCoerce (ITFixed IT32) (ITFixed IT8) "trunc" trunc LTrunc,

76 iCoerce (ITFixed IT32) (ITFixed IT8) "trunc" trunc LTrunc,

@@ -98,6 +90,7 @@ primitives =

98 iCoerce (ITFixed IT64) ITNative "trunc" trunc LTrunc,

90 iCoerce (ITFixed IT64) ITNative "trunc" trunc LTrunc,

99 iCoerce ITBig ITNative "trunc" trunc LTrunc,

91 iCoerce ITBig ITNative "trunc" trunc LTrunc,

100 iCoerce ITNative (ITFixed IT64) "trunc" trunc LTrunc,

92 iCoerce ITNative (ITFixed IT64) "trunc" trunc LTrunc,

93+ iCoerce ITBig ITChar "trunc" trunc LTrunc,

101

102 Prim (UN "prim__addFloat") (ty [(AType ATFloat), (AType ATFloat)] (AType ATFloat)) 2 (fBin (+))

95 Prim (UN "prim__addFloat") (ty [(AType ATFloat), (AType ATFloat)] (AType ATFloat)) 2 (fBin (+))

103 (2, LPlus ATFloat) total,

96 (2, LPlus ATFloat) total,

@@ -126,9 +119,9 @@ primitives =

126 Prim (UN "prim_lenString") (ty [StrType] (AType (ATInt ITNative))) 1 (p_strLen)

119 Prim (UN "prim_lenString") (ty [StrType] (AType (ATInt ITNative))) 1 (p_strLen)

127 (1, LStrLen) total,

120 (1, LStrLen) total,

128 -- Conversions

121 -- Conversions

129− Prim (UN "prim__charToInt") (ty [ChType] (AType (ATInt ITNative))) 1 (c_charToInt)

122+ Prim (UN "prim__charToInt") (ty [(AType (ATInt ITChar))] (AType (ATInt ITNative))) 1 (c_charToInt)

130− (1, LChInt ITNative) total,

123+ (1, LChInt ITChar) total,

131− Prim (UN "prim__intToChar") (ty [(AType (ATInt ITNative))] ChType) 1 (c_intToChar)

124+ Prim (UN "prim__intToChar") (ty [(AType (ATInt ITNative))] (AType (ATInt ITChar))) 1 (c_intToChar)

132 (1, LIntCh ITNative) total,

125 (1, LIntCh ITNative) total,

133 Prim (UN "prim__strToFloat") (ty [StrType] (AType ATFloat)) 1 (c_strToFloat)

126 Prim (UN "prim__strToFloat") (ty [StrType] (AType ATFloat)) 1 (c_strToFloat)

134 (1, LStrFloat) total,

127 (1, LStrFloat) total,

@@ -158,13 +151,13 @@ primitives =

158 Prim (UN "prim__floatCeil") (ty [(AType ATFloat)] (AType ATFloat)) 1 (p_floatCeil)

151 Prim (UN "prim__floatCeil") (ty [(AType ATFloat)] (AType ATFloat)) 1 (p_floatCeil)

159 (1, LFCeil) total,

152 (1, LFCeil) total,

160

153

161− Prim (UN "prim__strHead") (ty [StrType] ChType) 1 (p_strHead)

154+ Prim (UN "prim__strHead") (ty [StrType] (AType (ATInt ITChar))) 1 (p_strHead)

162 (1, LStrHead) partial,

155 (1, LStrHead) partial,

163 Prim (UN "prim__strTail") (ty [StrType] StrType) 1 (p_strTail)

156 Prim (UN "prim__strTail") (ty [StrType] StrType) 1 (p_strTail)

164 (1, LStrTail) partial,

157 (1, LStrTail) partial,

165− Prim (UN "prim__strCons") (ty [ChType, StrType] StrType) 2 (p_strCons)

158+ Prim (UN "prim__strCons") (ty [(AType (ATInt ITChar)), StrType] StrType) 2 (p_strCons)

166 (2, LStrCons) total,

159 (2, LStrCons) total,

167− Prim (UN "prim__strIndex") (ty [StrType, (AType (ATInt ITNative))] ChType) 2 (p_strIndex)

160+ Prim (UN "prim__strIndex") (ty [StrType, (AType (ATInt ITNative))] (AType (ATInt ITChar))) 2 (p_strIndex)

168 (2, LStrIndex) partial,

161 (2, LStrIndex) partial,

169 Prim (UN "prim__strRev") (ty [StrType] StrType) 1 (p_strRev)

162 Prim (UN "prim__strRev") (ty [StrType] StrType) 1 (p_strRev)

170 (1, LStrRev) total,

163 (1, LStrRev) total,

@@ -175,7 +168,7 @@ primitives =

175 -- Streams

168 -- Streams

176 Prim (UN "prim__stdin") (ty [] PtrType) 0 (p_cantreduce)

169 Prim (UN "prim__stdin") (ty [] PtrType) 0 (p_cantreduce)

177 (0, LStdIn) partial

170 (0, LStdIn) partial

178− ] ++ concatMap intOps [ITFixed IT8, ITFixed IT16, ITFixed IT32, ITFixed IT64, ITBig, ITNative]

171+ ] ++ concatMap intOps [ITFixed IT8, ITFixed IT16, ITFixed IT32, ITFixed IT64, ITBig, ITNative, ITChar]

179 ++ concatMap vecOps [ITVec IT8 16, ITVec IT16 8, ITVec IT32 4, ITVec IT64 2]

172 ++ concatMap vecOps [ITVec IT8 16, ITVec IT16 8, ITVec IT32 4, ITVec IT64 2]

180

173

181intOps :: IntTy -> [Prim]

174intOps :: IntTy -> [Prim]

@@ -276,6 +269,7 @@ intTyName :: IntTy -> String

276intTyName ITNative = "Int"

269intTyName ITNative = "Int"

277intTyName ITBig = "BigInt"

270intTyName ITBig = "BigInt"

278intTyName (ITFixed sized) = "B" ++ show (nativeTyWidth sized)

271intTyName (ITFixed sized) = "B" ++ show (nativeTyWidth sized)

272+intTyName (ITChar) = "Char"

279intTyName (ITVec ity count) = "B" ++ show (nativeTyWidth ity) ++ "x" ++ show count

273intTyName (ITVec ity count) = "B" ++ show (nativeTyWidth ity) ++ "x" ++ show count

280

274

281iCmp :: IntTy -> String -> Bool -> ([Const] -> Maybe Const) -> (IntTy -> PrimFn) -> Totality -> Prim

275iCmp :: IntTy -> String -> Bool -> ([Const] -> Maybe Const) -> (IntTy -> PrimFn) -> Totality -> Prim

@@ -333,6 +327,7 @@ bsrem (ITFixed IT32) [B32 x, B32 y]

333bsrem (ITFixed IT64) [B64 x, B64 y]

327bsrem (ITFixed IT64) [B64 x, B64 y]

334 = Just $ B64 (fromIntegral (fromIntegral x `rem` fromIntegral y :: Int64))

328 = Just $ B64 (fromIntegral (fromIntegral x `rem` fromIntegral y :: Int64))

335bsrem ITNative [I x, I y] = Just $ I (x `rem` y)

329bsrem ITNative [I x, I y] = Just $ I (x `rem` y)

330+bsrem ITChar [Ch x, Ch y] = Just $ Ch (chr $ (ord x) `rem` (ord y))

336bsrem (ITVec IT8 _) [B8V x, B8V y]

331bsrem (ITVec IT8 _) [B8V x, B8V y]

337 = Just . B8V $

332 = Just . B8V $

338 V.zipWith (\n d -> (fromIntegral (fromIntegral n `rem` fromIntegral d :: Int8))) x y

333 V.zipWith (\n d -> (fromIntegral (fromIntegral n `rem` fromIntegral d :: Int8))) x y

@@ -357,6 +352,7 @@ bsdiv (ITFixed IT32) [B32 x, B32 y]

357bsdiv (ITFixed IT64) [B64 x, B64 y]

352bsdiv (ITFixed IT64) [B64 x, B64 y]

358 = Just $ B64 (fromIntegral (fromIntegral x `div` fromIntegral y :: Int64))

353 = Just $ B64 (fromIntegral (fromIntegral x `div` fromIntegral y :: Int64))

359bsdiv ITNative [I x, I y] = Just $ I (x `div` y)

354bsdiv ITNative [I x, I y] = Just $ I (x `div` y)

355+bsdiv ITChar [Ch x, Ch y] = Just $ Ch (chr $ (ord x) `div` (ord y))

360bsdiv (ITVec IT8 _) [B8V x, B8V y]

356bsdiv (ITVec IT8 _) [B8V x, B8V y]

361 = Just . B8V $

357 = Just . B8V $

362 V.zipWith (\n d -> (fromIntegral (fromIntegral n `div` fromIntegral d :: Int8))) x y

358 V.zipWith (\n d -> (fromIntegral (fromIntegral n `div` fromIntegral d :: Int8))) x y

@@ -381,6 +377,7 @@ bashr (ITFixed IT32) [B32 x, B32 y]

381bashr (ITFixed IT64) [B64 x, B64 y]

377bashr (ITFixed IT64) [B64 x, B64 y]

382 = Just $ B64 (fromIntegral (fromIntegral x `shiftR` fromIntegral y :: Int64))

378 = Just $ B64 (fromIntegral (fromIntegral x `shiftR` fromIntegral y :: Int64))

383bashr ITNative [I x, I y] = Just $ I (x `shiftR` y)

379bashr ITNative [I x, I y] = Just $ I (x `shiftR` y)

380+bashr ITChar [Ch x, Ch y] = Just $ Ch (chr $ (ord x) `shiftR` (ord y))

384bashr (ITVec IT8 _) [B8V x, B8V y]

381bashr (ITVec IT8 _) [B8V x, B8V y]

385 = Just . B8V $

382 = Just . B8V $

386 V.zipWith (\n d -> (fromIntegral (fromIntegral n `shiftR` fromIntegral d :: Int8))) x y

383 V.zipWith (\n d -> (fromIntegral (fromIntegral n `shiftR` fromIntegral d :: Int8))) x y

@@ -402,6 +399,7 @@ bUn (ITFixed IT32) op [B32 x] = Just $ B32 (op x)

402bUn (ITFixed IT64) op [B64 x] = Just $ B64 (op x)

399bUn (ITFixed IT64) op [B64 x] = Just $ B64 (op x)

403bUn ITBig op [BI x] = Just $ BI (op x)

400bUn ITBig op [BI x] = Just $ BI (op x)

404bUn ITNative op [I x] = Just $ I (op x)

401bUn ITNative op [I x] = Just $ I (op x)

402+bUn ITChar op [Ch x] = Just $ Ch (chr $ op (ord x))

405bUn (ITVec IT8 _) op [B8V x] = Just . B8V $ V.map op x

403bUn (ITVec IT8 _) op [B8V x] = Just . B8V $ V.map op x

406bUn (ITVec IT16 _) op [B16V x] = Just . B16V $ V.map op x

404bUn (ITVec IT16 _) op [B16V x] = Just . B16V $ V.map op x

407bUn (ITVec IT32 _) op [B32V x] = Just . B32V $ V.map op x

405bUn (ITVec IT32 _) op [B32V x] = Just . B32V $ V.map op x

@@ -415,6 +413,7 @@ bitBin (ITFixed IT32) op [B32 x, B32 y] = Just $ B32 (op x y)

415bitBin (ITFixed IT64) op [B64 x, B64 y] = Just $ B64 (op x y)

413bitBin (ITFixed IT64) op [B64 x, B64 y] = Just $ B64 (op x y)

416bitBin ITBig op [BI x, BI y] = Just $ BI (op x y)

414bitBin ITBig op [BI x, BI y] = Just $ BI (op x y)

417bitBin ITNative op [I x, I y] = Just $ I (op x y)

415bitBin ITNative op [I x, I y] = Just $ I (op x y)

416+bitBin ITChar op [Ch x, Ch y] = Just $ Ch (chr $ op (ord x) (ord y))

418bitBin (ITVec IT8 _) op [B8V x, B8V y] = Just . B8V $ V.zipWith op x y

417bitBin (ITVec IT8 _) op [B8V x, B8V y] = Just . B8V $ V.zipWith op x y

419bitBin (ITVec IT16 _) op [B16V x, B16V y] = Just . B16V $ V.zipWith op x y

418bitBin (ITVec IT16 _) op [B16V x, B16V y] = Just . B16V $ V.zipWith op x y

420bitBin (ITVec IT32 _) op [B32V x, B32V y] = Just . B32V $ V.zipWith op x y

419bitBin (ITVec IT32 _) op [B32V x, B32V y] = Just . B32V $ V.zipWith op x y

@@ -428,6 +427,7 @@ bCmp (ITFixed IT32) op [B32 x, B32 y] = Just $ I (if (op x y) then 1 else 0)

428bCmp (ITFixed IT64) op [B64 x, B64 y] = Just $ I (if (op x y) then 1 else 0)

427bCmp (ITFixed IT64) op [B64 x, B64 y] = Just $ I (if (op x y) then 1 else 0)

429bCmp ITBig op [BI x, BI y] = Just $ I (if (op x y) then 1 else 0)

428bCmp ITBig op [BI x, BI y] = Just $ I (if (op x y) then 1 else 0)

430bCmp ITNative op [I x, I y] = Just $ I (if (op x y) then 1 else 0)

429bCmp ITNative op [I x, I y] = Just $ I (if (op x y) then 1 else 0)

430+bCmp ITChar op [Ch x, Ch y] = Just $ I (if (op x y) then 1 else 0)

431bCmp (ITVec IT8 _) op [B8V x, B8V y]

432 = Just . B8V . V.map (\b -> if b then -1 else 0) $ V.zipWith op x y

433bCmp (ITVec IT16 _) op [B16V x, B16V y]

@@ -445,6 +445,7 @@ toInt (ITFixed IT32) x = B32 (fromIntegral x)

445toInt (ITFixed IT64) x = B64 (fromIntegral x)

446toInt ITBig x = BI (fromIntegral x)

447toInt ITNative x = I (fromIntegral x)

448+toInt ITChar x = Ch (chr $ fromIntegral x)

448

449

449intToInt :: IntTy -> IntTy -> [Const] -> Maybe Const

450intToInt :: IntTy -> IntTy -> [Const] -> Maybe Const

450intToInt (ITFixed IT8) out [B8 x] = Just $ toInt out x

451intToInt (ITFixed IT8) out [B8 x] = Just $ toInt out x

@@ -453,6 +454,7 @@ intToInt (ITFixed IT32) out [B32 x] = Just $ toInt out x

453intToInt (ITFixed IT64) out [B64 x] = Just $ toInt out x

454intToInt (ITFixed IT64) out [B64 x] = Just $ toInt out x

454intToInt ITBig out [BI x] = Just $ toInt out x

455intToInt ITBig out [BI x] = Just $ toInt out x

455intToInt ITNative out [I x] = Just $ toInt out x

456intToInt ITNative out [I x] = Just $ toInt out x

457+intToInt ITChar out [Ch x] = Just $ toInt out (ord x)

456intToInt _ _ _ = Nothing

458intToInt _ _ _ = Nothing

457

459

458zext :: IntTy -> IntTy -> [Const] -> Maybe Const

460zext :: IntTy -> IntTy -> [Const] -> Maybe Const