6.5 working

diff --git a/week3/camil/.gitignore b/week3/camil/.gitignore
index 3d25840..341d5f8 100644 (file)
--- a/week3/camil/.gitignore
+++ b/week3/camil/.gitignore
@@ -1 +1,2 @@
 /Clean System Files/
+StdStack

diff --git a/week3/camil/StdStack.icl b/week3/camil/StdStack.icl
index 25ff265..dd51a94 100644 (file)
--- a/week3/camil/StdStack.icl
+++ b/week3/camil/StdStack.icl
@@ -1,6 +1,7 @@
 implementation module StdStack\r
 \r
 import StdEnv\r
+import StdList\r
 \r
 :: Stack a :== [a]\r
 \r
@@ -8,9 +9,34 @@ newStack :: (Stack a)
 newStack = []\r
 \r
 push :: a (Stack a) -> (Stack a)\r
-push a s = s ++ [a]\r
+push a s = [a] ++ s\r
 \r
-pop\r
+pop :: (Stack a) -> (Stack a)\r
+pop [a:s] = s\r
+pop [] = []\r
+\r
+popn :: Int (Stack a) -> (Stack a)\r
+popn 0 s = s\r
+popn n s = popn (n-1) (pop s)\r
+\r
+pushes :: [a] (Stack a) -> (Stack a)\r
+pushes [] s = s\r
+pushes a s = pushes (tl a) (push (hd a) s)\r
+\r
+top :: (Stack a) -> a\r
+top [] = abort "`top s` with s = []"\r
+top s = hd s\r
+\r
+topn :: Int (Stack a) -> [a]\r
+topn n s\r
+       | n > length s = abort "`topn n s` with n > length s"\r
+       | otherwise = take n s\r
+\r
+count :: (Stack a) -> Int\r
+count s = length s\r
+\r
+elements :: (Stack a) -> [a]\r
+elements s = s\r
 \r
 Start  = ( "s0 = newStack = ",        s0,'\n'\r
          , "s1 = push 1 s0 = ",       s1,'\n'\r
@@ -20,6 +46,10 @@ Start  = ( "s0 = newStack = ",        s0,'\n'
          , "s5 = top s4 = ",          s5,'\n'\r
          , "s6 = topn 3 s2 = ",       s6,'\n'\r
          , "s7 = elements s2 = ",     s7,'\n'\r
+//      , "s8 = push 10 s1 = ",      s8,'\n'\r
+//      , "s9 = popn 10 s8 = ",      s9,'\n'\r
+//      , "sa = topn 5 s4 = ",       sa,'\n'\r
+//      , "sb = top s0 = ",          sb,'\n'\r
          )\r
 where\r
        s0 = newStack\r
@@ -30,3 +60,7 @@ where
        s5 = top s4\r
        s6 = topn 3 s2\r
        s7 = elements s2\r
+//     s8 = push 10 s1\r
+//     s9 = popn 10 s8\r
+//     sa = topn 5 s4\r
+//     sb = top s0\r