Merge remote-tracking branch 'origin/master' into testfix/chez010-macos

This commit is contained in:
Ilya Rezvov 2020-01-09 11:44:51 -08:00
commit 56d24e34d4
6 changed files with 9 additions and 3 deletions

View File

@ -25,7 +25,7 @@ findChez
case env of case env of
Just n => pure n Just n => pure n
Nothing => do e <- firstExists [p ++ x | p <- ["/usr/bin/", "/usr/local/bin/"], Nothing => do e <- firstExists [p ++ x | p <- ["/usr/bin/", "/usr/local/bin/"],
x <- ["scheme", "chez", "chezscheme9.5"]] x <- ["chez", "chezscheme9.5", "scheme"]]
pure $ fromMaybe "/usr/bin/env -S scheme" e pure $ fromMaybe "/usr/bin/env -S scheme" e
-- Given the chez compiler directives, return a list of pairs of: -- Given the chez compiler directives, return a list of pairs of:

View File

@ -113,7 +113,7 @@ sub : Constant -> Constant -> Maybe Constant
sub (BI x) (BI y) = pure $ BI (x - y) sub (BI x) (BI y) = pure $ BI (x - y)
sub (I x) (I y) = pure $ I (x - y) sub (I x) (I y) = pure $ I (x - y)
sub (Ch x) (Ch y) = pure $ Ch (cast (cast {to=Int} x - cast y)) sub (Ch x) (Ch y) = pure $ Ch (cast (cast {to=Int} x - cast y))
sub (Db x) (Db y) = pure $ Db (x + y) sub (Db x) (Db y) = pure $ Db (x - y)
sub _ _ = Nothing sub _ _ = Nothing
mul : Constant -> Constant -> Maybe Constant mul : Constant -> Constant -> Maybe Constant

View File

@ -40,6 +40,7 @@ idrisTests
"interface005", "interface006", "interface007", "interface008", "interface005", "interface006", "interface007", "interface008",
"interface009", "interface010", "interface011", "interface012", "interface009", "interface010", "interface011", "interface012",
"interface013", "interface014", "interface013", "interface014",
"interpreter001",
"lazy001", "lazy001",
"linear001", "linear002", "linear003", "linear004", "linear005", "linear001", "linear002", "linear003", "linear004", "linear005",
"linear006", "linear007", "linear006", "linear007",
@ -125,7 +126,7 @@ findChez
case env of case env of
Just n => pure $ Just n Just n => pure $ Just n
Nothing => firstExists [p ++ x | p <- ["/usr/bin/", "/usr/local/bin/"], Nothing => firstExists [p ++ x | p <- ["/usr/bin/", "/usr/local/bin/"],
x <- ["scheme", "chez", "chezscheme9.5"]] x <- ["chez", "chezscheme9.5", "scheme"]]
runChezTests : String -> List String -> IO (List Bool) runChezTests : String -> List String -> IO (List Bool)
runChezTests prog tests runChezTests prog tests

View File

@ -0,0 +1,2 @@
Main> 1.5
Main> Bye for now!

View File

@ -0,0 +1,2 @@
3.5 - 2.0
:q

View File

@ -0,0 +1 @@
$1 --no-banner < input