pl/bc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

all: multistatement blocks; types: bugfix in multiplication of two integers

Browse Source
This commit is contained in:
Veit Heller
2017-05-19 17:07:33 +02:00
parent 1c46c60206
commit 42fff2f310
4 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BC/Types.hs
View File

@@ -5,10 +5,10 @@ import Data.List (intercalate)
data Value = BNum Number
| BBool Bool
| BSym String
| BIf [Value] [Value] (Maybe [Value])
| BWhile [Value] [Value]
| BIf [Value] [[Value]] (Maybe [[Value]])
| BWhile [Value] [[Value]]
| BDef Value [Value]
| BFun String [String] [Value]
| BFun String [String] [[Value]]
| BCall Value [[Value]]
| BErr String
instance Show Value where
@@ -63,7 +63,7 @@ instance Num Number where
(BFloat x) + (BFloat y) = BFloat $ x + y
(BInt x) + (BFloat y) = BFloat $ fromIntegral x + y
(BFloat x) + (BInt y) = BFloat $ x + fromIntegral y
(BInt x) * (BInt y) = BInt $ x + y
(BInt x) * (BInt y) = BInt $ x * y
(BFloat x) * (BFloat y) = BFloat $ x * y
(BInt x) * (BFloat y) = BFloat $ fromIntegral x * y
(BFloat x) * (BInt y) = BFloat $ x * fromIntegral y