From f116818c7c6e98a5d9bfa7058096b42df85d8e1c Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Thu, 10 Nov 2016 10:24:14 -0800 Subject: 3656 Periodic cleanup to replace 'reply' with 'return' everywhere in the repo. I use 'reply' for students to help reinforce the metaphor of function calls as being like messages through a pipe. But that causes 'reply' to get into my muscle memory when writing Mu code for myself, and I worry that that makes Mu seem unnecessarily alien to anybody reading on Github. Perhaps I should just give it up? I'll try using 'return' with my next student. --- nqueens.mu | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'nqueens.mu') diff --git a/nqueens.mu b/nqueens.mu index 083a9019..eb4f8493 100644 --- a/nqueens.mu +++ b/nqueens.mu @@ -49,9 +49,9 @@ def conflict? curr:square, queens:&:list:square -> result:bool [ local-scope load-ingredients result1:bool <- conflicting-file? curr, queens - reply-if result1, result1 + return-if result1, result1 result2:bool <- conflicting-diagonal? curr, queens - reply result2 + return result2 ] def conflicting-file? curr:square, queens:&:list:square -> result:bool [ @@ -63,11 +63,11 @@ def conflicting-file? curr:square, queens:&:list:square -> result:bool [ q:square <- first queens qfile:num <- get q, file:offset file-match?:bool <- equal curr-file, qfile - reply-if file-match?, 1/conflict-found + return-if file-match?, 1/conflict-found queens <- rest queens loop } - reply 0/no-conflict-found + return 0/no-conflict-found ] def conflicting-diagonal? curr:square, queens:&:list:square -> result:bool [ @@ -85,11 +85,11 @@ def conflicting-diagonal? curr:square, queens:&:list:square -> result:bool [ rank-delta <- abs rank-delta file-delta <- abs file-delta diagonal-match?:bool <- equal rank-delta, file-delta - reply-if diagonal-match?, 1/conflict-found + return-if diagonal-match?, 1/conflict-found queens <- rest queens loop } - reply 0/no-conflict-found + return 0/no-conflict-found ] def main [ -- cgit 1.4.1-2-gfad0