Merge pull request #412 from petertseng/forth

forth: Expect a list rather than a string or Text

Author: rbasso

exercises/forth/HINTS.md

@@ -5,8 +5,8 @@ and implement the following functions:
 
 - `empty` returns an empty `ForthState`.
 - `evalText` evaluates an input Text, returning the new state.
-- `formatStack` returns the current stack as Text, with the element on top
-of the stack being the rightmost element in the output
+- `toList` returns the current stack as a list, with the element on top
+of the stack being the rightmost (last) element.
 
 You will find the type signatures already in place, but it is up to you
 to define the functions.

exercises/forth/src/Example.hs exercises/forth/examples/success-standard/Forth.hs

@@ -3,7 +3,7 @@ module Forth
   ( ForthError(..)
   , ForthState
   , evalText
-  , formatStack
+  , toList
   , empty
   ) where
 
@@ -147,5 +147,5 @@ stepWord (User xs) = mapCode (xs ++)
 evalText :: Text -> ForthState -> Either ForthError ForthState
 evalText = eval . parseText
 
-formatStack :: ForthState -> Text
-formatStack = T.pack . unwords . map show . reverse . forthStack
+toList :: ForthState -> [Int]
+toList = reverse . forthStack

exercises/forth/examples/success-standard/package.yaml

@@ -0,0 +1,19 @@
+name: forth
+
+dependencies:
+  - base
+  - text
+
+library:
+  exposed-modules: Forth
+  source-dirs: src
+  dependencies:
+    - containers
+
+tests:
+  test:
+    main: Tests.hs
+    source-dirs: test
+    dependencies:
+      - forth
+      - hspec

exercises/forth/package.yaml

@@ -10,7 +10,6 @@ library:
   dependencies:
   # - foo       # List here the packages you
   # - bar       # want to use in your solution.
-    - containers
 
 tests:
   test:

exercises/forth/src/Forth.hs

@@ -4,7 +4,7 @@ module Forth
   ( ForthError(..)
   , ForthState
   , evalText
-  , formatStack
+  , toList
   , empty
   ) where
 
@@ -23,5 +23,5 @@ empty = undefined
 evalText :: Text -> ForthState -> Either ForthError ForthState
 evalText = undefined
 
-formatStack :: ForthState -> Text
-formatStack = undefined
+toList :: ForthState -> [Int]
+toList = undefined

exercises/forth/test/Tests.hs

@@ -4,7 +4,7 @@ import Control.Monad     (foldM)
 import Test.Hspec        (Spec, describe, it, shouldBe)
 import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
 
-import Forth (ForthError(..), empty, evalText, formatStack)
+import Forth (ForthError(..), empty, evalText, toList)
 
 main :: IO ()
 main = hspecWith defaultConfig {configFastFail = True} specs
@@ -15,61 +15,61 @@ specs = describe "forth" $ do
     -- As of 2016-10-02, there was no reference file
     -- for the test cases in `exercism/x-common`.
 
-    let runTexts = fmap formatStack . foldM (flip evalText) empty
+    let runTexts = fmap toList . foldM (flip evalText) empty
 
     it "no input, no stack" $
-      formatStack empty `shouldBe` ""
+      toList empty `shouldBe` []
 
     it "numbers just get pushed onto the stack" $
-      runTexts ["1 2 3 4 5"] `shouldBe` Right "1 2 3 4 5"
+      runTexts ["1 2 3 4 5"] `shouldBe` Right [1, 2, 3, 4, 5]
 
     it "non-word characters are separators" $
-      runTexts ["1\NUL2\SOH3\n4\r5 6\t7"] `shouldBe` Right "1 2 3 4 5 6 7"
+      runTexts ["1\NUL2\SOH3\n4\r5 6\t7"] `shouldBe` Right [1, 2, 3, 4, 5, 6, 7]
 
     it "basic arithmetic" $ do
-      runTexts ["1 2 + 4 -"] `shouldBe` Right "-1"
-      runTexts ["2 4 * 3 /"] `shouldBe` Right "2"
+      runTexts ["1 2 + 4 -"] `shouldBe` Right [-1]
+      runTexts ["2 4 * 3 /"] `shouldBe` Right [2]
 
     it "division by zero" $
       runTexts ["4 2 2 - /"] `shouldBe` Left DivisionByZero
 
     it "dup" $ do
-      runTexts ["1 DUP"  ] `shouldBe` Right "1 1"
-      runTexts ["1 2 Dup"] `shouldBe` Right "1 2 2"
+      runTexts ["1 DUP"  ] `shouldBe` Right [1, 1]
+      runTexts ["1 2 Dup"] `shouldBe` Right [1, 2, 2]
       runTexts ["dup"    ] `shouldBe` Left StackUnderflow
 
     it "drop" $ do
-      runTexts ["1 drop"  ] `shouldBe` Right ""
-      runTexts ["1 2 drop"] `shouldBe` Right "1"
+      runTexts ["1 drop"  ] `shouldBe` Right []
+      runTexts ["1 2 drop"] `shouldBe` Right [1]
       runTexts ["drop"    ] `shouldBe` Left StackUnderflow
 
     it "swap" $ do
-      runTexts ["1 2 swap"  ] `shouldBe` Right "2 1"
-      runTexts ["1 2 3 swap"] `shouldBe` Right "1 3 2"
+      runTexts ["1 2 swap"  ] `shouldBe` Right [2, 1]
+      runTexts ["1 2 3 swap"] `shouldBe` Right [1, 3, 2]
       runTexts ["1 swap"    ] `shouldBe` Left StackUnderflow
       runTexts ["swap"      ] `shouldBe` Left StackUnderflow
 
     it "over" $ do
-      runTexts ["1 2 over"  ] `shouldBe` Right "1 2 1"
-      runTexts ["1 2 3 over"] `shouldBe` Right "1 2 3 2"
+      runTexts ["1 2 over"  ] `shouldBe` Right [1, 2, 1]
+      runTexts ["1 2 3 over"] `shouldBe` Right [1, 2, 3, 2]
       runTexts ["1 over"    ] `shouldBe` Left StackUnderflow
       runTexts ["over"      ] `shouldBe` Left StackUnderflow
 
     it "defining a new word" $
       runTexts [ ": dup-twice dup dup ;"
-               , "1 dup-twice"           ] `shouldBe` Right "1 1 1"
+               , "1 dup-twice"           ] `shouldBe` Right [1, 1, 1]
 
     it "redefining an existing word" $
       runTexts [ ": foo dup ;"
                , ": foo dup dup ;"
-               , "1 foo"           ] `shouldBe` Right "1 1 1"
+               , "1 foo"           ] `shouldBe` Right [1, 1, 1]
 
     it "redefining an existing built-in word" $
       runTexts [ ": swap dup ;"
-               , "1 swap"       ] `shouldBe` Right "1 1"
+               , "1 swap"       ] `shouldBe` Right [1, 1]
 
     it "defining words with odd characters" $
-      runTexts [": € 220371 ; €"] `shouldBe` Right "220371"
+      runTexts [": € 220371 ; €"] `shouldBe` Right [220371]
 
     it "defining a number" $
       runTexts [": 1 2 ;"] `shouldBe` Left InvalidWord