428 - cleanup odds and ends

1 files changed, 13 insertions, 13 deletions

diff --git a/tangle.mu b/tangle.mu
index 0a7bc05e..7580c328 100644
--- a/tangle.mu
+++ b/tangle.mu
@@ -4,8 +4,8 @@
 ; possibilities.
 
 (function factorial [
-  ((default-scope scope-address) <- new (scope literal) (30 literal))
-  ((n integer) <- next-input)
+  (default-scope:scope-address <- new scope:literal 30:literal)
+  (n:integer <- next-input)
   { begin
     base-case
   }
@@ -14,22 +14,22 @@
 
 (after base-case [
   ; if n=0 return 1
-  ((zero? boolean) <- equal (n integer) (0 literal))
-  (break-unless (zero? boolean))
-  (reply (1 literal))
+  (zero?:boolean <- equal n:integer 0:literal)
+  (break-unless zero?:boolean)
+  (reply 1:literal)
 ])
 
 (after recursive-case [
   ; return n*factorial(n-1)
-  ((x integer) <- subtract (n integer) (1 literal))
-  ((subresult integer) <- factorial (x integer))
-  ((result integer) <- multiply (subresult integer) (n integer))
-  (reply (result integer))
+  (x:integer <- subtract n:integer 1:literal)
+  (subresult:integer <- factorial x:integer)
+  (result:integer <- multiply subresult:integer n:integer)
+  (reply result:integer)
 ])
 
 (function main [
-  ((1 integer) <- factorial (5 literal))
-  (print-primitive ("result: " literal))
-  (print-primitive (1 integer))
-  (print-primitive ("\n" literal))
+  (1:integer <- factorial 5:literal)
+  (print-primitive (("result: " literal)))
+  (print-primitive 1:integer)
+  (print-primitive (("\n" literal)))
 ])