about summary refs log tree commit diff stats
path: root/nqueens.mu
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2018-06-17 00:05:38 -0700
committerKartik Agaram <vc@akkartik.com>2018-06-17 00:29:22 -0700
commitdd66068298b0a11f2a1f195376cba98e0c8570b5 (patch)
tree06696728fd65cdf38a2ac571943e130e9d60c333 /nqueens.mu
parentb89b822439f47a490a1b764e14a1ed1b73059cba (diff)
downloadmu-dd66068298b0a11f2a1f195376cba98e0c8570b5.tar.gz
4261 - start using literals for 'true' and 'false'
They uncovered one bug: in edit/003-shortcuts.mu
  <scroll-down> was returning 0 for an address in one place where I
  thought it was returning 0 for a boolean.

Now we've eliminated this bad interaction between tangling and punning
literals.
Diffstat (limited to 'nqueens.mu')
-rw-r--r--nqueens.mu8
1 files changed, 4 insertions, 4 deletions
diff --git a/nqueens.mu b/nqueens.mu
index 030ba28b..9e9f4425 100644
--- a/nqueens.mu
+++ b/nqueens.mu
@@ -66,11 +66,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
-    return-if file-match?, 1/conflict-found
+    return-if file-match?, true/conflict-found
     queens <- rest queens
     loop
   }
-  return 0/no-conflict-found
+  return false/no-conflict-found
 ]
 
 def conflicting-diagonal? curr:square, queens:&:list:square -> result:bool [
@@ -88,11 +88,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
-    return-if diagonal-match?, 1/conflict-found
+    return-if diagonal-match?, true/conflict-found
     queens <- rest queens
     loop
   }
-  return 0/no-conflict-found
+  return false/no-conflict-found
 ]
 
 def main [