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

extra/crypto/md5/md5.factor

@@ -3,19 +3,12 @@
 USING: kernel io io.binary io.files io.streams.string math
 math.functions math.parser namespaces splitting strings
 sequences crypto.common byte-arrays locals sequences.private
-io.encodings.binary ;
+io.encodings.binary symbols ;
 IN: crypto.md5
 
 <PRIVATE
 
-SYMBOL: a
+SYMBOLS: a b c d old-a old-b old-c old-d ;
-SYMBOL: b
-SYMBOL: c
-SYMBOL: d
-SYMBOL: old-a
-SYMBOL: old-b
-SYMBOL: old-c
-SYMBOL: old-d
 
 : T ( N -- Y )
     sin abs 4294967296 * >bignum ; foldable

extra/crypto/sha1/sha1.factor

@@ -1,23 +1,12 @@
 USING: arrays combinators crypto.common kernel io io.encodings.binary
 io.files io.streams.string math.vectors strings sequences
 namespaces math parser sequences vectors io.binary
-hashtables ;
+hashtables symbols ;
 IN: crypto.sha1
 
 ! Implemented according to RFC 3174.
 
-SYMBOL: h0
+SYMBOL: h0 h1 h2 h3 h4 A B C D E w K ;
-SYMBOL: h1
-SYMBOL: h2
-SYMBOL: h3
-SYMBOL: h4
-SYMBOL: A
-SYMBOL: B
-SYMBOL: C
-SYMBOL: D
-SYMBOL: E
-SYMBOL: w
-SYMBOL: K
 
 : get-wth ( n -- wth ) w get nth ; inline
 : shift-wth ( n -- x ) get-wth 1 bitroll-32 ; inline

extra/crypto/sha2/sha2.factor

@@ -1,19 +1,10 @@
 USING: crypto.common kernel splitting math sequences namespaces
-io.binary ;
+io.binary symbols ;
 IN: crypto.sha2
 
 <PRIVATE
 
-SYMBOL: vars
+SYMBOL: vars M K H S0 S1 process-M word-size block-size >word ;
-SYMBOL: M
-SYMBOL: K
-SYMBOL: H
-SYMBOL: S0
-SYMBOL: S1
-SYMBOL: process-M
-SYMBOL: word-size
-SYMBOL: block-size
-SYMBOL: >word
 
 : a 0 ;
 : b 1 ;
@@ -139,4 +130,3 @@ PRIVATE>
 
 : string>sha-256-string ( string -- hexstring )
     string>sha-256 hex-string ;
-

extra/db/types/types.factor

@@ -4,7 +4,7 @@ USING: arrays assocs db kernel math math.parser
 sequences continuations sequences.deep sequences.lib
 words namespaces tools.walker slots slots.private classes
 mirrors tuples combinators calendar.format serialize
-io.streams.string ;
+io.streams.string symbols ;
 IN: db.types
 
 HOOK: modifier-table db ( -- hash )
@@ -14,11 +14,10 @@ HOOK: create-type-table db ( -- hash )
 HOOK: compound-type db ( str n -- hash )
 
 TUPLE: sql-spec class slot-name column-name type modifiers primary-key ;
-! ID is the Primary key
+
-! +native-id+ can be a columns type or a modifier
+SYMBOLS: +native-id+ +assigned-id+ +autoincrement+
-SYMBOL: +native-id+
++serial+ +unique+ +default+ +null+ +not-null+
-! +assigned-id+ can only be a modifier
++foreign-id+ +has-many+ ;
-SYMBOL: +assigned-id+
 
 : (primary-key?) ( obj -- ? )
     { +native-id+ +assigned-id+ } member? ;
@@ -45,35 +44,10 @@ SYMBOL: +assigned-id+
 : assigned-id? ( spec -- ? )
     sql-spec-primary-key +assigned-id+ = ;
 
-SYMBOL: +foreign-id+
-
-! Same concept, SQLite has autoincrement, PostgreSQL has serial
-SYMBOL: +autoincrement+
-SYMBOL: +serial+
-SYMBOL: +unique+
-
-SYMBOL: +default+
-SYMBOL: +null+
-SYMBOL: +not-null+
-
-SYMBOL: +has-many+
-
 : relation? ( spec -- ? ) [ +has-many+ = ] deep-find ;
 
-SYMBOL: INTEGER
+SYMBOLS: INTEGER BIG-INTEGER DOUBLE REAL BOOLEAN TEXT VARCHAR
-SYMBOL: BIG-INTEGER
+DATE TIME DATETIME TIMESTAMP BLOB FACTOR-BLOB NULL ;
-SYMBOL: DOUBLE
-SYMBOL: REAL
-SYMBOL: BOOLEAN
-SYMBOL: TEXT
-SYMBOL: VARCHAR
-SYMBOL: DATE
-SYMBOL: TIME
-SYMBOL: DATETIME
-SYMBOL: TIMESTAMP
-SYMBOL: BLOB
-SYMBOL: FACTOR-BLOB
-SYMBOL: NULL
 
 : spec>tuple ( class spec -- tuple )
     [ ?first3 ] keep 3 ?tail*

extra/io/windows/files/files.factor

@@ -3,23 +3,13 @@
 USING: alien.c-types io.files io.windows kernel
 math windows windows.kernel32 combinators.cleave
 windows.time calendar combinators math.functions
-sequences combinators.lib namespaces words ;
+sequences combinators.lib namespaces words symbols ;
 IN: io.windows.files
 
