Fix op

kzfm · Nov 23, 2012 · 1c8de55 · 1c8de55
1 parent 833b82b
commit 1c8de55
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/searchindex.js b/searchindex.js
diff --git a/sources/stackCalc.txt b/sources/stackCalc.txt
@@ -156,9 +156,8 @@ haskellでは破壊的な操作ができないので、スタックから要素
         let
             (i1, stack1) = pop stack
             (i2, stack2) = pop stack1
-            (_, stack3)  = push (i1+i2) stack2
         in
-          ((i1+i2), stack3)
+	    push (i1+i2) stack2
 
 これはうまく動きます
 
@@ -179,9 +178,8 @@ haskellでは破壊的な操作ができないので、スタックから要素
         let
             (i1, stack1) = pop stack
             (i2, stack2) = pop stack1
-            (_, stack3)  = push (op i1 i2) stack2
         in
-          ((op i1 i2), stack3)
+	    push (op i1 i2) stack2
 
     add = calc (+)
     sub = calc (-)

diff --git a/stackCalc.html b/stackCalc.html
@@ -179,9 +179,8 @@ <h2>加算を実装してみる<a class="headerlink" href="#id3" title="Permalin
     <span class="kr">let</span>
         <span class="p">(</span><span class="n">i1</span><span class="p">,</span> <span class="n">stack1</span><span class="p">)</span> <span class="ow">=</span> <span class="n">pop</span> <span class="n">stack</span>
         <span class="p">(</span><span class="n">i2</span><span class="p">,</span> <span class="n">stack2</span><span class="p">)</span> <span class="ow">=</span> <span class="n">pop</span> <span class="n">stack1</span>
-        <span class="p">(</span><span class="kr">_</span><span class="p">,</span> <span class="n">stack3</span><span class="p">)</span>  <span class="ow">=</span> <span class="n">push</span> <span class="p">(</span><span class="n">i1</span><span class="o">+</span><span class="n">i2</span><span class="p">)</span> <span class="n">stack2</span>
     <span class="kr">in</span>
-      <span class="p">((</span><span class="n">i1</span><span class="o">+</span><span class="n">i2</span><span class="p">),</span> <span class="n">stack3</span><span class="p">)</span>
+        <span class="n">push</span> <span class="p">(</span><span class="n">i1</span><span class="o">+</span><span class="n">i2</span><span class="p">)</span> <span class="n">stack2</span>
 </pre></div>
 </div>
 <p>これはうまく動きます</p>
@@ -198,9 +197,8 @@ <h2>加算を実装してみる<a class="headerlink" href="#id3" title="Permalin
     <span class="kr">let</span>
         <span class="p">(</span><span class="n">i1</span><span class="p">,</span> <span class="n">stack1</span><span class="p">)</span> <span class="ow">=</span> <span class="n">pop</span> <span class="n">stack</span>
         <span class="p">(</span><span class="n">i2</span><span class="p">,</span> <span class="n">stack2</span><span class="p">)</span> <span class="ow">=</span> <span class="n">pop</span> <span class="n">stack1</span>
-        <span class="p">(</span><span class="kr">_</span><span class="p">,</span> <span class="n">stack3</span><span class="p">)</span>  <span class="ow">=</span> <span class="n">push</span> <span class="p">(</span><span class="n">op</span> <span class="n">i1</span> <span class="n">i2</span><span class="p">)</span> <span class="n">stack2</span>
     <span class="kr">in</span>
-      <span class="p">((</span><span class="n">op</span> <span class="n">i1</span> <span class="n">i2</span><span class="p">),</span> <span class="n">stack3</span><span class="p">)</span>
+        <span class="n">push</span> <span class="p">(</span><span class="n">op</span> <span class="n">i1</span> <span class="n">i2</span><span class="p">)</span> <span class="n">stack2</span>
 
 <span class="nf">add</span> <span class="ow">=</span> <span class="n">calc</span> <span class="p">(</span><span class="o">+</span><span class="p">)</span>
 <span class="nf">sub</span> <span class="ow">=</span> <span class="n">calc</span> <span class="p">(</span><span class="o">-</span><span class="p">)</span>

diff --git a/stackCalc.rst b/stackCalc.rst
@@ -156,9 +156,8 @@ haskellでは破壊的な操作ができないので、スタックから要素
         let
             (i1, stack1) = pop stack
             (i2, stack2) = pop stack1
-            (_, stack3)  = push (i1+i2) stack2
         in
-          ((i1+i2), stack3)
+	    push (i1+i2) stack2
 
 これはうまく動きます
 
@@ -179,9 +178,8 @@ haskellでは破壊的な操作ができないので、スタックから要素
         let
             (i1, stack1) = pop stack
             (i2, stack2) = pop stack1
-            (_, stack3)  = push (op i1 i2) stack2
         in
-          ((op i1 i2), stack3)
+	    push (op i1 i2) stack2
     
     add = calc (+)
     sub = calc (-)