From 8e5c085b572e345ee6fa877e6713b02999afb73e Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 30 Jan 2009 23:52:02 -0600
Subject: [PATCH] Fix commands tests, and chop off trailing dot

---
 basis/ui/commands/commands-tests.factor | 36 ++++++++++++++++++-------
 basis/ui/commands/commands.factor       |  2 +-
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/basis/ui/commands/commands-tests.factor b/basis/ui/commands/commands-tests.factor
index 8001ff9761..7dfd8e3edf 100644
--- a/basis/ui/commands/commands-tests.factor
+++ b/basis/ui/commands/commands-tests.factor
@@ -1,18 +1,16 @@
 IN: ui.commands.tests
 USING: ui.commands ui.gestures tools.test help.markup io
-io.streams.string ;
+io.streams.string system kernel ;
 
-[ "A+a" ] [ T{ key-down f { A+ } "a" } gesture>string ] unit-test
-[ "b" ] [ T{ key-down f f "b" } gesture>string ] unit-test
 [ "Press Button 2" ] [ T{ button-down f f 2 } gesture>string ] unit-test
 
-: com-test-1 ;
+: com-test-1 ( -- ) ;
 
 \ com-test-1 H{ } define-command
 
 [ [ 3 com-test-1 ] ] [ 3 \ com-test-1 command-quot ] unit-test
 
-: com-test-2 ;
+: com-test-2 ( -- ) ;
 
 \ com-test-2 H{ { +nullary+ t } } define-command
 
@@ -24,8 +22,26 @@ testing "testing" "hey" {
     { T{ key-down f { C+ } "x" } com-test-1 }
 } define-command-map
 
-[ "C+x" ] [
-    [
-        { $command testing "testing" com-test-1 } print-element
-    ] with-string-writer
-] unit-test
+os macosx? [
+    [ "⌘A" ] [ T{ key-down f { A+ } "a" } gesture>string ] unit-test
+    [ "B" ] [ T{ key-down f f "b" } gesture>string ] unit-test
+
+    [ "⌃X" ] [
+        [
+            { $command testing "testing" com-test-1 } print-element
+        ] with-string-writer
+    ] unit-test
+] [
+    [ "A+a" ] [ T{ key-down f { A+ } "a" } gesture>string ] unit-test
+    [ "b" ] [ T{ key-down f f "b" } gesture>string ] unit-test
+
+    [ "C+x" ] [
+        [
+            { $command testing "testing" com-test-1 } print-element
+        ] with-string-writer
+    ] unit-test
+] if
+
+: com-foo. ( -- ) ;
+
+[ "Foo" ] [ \ com-foo. command-name ] unit-test
\ No newline at end of file
diff --git a/basis/ui/commands/commands.factor b/basis/ui/commands/commands.factor
index 5f8c3381b7..9bfe8f7aec 100644
--- a/basis/ui/commands/commands.factor
+++ b/basis/ui/commands/commands.factor
@@ -56,7 +56,7 @@ TR: convert-command-name "-" " " ;
 
 M: word command-name ( word -- str )
     name>> 
-    "com-" ?head drop
+    "com-" ?head drop "." ?tail drop
     dup first Letter? [ rest ] unless
     (command-name) ;