From 1ead356219bb2eb59487d1012f837bd07ec336f5 Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Tue, 8 Mar 2016 01:30:14 -0800
Subject: 2735 - define recipes using 'def'

I'm dropping all mention of 'recipe' terminology from the Readme. That
way I hope to avoid further bike-shedding discussions while I very
slowly decide on the right terminology with my students.

I could be smarter in my error messages and use 'recipe' when code uses
it and 'function' otherwise. But what about other words like ingredient?
It would all add complexity that I'm not yet sure is worthwhile. But I
do want separate experiences for veteran programmers reading about Mu on
github and for people learning programming using Mu.
---
 073list.mu | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to '073list.mu')

diff --git a/073list.mu b/073list.mu
index 1dedf573..856c5e9c 100644
--- a/073list.mu
+++ b/073list.mu
@@ -8,7 +8,7 @@ container list:_elem [
   next:address:shared:list:_elem
 ]
 
-recipe push x:_elem, in:address:shared:list:_elem -> in:address:shared:list:_elem [
+def push x:_elem, in:address:shared:list:_elem -> in:address:shared:list:_elem [
   local-scope
   load-ingredients
   result:address:shared:list:_elem <- new {(list _elem): type}
@@ -16,16 +16,16 @@ recipe push x:_elem, in:address:shared:list:_elem -> in:address:shared:list:_ele
   *val <- copy x
   next:address:address:shared:list:_elem <- get-address *result, next:offset
   *next <- copy in
-  reply result  # needed explicitly because we need to replace 'in' with 'result'
+  return result  # needed explicitly because we need to replace 'in' with 'result'
 ]
 
-recipe first in:address:shared:list:_elem -> result:_elem [
+def first in:address:shared:list:_elem -> result:_elem [
   local-scope
   load-ingredients
   result <- get *in, value:offset
 ]
 
-recipe rest in:address:shared:list:_elem -> result:address:shared:list:_elem/contained-in:in [
+def rest in:address:shared:list:_elem -> result:address:shared:list:_elem/contained-in:in [
   local-scope
   load-ingredients
   result <- get *in, next:offset
@@ -51,7 +51,7 @@ scenario list-handling [
   ]
 ]
 
-recipe to-text in:address:shared:list:_elem -> result:address:shared:array:character [
+def to-text in:address:shared:list:_elem -> result:address:shared:array:character [
   local-scope
   load-ingredients
   buf:address:shared:buffer <- new-buffer 80
@@ -60,7 +60,7 @@ recipe to-text in:address:shared:list:_elem -> result:address:shared:array:chara
 ]
 
 # variant of 'to-text' which stops printing after a few elements (and so is robust to cycles)
-recipe to-text-line in:address:shared:list:_elem -> result:address:shared:array:character [
+def to-text-line in:address:shared:list:_elem -> result:address:shared:array:character [
   local-scope
   load-ingredients
   buf:address:shared:buffer <- new-buffer 80
@@ -68,13 +68,13 @@ recipe to-text-line in:address:shared:list:_elem -> result:address:shared:array:
   result <- buffer-to-array buf
 ]
 
-recipe to-buffer in:address:shared:list:_elem, buf:address:shared:buffer -> buf:address:shared:buffer [
+def to-buffer in:address:shared:list:_elem, buf:address:shared:buffer -> buf:address:shared:buffer [
   local-scope
   load-ingredients
   {
     break-if in
     buf <- append buf, 48/0
-    reply
+    return
   }
   # append in.value to buf
   val:_elem <- get *in, value:offset
@@ -82,7 +82,7 @@ recipe to-buffer in:address:shared:list:_elem, buf:address:shared:buffer -> buf:
   # now prepare next
   next:address:shared:list:_elem <- rest in
   nextn:number <- copy next
-  reply-unless next
+  return-unless next
   space:character <- copy 32/space
   buf <- append buf, space:character
   s:address:shared:array:character <- new [-> ]
@@ -94,14 +94,14 @@ recipe to-buffer in:address:shared:list:_elem, buf:address:shared:buffer -> buf:
     break-if optional-ingredient-found?
     # unlimited recursion
     buf <- to-buffer next, buf
-    reply
+    return
   }
   {
     break-unless remaining
     # limited recursion
     remaining <- subtract remaining, 1
     buf <- to-buffer next, buf, remaining
-    reply
+    return
   }
   # past recursion depth; insert ellipses and stop
   s:address:shared:array:character <- new [...]
-- 
cgit 1.4.1-2-gfad0