d1ad414 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

Merge pull request #2284 from Melvar/leftover-float

d1ad414David Christiansen11 years ago

src/Idris/Core/TT.hs+1−1

compare with master

@@ -1388,7 +1388,7 @@ instance Show Const where

1388 show (B16 x) = show x

1388 show (B16 x) = show x

1389 show (B32 x) = show x

1389 show (B32 x) = show x

1390 show (B64 x) = show x

1390 show (B64 x) = show x

1391− show (AType ATFloat) = "Float"

1391+ show (AType ATFloat) = "Double"

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

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

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

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

1394 show (AType (ATInt ITChar)) = "Char"

1394 show (AType (ATInt ITChar)) = "Char"

src/Idris/IdeMode.hs+1−1

@@ -107,7 +107,7 @@ maybeProps ((n, Nothing):ps) = maybeProps ps

107constTy :: Const -> String

107constTy :: Const -> String

108constTy (I _) = "Int"

108constTy (I _) = "Int"

109constTy (BI _) = "Integer"

109constTy (BI _) = "Integer"

110−constTy (Fl _) = "Float"

110+constTy (Fl _) = "Double"

111constTy (Ch _) = "Char"

111constTy (Ch _) = "Char"

112constTy (Str _) = "String"

112constTy (Str _) = "String"

113constTy (B8 _) = "Bits8"

113constTy (B8 _) = "Bits8"

src/Idris/ParseExpr.hs+1−7

@@ -1200,18 +1200,12 @@ Constant ::=

1200 'Integer'

1200 'Integer'

1201 | 'Int'

1201 | 'Int'

1202 | 'Char'

1202 | 'Char'

1203− | 'Float'

1203+ | 'Double'

1204 | 'String'

1204 | 'String'

1205− | 'Ptr'

1206− | 'ManagedPtr'

1207 | 'Bits8'

1205 | 'Bits8'

1208 | 'Bits16'

1206 | 'Bits16'

1209 | 'Bits32'

1207 | 'Bits32'

1210 | 'Bits64'

1208 | 'Bits64'

1211− | 'Bits8x16'

1212− | 'Bits16x8'

1213− | 'Bits32x4'

1214− | 'Bits64x2'

1215 | Float_t

1209 | Float_t

1216 | Natural_t

1210 | Natural_t

1217 | VerbatimString_t

1211 | VerbatimString_t