X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=advanced_topics%2Fcalculator_improvements.mdwn;fp=advanced_topics%2Fcalculator_improvements.mdwn;h=720d961a19f97fd7d9184affb373a5df70b4a41b;hp=b36f6287da195cf8aec228023c1b10be7c140688;hb=060198e29e2a13552ee64c1e489eea555c8b1cae;hpb=ee6e8e390ac5ffa57dc95531939222efda5d37ff

diff --git a/advanced_topics/calculator_improvements.mdwn b/advanced_topics/calculator_improvements.mdwn
index b36f6287..720d961a 100644
--- a/advanced_topics/calculator_improvements.mdwn
+++ b/advanced_topics/calculator_improvements.mdwn
@@ -465,12 +465,12 @@ Now we need to formulate the clauses for evaluating the new forms `Newref (...)`
 		(* we don't handle cases where t1 doesn't evaluate to a Mutcell *)
 		let (Mutcell index1, s') = eval t1 g s
 		(* note that s' may be different from s, if t1 itself contained any mutation operations *)
-		in let (new_value, s'') = eval t2 g s'
-		(* now we create a list which is just like s'' except it has new_value in index1 *)
+		in let (value2, s'') = eval t2 g s'
+		(* now we create a list which is just like s'' except it has value2 in index1 *)
 		in let rec replace_nth lst m =
 			match lst with
 			| [] -> failwith "list too short"
-			| x::xs when m = 0 -> new_value :: xs
+			| x::xs when m = 0 -> value2 :: xs
 			| x::xs -> x :: replace_nth xs (m - 1)
 		in let s''' = replace_nth s'' index1
 		(* we'll arbitrarily return Int 42 as the expressed_value of a Setref operation *)
@@ -538,12 +538,12 @@ Finally, here are the changed or added clauses to the evaluation function:
         (* we don't handle cases where t1 doesn't evaluate to a Pair *)
         let (Pair (index1, index2), s') = eval t1 g s
         (* note that s' may be different from s, if t1 itself contained any mutation operations *)
-        in let (new_value, s'') = eval t2 g s'
-        (* now we create a list which is just like s'' except it has new_value in index1 *)
+        in let (value2, s'') = eval t2 g s'
+        (* now we create a list which is just like s'' except it has value2 in index1 *)
         in let rec replace_nth lst m =
             match lst with
             | [] -> failwith "list too short"
-            | x::xs when m = 0 -> new_value :: xs
+            | x::xs when m = 0 -> value2 :: xs
             | x::xs -> x :: replace_nth xs (m - 1)
         in let s''' = replace_nth s'' index1
         in (Int 42, s''')