Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/basis/ui/cocoa/cocoa.factor b/basis/ui/cocoa/cocoa.factor
index 8d176b9c6308caa23b288c7ba1ee626b0c0a1fe5..1a05d23aa0648ed7d40a826a5c5dff99c600bd83 100755 (executable)
--- a/basis/ui/cocoa/cocoa.factor
+++ b/basis/ui/cocoa/cocoa.factor
@@ -24,10 +24,10 @@ TUPLE: pasteboard handle ;
 C: <pasteboard> pasteboard
 
 M: pasteboard clipboard-contents
-    pasteboard-handle pasteboard-string ;
+    handle>> pasteboard-string ;
 
 M: pasteboard set-clipboard-contents
-    pasteboard-handle set-pasteboard-string ;
+    handle>> set-pasteboard-string ;
 
 : init-clipboard ( -- )
     NSPasteboard -> generalPasteboard <pasteboard>
@@ -44,29 +44,29 @@ M: pasteboard set-clipboard-contents
         dup install-window-delegate
         over -> release
         <handle>
-    ] keep set-world-handle ;
+    ] keep (>>handle) ;
 
 M: cocoa-ui-backend set-title ( string world -- )
-    world-handle handle-window swap <NSString> -> setTitle: ;
+    handle>> window>> swap <NSString> -> setTitle: ;
 
 : enter-fullscreen ( world -- )
-    world-handle handle-view
+    handle>> view>>
     NSScreen -> mainScreen
     f -> enterFullScreenMode:withOptions:
     drop ;
 
 : exit-fullscreen ( world -- )
-    world-handle handle-view f -> exitFullScreenModeWithOptions: ;
+    handle>> view>> f -> exitFullScreenModeWithOptions: ;
 
 M: cocoa-ui-backend set-fullscreen* ( ? world -- )
     swap [ enter-fullscreen ] [ exit-fullscreen ] if ;
 
 M: cocoa-ui-backend fullscreen* ( world -- ? )
-    world-handle handle-view -> isInFullScreenMode zero? not ;
+    handle>> view>> -> isInFullScreenMode zero? not ;
 
 : auto-position ( world -- )
     dup window-loc>> { 0 0 } = [
-        world-handle handle-window -> center
+        handle>> window>> -> center
     ] [
         drop
     ] if ;
@@ -74,29 +74,29 @@ M: cocoa-ui-backend fullscreen* ( world -- ? )
 M: cocoa-ui-backend (open-window) ( world -- )
     dup gadget-window
     dup auto-position
-    world-handle handle-window f -> makeKeyAndOrderFront: ;
+    handle>> window>> f -> makeKeyAndOrderFront: ;
 
 M: cocoa-ui-backend (close-window) ( handle -- )
