From 0e6f76c13d8ded676ea792020f74e1fae00eae84 Mon Sep 17 00:00:00 2001
From: Alex Chapman <chapman.alex@gmail.com>
Date: Mon, 20 Apr 2009 14:15:38 +1000
Subject: [PATCH] Using literals vocab for defining computed constants

---
 extra/jamshred/tunnel/tunnel.factor |   6 +-
 extra/morse/morse.factor            | 124 ++++++++++++++--------------
 2 files changed, 62 insertions(+), 68 deletions(-)

diff --git a/extra/jamshred/tunnel/tunnel.factor b/extra/jamshred/tunnel/tunnel.factor
index d951a37f0c..6171c3053b 100644
--- a/extra/jamshred/tunnel/tunnel.factor
+++ b/extra/jamshred/tunnel/tunnel.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007, 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays colors combinators kernel locals math math.constants math.matrices math.order math.ranges math.vectors math.quadratic random sequences specialized-arrays.float vectors jamshred.oint ;
+USING: accessors arrays colors combinators kernel literals locals math math.constants math.matrices math.order math.ranges math.vectors math.quadratic random sequences specialized-arrays.float vectors jamshred.oint ;
 IN: jamshred.tunnel
 
 CONSTANT: n-segments 5000
@@ -15,9 +15,7 @@ C: <segment> segment
     { 100 100 100 } [ random 100 / >float ] map first3 1.0 <rgba> ;
 
 CONSTANT: tunnel-segment-distance 0.4
-USE: words.constant
-DEFER: random-rotation-angle
-\ random-rotation-angle pi 20 / define-constant
+CONSTANT: random-rotation-angle $[ pi 20 / ]
 
 : random-segment ( previous-segment -- segment )
     clone dup random-rotation-angle random-turn
diff --git a/extra/morse/morse.factor b/extra/morse/morse.factor
index 49e6ae39f5..ef4b9d4b88 100644
--- a/extra/morse/morse.factor
+++ b/extra/morse/morse.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2007, 2008, 2009 Alex Chapman, 2009 Diego Martinelli
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors ascii assocs biassocs combinators hashtables kernel lists math
-namespaces make multiline openal parser sequences splitting strings synth synth.buffers ;
+USING: accessors ascii assocs biassocs combinators hashtables kernel lists literals math namespaces make multiline openal parser sequences splitting strings synth synth.buffers ;
 IN: morse
 
 <PRIVATE
@@ -14,68 +13,65 @@ CONSTANT: unknown-char CHAR: ?
 
 PRIVATE>
 
-DEFER: morse-code-table
-
-H{
-    { CHAR: a ".-"    }
-    { CHAR: b "-..."  }
-    { CHAR: c "-.-."  }
-    { CHAR: d "-.."   }
-    { CHAR: e "."     }
-    { CHAR: f "..-."  }
-    { CHAR: g "--."   }
-    { CHAR: h "...."  }
-    { CHAR: i ".."    }
-    { CHAR: j ".---"  }
-    { CHAR: k "-.-"   }
-    { CHAR: l ".-.."  }
-    { CHAR: m "--"    }
-    { CHAR: n "-."    }
-    { CHAR: o "---"   }
-    { CHAR: p ".--."  }
-    { CHAR: q "--.-"  }
-    { CHAR: r ".-."   }
-    { CHAR: s "..."   }
-    { CHAR: t "-"     }
-    { CHAR: u "..-"   }
-    { CHAR: v "...-"  }
-    { CHAR: w ".--"   }
-    { CHAR: x "-..-"  }
-    { CHAR: y "-.--"  }
-    { CHAR: z "--.."  }
-    { CHAR: 1 ".----" }
-    { CHAR: 2 "..---" }
-    { CHAR: 3 "...--" }
-    { CHAR: 4 "....-" }
-    { CHAR: 5 "....." }
-    { CHAR: 6 "-...." }
-    { CHAR: 7 "--..." }
-    { CHAR: 8 "---.." }
-    { CHAR: 9 "----." }
-    { CHAR: 0 "-----" }
-    { CHAR: . ".-.-.-" }
-    { CHAR: , "--..--" }
-    { CHAR: ? "..--.." }
-    { CHAR: ' ".----." }
-    { CHAR: ! "-.-.--" }
-    { CHAR: / "-..-."  }
-    { CHAR: ( "-.--."  }
-    { CHAR: ) "-.--.-" }
-    { CHAR: & ".-..."  }
-    { CHAR: : "---..." }
-    { CHAR: ; "-.-.-." }
-    { CHAR: = "-...- " }
-    { CHAR: + ".-.-."  }
-    { CHAR: - "-....-" }
-    { CHAR: _ "..--.-" }
-    { CHAR: " ".-..-." }
-    { CHAR: $ "...-..-" }
-    { CHAR: @ ".--.-." }
-    { CHAR: \s "/" }
-} >biassoc \ morse-code-table set-global
-
-: morse-code-table ( -- biassoc )
-    \ morse-code-table get-global ;
+CONSTANT: morse-code-table $[
+    H{
+        { CHAR: a ".-"    }
+        { CHAR: b "-..."  }
+        { CHAR: c "-.-."  }
+        { CHAR: d "-.."   }
+        { CHAR: e "."     }
+        { CHAR: f "..-."  }
+        { CHAR: g "--."   }
+        { CHAR: h "...."  }
+        { CHAR: i ".."    }
+        { CHAR: j ".---"  }
+        { CHAR: k "-.-"   }
+        { CHAR: l ".-.."  }
+        { CHAR: m "--"    }
+        { CHAR: n "-."    }
+        { CHAR: o "---"   }
+        { CHAR: p ".--."  }
+        { CHAR: q "--.-"  }
+        { CHAR: r ".-."   }
+        { CHAR: s "..."   }
+        { CHAR: t "-"     }
+        { CHAR: u "..-"   }
+        { CHAR: v "...-"  }
+        { CHAR: w ".--"   }
+        { CHAR: x "-..-"  }
+        { CHAR: y "-.--"  }
+        { CHAR: z "--.."  }
+        { CHAR: 1 ".----" }
+        { CHAR: 2 "..---" }
+        { CHAR: 3 "...--" }
+        { CHAR: 4 "....-" }
+        { CHAR: 5 "....." }
+        { CHAR: 6 "-...." }
+        { CHAR: 7 "--..." }
+        { CHAR: 8 "---.." }
+        { CHAR: 9 "----." }
+        { CHAR: 0 "-----" }
+        { CHAR: . ".-.-.-" }
+        { CHAR: , "--..--" }
+        { CHAR: ? "..--.." }
+        { CHAR: ' ".----." }
+        { CHAR: ! "-.-.--" }
+        { CHAR: / "-..-."  }
+        { CHAR: ( "-.--."  }
+        { CHAR: ) "-.--.-" }
+        { CHAR: & ".-..."  }
+        { CHAR: : "---..." }
+        { CHAR: ; "-.-.-." }
+        { CHAR: = "-...- " }
+        { CHAR: + ".-.-."  }
+        { CHAR: - "-....-" }
+        { CHAR: _ "..--.-" }
+        { CHAR: " ".-..-." }
+        { CHAR: $ "...-..-" }
+        { CHAR: @ ".--.-." }
+        { CHAR: \s "/" }
+    } >biassoc
+]
 
 : ch>morse ( ch -- morse )
     ch>lower morse-code-table at [ unknown-char ] unless* ;