From 34fb07223b735164cb66999aa039dcb754ca5628 Mon Sep 17 00:00:00 2001
From: osmarks <osmarks@protonmail.com>
Date: Thu, 17 Aug 2017 19:26:29 +0100
Subject: [PATCH] Improve styling, fix stack-sharing bug

---
 src/Main.elm | 16 ++++++++++++----
 style.css    | 20 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/Main.elm b/src/Main.elm
index 976dd13..088d03e 100644
--- a/src/Main.elm
+++ b/src/Main.elm
@@ -37,7 +37,9 @@ error err =
 
 stackItem : Float -> Html a
 stackItem n =
-    div [class "item"] [text <| toString n]
+    let asString = toString n
+        minWidth = toString (String.length asString) ++ "em"
+    in div [class "item", style [("min-width", minWidth)]] [text asString]
 
 view : Model -> Html Msg
 view model =
@@ -48,8 +50,8 @@ view model =
                 |> List.map stackItem
             Err errors ->
                 List.map error errors
-    in div [] (
-        [ input [onInput ExpressionTyped, value model.expression] []
+    in div [class "rpncalc"] (
+        [ input [onInput ExpressionTyped, value model.expression, class "exprinput"] []
         ] ++ calcOutput
     )
 
@@ -63,11 +65,17 @@ binOp f s =
         finalStack = Maybe.map (\r -> Stack.push r s2) result
     in Result.fromMaybe "Stack underflow" finalStack
 
+prepend : Stack a -> Stack a -> Stack a
+prepend from to =
+    Stack.toList from
+    |> List.foldr Stack.push to
+
 evalRec : Expr -> Stack Float -> Result String (Stack Float)
 evalRec expr s =
     case expr of
         Group es ->
-            List.foldl (\expr s -> Result.andThen (evalRec expr) s) (Ok s) es
+            List.foldl (\expr s -> Result.andThen (evalRec expr) s) (Ok Stack.initialise) es
+            |> Result.map (\newStack -> prepend newStack s) -- prepend new stack's contents to old stack
         Num n ->
             Ok (Stack.push n s)
         Op o ->
diff --git a/style.css b/style.css
index e69de29..49f61d1 100644
--- a/style.css
+++ b/style.css
@@ -0,0 +1,20 @@
+.rpncalc {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+}
+
+.item {
+    width: 10vw;
+    height: 10vw;
+    border: 1px solid black;
+    margin-bottom: -1px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.exprinput {
+    margin-bottom: 1vh;
+}
\ No newline at end of file