-    handle-window -> release ;
+    window>> -> release ;
 
 M: cocoa-ui-backend close-window ( gadget -- )
     find-world [
-        world-handle [
-            handle-window f -> performClose:
+        handle>> [
+            window>> f -> performClose:
         ] when*
     ] when* ;
 
 M: cocoa-ui-backend raise-window* ( world -- )
-    world-handle [
-        handle-window dup f -> orderFront: -> makeKeyWindow
+    handle>> [
+        window>> dup f -> orderFront: -> makeKeyWindow
         NSApp 1 -> activateIgnoringOtherApps:
     ] when* ;
 
 M: cocoa-ui-backend select-gl-context ( handle -- )
-    handle-view -> openGLContext -> makeCurrentContext ;
+    view>> -> openGLContext -> makeCurrentContext ;
 
 M: cocoa-ui-backend flush-gl-context ( handle -- )
-    handle-view -> openGLContext -> flushBuffer ;
+    view>> -> openGLContext -> flushBuffer ;
 
 M: cocoa-ui-backend beep ( -- )
     NSBeep ;

diff --git a/basis/windows/time/time.factor b/basis/windows/time/time.factor
index 63b12de1ff3fae41402203ad7a46bdd9f79b57a8..5e23f8cc01e29df59b7dc96bc6239976d6fb88fe 100644 (file)
--- a/basis/windows/time/time.factor
+++ b/basis/windows/time/time.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types kernel math windows windows.kernel32
-namespaces calendar calendar.backend ;
+namespaces calendar ;
 IN: windows.time
 
 : >64bit ( lo hi -- n )

diff --git a/basis/xml/errors/errors.factor b/basis/xml/errors/errors.factor
index 1ef26883e35c23b3b1d2e5c61cab8d139a0b60c0..9b5b5d6568ae0a99503079716e7820ae898ca83b 100644 (file)
--- a/basis/xml/errors/errors.factor
+++ b/basis/xml/errors/errors.factor
@@ -53,7 +53,7 @@ M: mismatched summary ( obj -- str )
 TUPLE: unclosed < parsing-error tags ;
 : <unclosed> ( -- unclosed )
     unclosed parsing-error
-        xml-stack get rest-slice [ first opener-name ] map >>tags ;
+        xml-stack get rest-slice [ first name>> ] map >>tags ;
 M: unclosed summary ( obj -- str )
     [
         dup call-next-method write

diff --git a/basis/xml/tokenize/tokenize.factor b/basis/xml/tokenize/tokenize.factor
index 284f53023d01bcfaf53cbf8f05f7609e3b5d48bf..2e91c23f60d111c8c94a89bd0bf1b919c156d442 100644 (file)
--- a/basis/xml/tokenize/tokenize.factor
+++ b/basis/xml/tokenize/tokenize.factor
@@ -49,7 +49,7 @@ SYMBOL: ns-stack
 ! Parsing names
 
 : version=1.0? ( -- ? )
-    prolog-data get prolog-version "1.0" = ;
+    prolog-data get version>> "1.0" = ;
 
 ! version=1.0? is calculated once and passed around for efficiency
 
@@ -69,7 +69,7 @@ SYMBOL: ns-stack
 
 : (parse-entity) ( string -- )
     dup entities at [ , ] [ 
-        prolog-data get prolog-standalone
+        prolog-data get standalone>>
         [ <no-entity> throw ] [
             dup extra-entities get at
             [ , ] [ <no-entity> throw ] ?if

diff --git a/extra/faq/faq.factor b/extra/faq/faq.factor
index 47d3727703b5746585bbbd56595d9c39ea3a30c6..525cef68edd3492bdf4d9f40ec22d3c4c23ca517 100644 (file)
--- a/extra/faq/faq.factor
+++ b/extra/faq/faq.factor
@@ -18,15 +18,15 @@ C: <q/a> q/a
 : li>q/a ( li -- q/a )
     [ "br" tag-named*? not ] filter
     [ "strong" tag-named*? ] find-after
-    >r tag-children r> <q/a> ;
+    >r children>> r> <q/a> ;
 
 : q/a>li ( q/a -- li )
     [ question>> "strong" build-tag* f "br" build-tag* 2array ] keep
     answer>> append "li" build-tag* ;
 
 : xml>q/a ( xml -- q/a )
-    [ "question" tag-named tag-children ] keep
-    "answer" tag-named tag-children <q/a> ;
+    [ "question" tag-named children>> ] keep
+    "answer" tag-named children>> <q/a> ;
 
 : q/a>xml ( q/a -- xml )
     [ question>> "question" build-tag* ] keep
@@ -39,7 +39,7 @@ C: <question-list> question-list
 
 : xml>question-list ( list -- question-list )
     [ "title" swap at ] keep
-    tag-children [ tag? ] filter [ xml>q/a ] map
+    children>> [ tag? ] filter [ xml>q/a ] map
     <question-list> ;
 
 : question-list>xml ( question-list -- list )

diff --git a/extra/furnace/furnace.factor b/extra/furnace/furnace.factor
index 45aa55f0506efb9c004ce1fb352384b8354d7760..11250ba6442a377454e58cdeae9eb2efab9e3e21 100644 (file)
--- a/extra/furnace/furnace.factor
+++ b/extra/furnace/furnace.factor
@@ -176,7 +176,7 @@ CHLOE: a
                     [ link-attrs ]
                     [ "method" optional-attr "post" or =method ]
                     [ "action" required-attr resolve-base-path =action ]
-                    [ tag-attrs non-chloe-attrs-only print-attrs ]
+                    [ attrs>> non-chloe-attrs-only print-attrs ]
                 } cleave
             form>
         ]
@@ -196,13 +196,13 @@ STRING: button-tag-markup
 ;
 
 : add-tag-attrs ( attrs tag -- )
-    tag-attrs swap update ;
+    attrs>> swap update ;
 
 CHLOE: button
     button-tag-markup string>xml delegate
     {
-        [ [ tag-attrs chloe-attrs-only ] dip add-tag-attrs ]
-        [ [ tag-attrs non-chloe-attrs-only ] dip "button" tag-named add-tag-attrs ]
+        [ [ attrs>> chloe-attrs-only ] dip add-tag-attrs ]
+        [ [ attrs>> non-chloe-attrs-only ] dip "button" tag-named add-tag-attrs ]
         [ [ children>string 1array ] dip "button" tag-named set-tag-children ]
         [ nip ]
     } 2cleave process-chloe-tag ;

diff --git a/extra/html/templates/chloe/chloe.factor b/extra/html/templates/chloe/chloe.factor
index 67a7dc2045002cfa02891e93240d38fb811c6789..afbd82fed40855447b1cea4c761405e5373d6cfc 100644 (file)
--- a/extra/html/templates/chloe/chloe.factor
+++ b/extra/html/templates/chloe/chloe.factor
@@ -22,10 +22,10 @@ C: <chloe> chloe
 DEFER: process-template
 
 : chloe-attrs-only ( assoc -- assoc' )
-    [ drop name-url chloe-ns = ] assoc-filter ;
+    [ drop url>> chloe-ns = ] assoc-filter ;
 
 : non-chloe-attrs-only ( assoc -- assoc' )
-    [ drop name-url chloe-ns = not ] assoc-filter ;
+    [ drop url>> chloe-ns = not ] assoc-filter ;
 
 : chloe-tag? ( tag -- ? )
     dup xml? [ body>> ] when
@@ -148,10 +148,10 @@ CHLOE-TUPLE: code
             process-template
         ] [
             {
-                [ xml-prolog write-prolog ]
-                [ xml-before write-chunk  ]
+                [ prolog>> write-prolog ]
+                [ before>> write-chunk  ]
                 [ process-template        ]
-                [ xml-after write-chunk   ]
+                [ after>> write-chunk   ]
             } cleave
         ] if
     ] with-scope ;

diff --git a/extra/springies/ui/ui.factor b/extra/springies/ui/ui.factor
index 75d3087fe5f756836e9f36243917137652c7f1bc..f9a97ba945aaddb4e861d8fb43ad37dbce53902c 100644 (file)
--- a/extra/springies/ui/ui.factor
+++ b/extra/springies/ui/ui.factor
@@ -10,7 +10,7 @@ IN: springies.ui
 : draw-node ( node -- ) pos>> { -5 -5 } v+ dup { 10 10 } v+ gl-rect ;
 
 : draw-spring ( spring -- )
-  [ spring-node-a pos>> ] [ spring-node-b pos>> ] bi gl-line ;
+  [ node-a>> pos>> ] [ node-b>> pos>> ] bi gl-line ;
 
 : draw-nodes ( -- ) nodes> [ draw-node ] each ;
 

diff --git a/extra/x/widgets/wm/workspace/workspace.factor b/extra/x/widgets/wm/workspace/workspace.factor
index 104021706f9f406dad9e013f3aa8e72c97e93977..c11ad7e04da202c135cf588c071cd9b7624dabe3 100644 (file)
--- a/extra/x/widgets/wm/workspace/workspace.factor
+++ b/extra/x/widgets/wm/workspace/workspace.factor
@@ -1,5 +1,6 @@
 
-USING: kernel namespaces namespaces.lib math sequences vars mortar slot-accessors x ;
+USING: kernel namespaces namespaces.lib math sequences vars mortar
+accessors slot-accessors x ;
 
 IN: x.widgets.wm.workspace
 
@@ -23,9 +24,9 @@ dpy get $default-root <- children [ <- mapped? ] filter ;
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : switch-to-workspace ( n -- )
-mapped-windows current-workspace> workspaces> nth set-workspace-windows
+mapped-windows current-workspace> workspaces> nth (>>windows)
 mapped-windows [ <- unmap drop ] each
-dup workspaces> nth workspace-windows [ <- map drop ] each
+dup workspaces> nth windows>> [ <- map drop ] each
 current-workspace set* ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!