-SYMBOL: +read-only+
+SYMBOLS: +read-only+ +hidden+ +system+
-SYMBOL: +hidden+
++directory+ +archive+ +device+ +normal+ +temporary+
-SYMBOL: +system+
++sparse-file+ +reparse-point+ +compressed+ +offline+
-SYMBOL: +directory+
++not-content-indexed+ +encrypted+ ;
-SYMBOL: +archive+
-SYMBOL: +device+
-SYMBOL: +normal+
-SYMBOL: +temporary+
-SYMBOL: +sparse-file+
-SYMBOL: +reparse-point+
-SYMBOL: +compressed+
-SYMBOL: +offline+
-SYMBOL: +not-content-indexed+
-SYMBOL: +encrypted+
 
 : expand-constants ( word/obj -- obj'/obj )
     dup word? [ execute ] when ;

extra/ui/gestures/gestures.factor

@@ -3,7 +3,7 @@
 USING: arrays assocs kernel math models namespaces
 sequences words strings system hashtables math.parser
 math.vectors tuples classes ui.gadgets combinators.lib boxes
-calendar alarms ;
+calendar alarms symbols ;
 IN: ui.gestures
 
 : set-gestures ( class hash -- ) "gestures" set-word-prop ;
@@ -49,10 +49,7 @@ TUPLE: select-all-action ; C: <select-all-action> select-all-action
     tuple>array 1 head* >tuple ;
 
 ! Modifiers
-SYMBOL: C+
+SYMBOLS: C+ A+ M+ S+ ;
-SYMBOL: A+
-SYMBOL: M+
-SYMBOL: S+
 
 TUPLE: key-down mods sym ;
 

extra/ui/windows/windows.factor

@@ -6,7 +6,8 @@ math math.vectors namespaces prettyprint sequences strings
 vectors words windows.kernel32 windows.gdi32 windows.user32
 windows.opengl32 windows.messages windows.types windows.nt
 windows threads libc combinators continuations command-line
-shuffle opengl ui.render unicode.case ascii math.bitfields ;
+shuffle opengl ui.render unicode.case ascii math.bitfields
+locals symbols ;
 IN: ui.windows
 
 TUPLE: windows-ui-backend ;
@@ -67,9 +68,7 @@ M: pasteboard set-clipboard-contents drop copy ;
 TUPLE: win hWnd hDC hRC world title ;
 C: <win> win
 
-SYMBOL: msg-obj
+SYMBOLS: msg-obj class-name-ptr mouse-captured ;
-SYMBOL: class-name-ptr
-SYMBOL: mouse-captured
 
 : style ( -- n ) WS_OVERLAPPEDWINDOW ; inline
 : ex-style ( -- n ) WS_EX_APPWINDOW WS_EX_WINDOWEDGE bitor ; inline
@@ -188,30 +187,21 @@ SYMBOL: mouse-captured
         ] if
     ] if ;
 
-SYMBOL: lParam
+:: handle-wm-keydown ( hWnd uMsg wParam lParam -- )
-SYMBOL: wParam
+    wParam exclude-key-wm-keydown? [
-SYMBOL: uMsg
+        wParam keystroke>gesture <key-down>
-SYMBOL: hWnd
+        hWnd window-focus send-gesture drop
-
-: handle-wm-keydown ( hWnd uMsg wParam lParam -- )
-    lParam set wParam set uMsg set hWnd set
-    wParam get exclude-key-wm-keydown? [
-        wParam get keystroke>gesture <key-down>
-        hWnd get window-focus send-gesture drop 
     ] unless ;
 
-: handle-wm-char ( hWnd uMsg wParam lParam -- )
+:: handle-wm-char ( hWnd uMsg wParam lParam -- )
-    lParam set wParam set uMsg set hWnd set
+    wParam exclude-key-wm-char? ctrl? alt? xor or [
-    wParam get exclude-key-wm-char? ctrl? alt? xor or [
+        wParam 1string
-        wParam get 1string
+        hWnd window-focus user-input
-        hWnd get window-focus user-input
     ] unless ;
 
-: handle-wm-keyup ( hWnd uMsg wParam lParam -- )
+:: handle-wm-keyup ( hWnd uMsg wParam lParam -- )
-    lParam set wParam set uMsg set hWnd set
+    wParam keystroke>gesture <key-up>
-    wParam get keystroke>gesture <key-up>
+    hWnd window-focus send-gesture drop ;
-    hWnd get window-focus send-gesture
-    drop ;
 
 : handle-wm-syscommand ( hWnd uMsg wParam lParam -- n )
     dup alpha? [ 4drop 0 ] [ DefWindowProc ] if ;

extra/xmode/marker/state/state.factor

@@ -1,20 +1,12 @@
-USING: xmode.marker.context xmode.rules
+USING: xmode.marker.context xmode.rules symbols
 xmode.tokens namespaces kernel sequences assocs math ;
 IN: xmode.marker.state
 
 ! Based on org.gjt.sp.jedit.syntax.TokenMarker
 
-SYMBOL: line
+SYMBOLS: line last-offset position context
-SYMBOL: last-offset
+ whitespace-end seen-whitespace-end?
-SYMBOL: position
+ escaped?  process-escape?  delegate-end-escaped? ;
-SYMBOL: context
-
-SYMBOL: whitespace-end
-SYMBOL: seen-whitespace-end?
-
-SYMBOL: escaped?
-SYMBOL: process-escape?
-SYMBOL: delegate-end-escaped?
 
 : current-rule ( -- rule )
     context get line-context-in-rule ;