misc/vim: some minor fixes.

- fix word definition to have dashes and other printables
- fix private to properly highlight and close the region

.gitattributes

@@ -1,2 +1,3 @@
 *.factor text eol=lf
 *.html text eol=lf
+misc/vim/*/*/generated.vim linguist-generated

.travis.yml

@@ -35,6 +35,15 @@ addons:
       - gtk2-engines-pixbuf
 before_install:
   - uname -s
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export HOMEBREW_NO_AUTO_UPDATE=1 ; fi # Don't let homebrew upgrade itself
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rm -rf ~/.gnupg/; fi  # https://github.com/rvm/rvm/issues/3110
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -sSL https://rvm.io/mpapis.asc | gpg --import - ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -sSL https://get.rvm.io | bash -s stable; fi  # https://github.com/travis-ci/travis-ci/issues/6307
+  #- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm reload ; fi # for homebrew to have 2.6.3, which takes too long. instead we just use HOMEBREW_NO_AUTO_UPDATE=1
+  #- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm install ruby-2.6.3 ; fi # for homebrew
+  #- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm use 2.6 ; fi # for homebrew
+
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./build.sh deps-macosx ; else ./build.sh deps-apt-get ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions snappy > /dev/null || brew install snappy; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions cmake > /dev/null || brew install cmake; fi
@@ -47,10 +56,6 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew services start redis; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew services start postgresql; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew services start memcached; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rm -rf ~/.gnupg/; fi  # https://github.com/rvm/rvm/issues/3110
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -sSL https://rvm.io/mpapis.asc | gpg --import - ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -sSL https://get.rvm.io | bash -s stable; fi  # https://github.com/travis-ci/travis-ci/issues/6307
   - if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
       wget https://github.com/vmt/udis86/archive/v1.7.2.tar.gz && tar xzvf v1.7.2.tar.gz &&
       ( cd udis86-1.7.2/ && ./autogen.sh && ./configure --enable-shared=yes && make && sudo make install ) &&
@@ -69,8 +74,8 @@ script:
   - export CI_BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
   - echo "CI_BRANCH=${CI_BRANCH}"
   - DEBUG=1 ./build.sh net-bootstrap < /dev/null
-  - "./factor -e='USING: memory vocabs.hierarchy ; \"zealot\" load save'"
+  - "./factor -e='USING: memory vocabs.hierarchy tools.test namespaces ; \"zealot\" load f long-unit-tests-enabled? set-global save'"
   - './factor -run=zealot.cli-changed-vocabs'
   - './factor -run=tools.test `./factor -run=zealot.cli-changed-vocabs | paste -s -d " " -`'
-  - './factor -run=help.lint `./factor -run=zealot.cli-changed-vocabs | paste -s -d " " -`'
+  - './factor -run=zealot.help-lint `./factor -run=zealot.cli-changed-vocabs | paste -s -d " " -`'
   - "./factor -e='USING: modern.paths tools.test sequences system kernel math random ; core-vocabs os macosx? [ dup length 3 /i sample ] when [ test ] each'"

GNUmakefile

@@ -14,6 +14,7 @@ ifdef CONFIG
 	endif
 
 	XCODE_PATH ?= /Applications/Xcode.app
+	MACOSX_32_SDK ?= MacOSX10.11.sdk
 	MACOSX_SDK ?= MacOSX10.13.sdk
 
 	include $(CONFIG)

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019, Slava Pestov, et al.
+Copyright (c) 2020, Slava Pestov, et al.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Nmakefile

@@ -8,21 +8,21 @@ VERSION = 0.99
 !IF [git describe --all > git-describe.tmp] == 0
 GIT_DESCRIBE = \
 !INCLUDE <git-describe.tmp>
-!IF [rm git-describe.tmp] == 0
+!IF [del git-describe.tmp] == 0
 !ENDIF
 !ENDIF
 
 !IF [git rev-parse HEAD > git-id.tmp] == 0
 GIT_ID = \
 !INCLUDE <git-id.tmp>
-!IF [rm git-id.tmp] == 0
+!IF [del git-id.tmp] == 0
 !ENDIF
 !ENDIF
 
 !IF [git rev-parse --abbrev-ref HEAD > git-branch.tmp] == 0
 GIT_BRANCH = \
 !INCLUDE <git-branch.tmp>
-!IF [rm git-branch.tmp] == 0
+!IF [del git-branch.tmp] == 0
 !ENDIF
 !ENDIF
 
@@ -58,6 +58,13 @@ CL_FLAGS = $(CL_FLAGS) $(CL_FLAGS_VISTA)
 PLAF_DLL_OBJS = vm\os-windows-x86.64.obj vm\cpu-x86.obj
 SUBSYSTEM_COM_FLAGS = console
 SUBSYSTEM_EXE_FLAGS = windows
+
+!ELSE
+CL_FLAGS = $(CL_FLAGS) $(CL_FLAGS_VISTA)
+PLAF_DLL_OBJS = vm\os-windows-x86.64.obj vm\cpu-x86.obj
+SUBSYSTEM_COM_FLAGS = console
+SUBSYSTEM_EXE_FLAGS = windows
+
 !ENDIF
 
 !IF DEFINED(DEBUG)
@@ -143,6 +150,16 @@ factor.com: $(EXE_OBJS) $(DLL_OBJS)
 factor.exe: $(EXE_OBJS) $(DLL_OBJS)
 	link $(LINK_FLAGS) /out:factor.exe /SUBSYSTEM:$(SUBSYSTEM_EXE_FLAGS) $(EXE_OBJS) $(DLL_OBJS)
 
+# If we compile factor.exe, run mt.exe, and run factor.exe,
+# then Windows caches the manifest. Even on a recompile without applying
+# the mt.exe tool, if the factor.exe.manifest file is present, the manifest
+# is applied. To avoid this, we delete the .manifest file on clean
+# and copy it from a reference file on compilation and mt.exe.
+#
+factor.exe.manifest: factor.exe
+	copy factor.exe.manifest.in factor.exe.manifest
+	mt -manifest factor.exe.manifest -outputresource:"factor.exe;#1"
+
 all: factor.com factor.exe factor.dll.lib libfactor-ffi-test.dll
 
 !ENDIF
@@ -174,12 +191,15 @@ clean:
 	if exist factor.lib del factor.lib
 	if exist factor.com del factor.com
 	if exist factor.exe del factor.exe
+	if exist factor.exe.manifest del factor.exe.manifest
+	if exist factor.exp del factor.exp
 	if exist factor.dll del factor.dll
 	if exist factor.dll.lib del factor.dll.lib
+	if exist factor.dll.exp del factor.dll.exp
 	if exist libfactor-ffi-test.dll del libfactor-ffi-test.dll
 	if exist libfactor-ffi-test.exp del libfactor-ffi-test.exp
 	if exist libfactor-ffi-test.lib del libfactor-ffi-test.lib
 
-.PHONY: all default x86-32 x86-64 x86-32-vista x86-64-vista clean
+.PHONY: all default x86-32 x86-64 x86-32-vista x86-64-vista clean factor.exe.manifest
 
 .SUFFIXES: .rs

README.md

@@ -28,7 +28,7 @@ a boot image stored on factorcode.org.
 
 To check out Factor:
 
-* `git clone git://factorcode.org/git/factor.git`
+* `git clone git://github.com/factor/factor.git`
 * `cd factor`
 
 To build the latest complete Factor system from git, either use the
@@ -38,7 +38,7 @@ build script:
 * Windows: `build.cmd`
 
 or download the correct boot image for your system from
-http://downloads.factorcode.org/images/master/, put it in the factor
+http://downloads.factorcode.org/images/master/, put it in the `factor`
 directory and run:
 
 * Unix: `make` and then `./factor -i=boot.unix-x86.64.image`
@@ -127,6 +127,25 @@ The Factor source tree is organized as follows:
 * `misc/` - editor modes, icons, etc
 * `unmaintained/` - now at [factor-unmaintained](https://github.com/factor/factor-unmaintained)
 
+## Source History
+
+During Factor's lifetime, sourcecode has lived in many repositories. Unfortunately, the first import in Git did not keep history. History has been partially recreated from what could be salvaged. Due to the nature of Git, it's only possible to add history without disturbing upstream work, by using replace objects. These need to be manually fetched, or need to be explicitly added to your git remote configuration.
+
+Use:
+`git fetch origin 'refs/replace/*:refs/replace/*'`
+
+or add the following line to your configuration file
+
+```
+[remote "origin"]
+    url = ...
+    fetch = +refs/heads/*:refs/remotes/origin/*
+    ...
+    fetch = +refs/replace/*:refs/replace/*
+```
+
+Then subsequent fetches will automatically update any replace objects.
+
 ## Community
 
 Factor developers meet in the `#concatenative` channel on
@@ -135,5 +154,7 @@ anything related to Factor or language design in general.
 
 * [Factor homepage](https://factorcode.org)
 * [Concatenative languages wiki](https://concatenative.org)
+* [Mailing list](factor-talk@lists.sourceforge.net)
+* Search for "factorcode" on [Gitter](https://gitter.im/)
 
 Have fun!

basis/alien/c-types/c-types-docs.factor

@@ -105,7 +105,7 @@ $nl
 ARTICLE: "c-types.primitives" "Primitive C types"
 "The following numerical types are defined in the " { $vocab-link "alien.c-types" } " vocabulary; a " { $snippet "u" } " prefix denotes an unsigned type:"
 { $table
-    { "C type" "Notes" }
+    { { $strong "C type" } { $strong "Notes" } }
     { { $link char } "always 1 byte" }
     { { $link uchar } { } }
     { { $link short } "always 2 bytes" }

basis/alien/data/data-docs.factor

@@ -41,8 +41,8 @@ HELP: memory>byte-array
 
 HELP: cast-array
 { $values { "byte-array" byte-array } { "c-type" "a C type" } { "array" "a specialized array" } }
-{ $description "Converts a byte array into a specialized array by interpreting the bytes in as machine-specific values. Code which uses this word is unportable." }
-{ $notes "The appropriate specialized array vocabulary must be loaded; otherwise, an error will be thrown. See the " { $vocab-link "specialized-arrays" } " vocabulary for details on the underlying sequence type constructed." }
+{ $description "Converts a " { $link byte-array } " into a specialized array by interpreting the bytes in it as machine-specific values. Code using this word is unportable." }
+{ $notes "The appropriate specialized array vocabulary must be loaded, otherwise an error will be thrown. See the " { $vocab-link "specialized-arrays" } " vocabulary for details on the underlying sequence type constructed." }
 { $errors "Throws an error if the type does not exist, the necessary specialized array vocabulary is not loaded, or the requested size is negative." } ;
 
 HELP: malloc-array
@@ -257,4 +257,4 @@ ARTICLE: "c-out-params" "Output parameters in C"
 { $code
   "1234 { c-string } [ do_frob ] with-out-parameters"
 }
-"which would put the functions return value and error string on the stack." ;
+"which would put the function's return value and error string on the stack." ;

basis/alien/libraries/finder/linux/linux-tests.factor

@@ -1,5 +1,4 @@
 USING: alien.libraries.finder sequences tools.test ;
-IN: alien.libraries.finder.linux.tests
 
 { t } [ "libm.so" "m" find-library subseq? ] unit-test
 { t } [ "libc.so" "c" find-library subseq? ] unit-test

basis/alien/libraries/finder/linux/linux.factor

@@ -44,4 +44,4 @@ PRIVATE>
 
 M: linux find-library*
     "lib" prepend load-ldconfig-cache
-    [ ldconfig-matches? ] with find nip ?first ;
+    [ ldconfig-matches? ] with find nip ?last ;

basis/alien/libraries/finder/macosx/macosx-tests.factor

@@ -1,9 +1,6 @@
-
-USING: alien.libraries.finder
+USING: alien.libraries.finder alien.libraries.finder.macosx
 alien.libraries.finder.macosx.private sequences tools.test ;
 
-IN: alien.libraries.finder.macosx
-
 {
     {
         f

basis/alien/libraries/finder/windows/windows-tests.factor

@@ -0,0 +1,3 @@
+USING: alien.libraries.finder sequences tools.test ;
+
+{ t } [ "kernel32.dll" "kernel32" find-library subseq? ] unit-test

basis/alien/libraries/windows/windows.factor

@@ -1,8 +1,9 @@
-USING: alien.libraries io.pathnames system windows.errors ;
+USING: alien.libraries io.pathnames system windows.errors
+windows.kernel32 ;
 IN: alien.libraries.windows
 
 M: windows >deployed-library-path
     file-name ;
 
 M: windows dlerror ( -- message )
-    win32-error-string ;
+    GetLastError n>win32-error-string ;

basis/base64/base64-tests.factor

@@ -1,5 +1,7 @@
-USING: base64 io.encodings.ascii io.encodings.string kernel
-sequences splitting strings tools.test ;
+USING: base64 byte-arrays io.encodings.ascii io.encodings.string
+kernel sequences splitting strings tools.test ;
+
+{ t } [ 256 <iota> >byte-array dup >base64 base64> = ] unit-test
 
 { "abcdefghijklmnopqrstuvwxyz" } [ "abcdefghijklmnopqrstuvwxyz" ascii encode >base64 base64> ascii decode
 ] unit-test
@@ -39,3 +41,9 @@ sequences splitting strings tools.test ;
     "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJKb2UifQ.ipevRNuRP6HflG8cFKnmUPtypruRC4fb1DWtoLL62SY"
     "." split [ base64> ] map
 ] unit-test
+
+{ "01a+b/cd" } [ "\xd3V\xbeo\xf7\x1d" >base64 "" like ] unit-test
+{ "\xd3V\xbeo\xf7\x1d" } [ "01a+b/cd" base64> "" like ] unit-test
+
+{ "01a-b_cd" } [ "\xd3V\xbeo\xf7\x1d" >urlsafe-base64 "" like ] unit-test
+{ "\xd3V\xbeo\xf7\x1d" } [ "01a-b_cd" urlsafe-base64> "" like ] unit-test

basis/base64/base64.factor

@@ -1,8 +1,9 @@
 ! Copyright (C) 2008 Doug Coleman, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators fry io io.binary io.encodings.binary
-io.streams.byte-array kernel literals math namespaces sbufs
-sequences ;
+USING: arrays assocs byte-arrays combinators fry growable io
+io.encodings.binary io.streams.byte-array kernel kernel.private
+literals locals math math.bitwise namespaces sbufs sequences
+sequences.private ;
 IN: base64
 
 ERROR: malformed-base64 ;
@@ -10,8 +11,10 @@ ERROR: malformed-base64 ;
 <PRIVATE
 
 <<
-CONSTANT: alphabet
+CONSTANT: alphabet $[
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+    >byte-array
+]
 
 : alphabet-inverse ( alphabet -- seq )
     dup supremum 1 + f <array> [
@@ -24,79 +27,133 @@ CONSTANT: alphabet
 
 : base64>ch ( ch -- ch )
     $[ alphabet alphabet-inverse 0 CHAR: = pick set-nth ] nth
-    [ malformed-base64 ] unless* ; inline
+    [ malformed-base64 ] unless* { fixnum } declare ; inline
 
-: (write-lines) ( column byte-array -- column' )
-    output-stream get dup '[
-        _ stream-write1 1 + dup 76 = [
-            drop B{ CHAR: \r CHAR: \n } _ stream-write 0
+: encode3 ( x y z -- a b c d )
+    { fixnum fixnum fixnum } declare {
+        [ [ -2 shift ch>base64 ] [ 2 bits 4 shift ] bi ]
+        [ [ -4 shift bitor ch>base64 ] [ 4 bits 2 shift ] bi ]
+        [ [ -6 shift bitor ch>base64 ] [ 6 bits ch>base64 ] bi ]
+    } spread ; inline
+
+:: (stream-write-lines) ( column data stream -- column' )
+    column data over 71 > [
+        [
+            stream stream-write1 1 + dup 76 = [
+                drop 0
+                B{ CHAR: \r CHAR: \n } stream stream-write
             ] when
-    ] each ; inline
+        ] each
+    ] [
+        stream stream-write 4 +
+    ] if ; inline
 
-: write-lines ( column byte-array -- column' )
-    over [ (write-lines) ] [ write ] if ; inline
+: stream-write-lines ( column data stream -- column' )
+    pick [ (stream-write-lines) ] [ stream-write ] if ; inline
 
-: encode3 ( seq -- byte-array )
-    be> { -18 -12 -6 0 } '[
-        shift 0x3f bitand ch>base64
-    ] with B{ } map-as ; inline
+: write-lines ( column data -- column' )
+    output-stream get stream-write-lines ; inline
 
-: encode-pad ( seq n -- byte-array )
-    [ 3 0 pad-tail encode3 ] [ 1 + ] bi* head-slice
-    4 CHAR: = pad-tail ; inline
-
-: (encode-base64) ( stream column -- )
-    3 pick stream-read dup length {
-        { 0 [ 3drop ] }
-        { 3 [ encode3 write-lines (encode-base64) ] }
-        [ encode-pad write-lines (encode-base64) ]
-    } case ;
+:: (encode-base64) ( input output column -- )
+    4 <byte-array> :> data
+    column [ input stream-read1 dup ] [
+        input stream-read1
+        input stream-read1
+        [ [ 0 or ] bi@ encode3 ] 2keep [ 0 1 ? ] bi@ + {
+            { 0 [ ] }
+            { 1 [ drop CHAR: = ] }
+            { 2 [ 2drop CHAR: = CHAR: = ] }
+        } case data (4sequence) output stream-write-lines
+    ] while 2drop ; inline
 
 PRIVATE>
 
 : encode-base64 ( -- )
-    input-stream get f (encode-base64) ;
+    input-stream get output-stream get f (encode-base64) ;
 
 : encode-base64-lines ( -- )
-    input-stream get 0 (encode-base64) ;
+    input-stream get output-stream get 0 (encode-base64) ;
 
 <PRIVATE
 
 : read1-ignoring ( ignoring stream -- ch )
-    dup stream-read1 pick dupd member?
+    dup stream-read1 pick dupd member-eq?
     [ drop read1-ignoring ] [ 2nip ] if ; inline recursive
 
-: push-ignoring ( accum ch -- accum )
-    dup { f 0 } member-eq? [ drop ] [ suffix! ] if ; inline
-
-: read-into-ignoring ( accum n ignoring stream -- accum )
-    '[ _ _ read1-ignoring push-ignoring ] times ; inline
-
 : read-ignoring ( n ignoring stream -- accum )
-    [ [ <sbuf> ] keep ] 2dip read-into-ignoring ; inline
+    pick <sbuf> [
+        '[ _ _ read1-ignoring [ ] _ push-if ] times
+    ] keep ;
 
-: decode4 ( seq -- )
-    [ 0 [ base64>ch swap 6 shift bitor ] reduce 3 >be ]
-    [ [ CHAR: = = ] count ] bi
-    [ write ] [ head-slice* write ] if-zero ; inline
+: decode4 ( a b c d -- x y z )
+    { fixnum fixnum fixnum fixnum } declare {
+        [ base64>ch 2 shift ]
+        [ base64>ch [ -4 shift bitor ] [ 4 bits 4 shift ] bi ]
+        [ base64>ch [ -2 shift bitor ] [ 2 bits 6 shift ] bi ]
+        [ base64>ch bitor ]
+    } spread ; inline
 
-: (decode-base64) ( stream -- )
-    4 "\n\r" pick read-ignoring dup length {
-        { 0 [ 2drop ] }
-        { 4 [ decode4 (decode-base64) ] }
-        [ drop 4 CHAR: = pad-tail decode4 (decode-base64) ]
-    } case ;
+:: (decode-base64) ( input output -- )
+    3 <byte-array> :> data
+    [ B{ CHAR: \n CHAR: \r } input read1-ignoring dup ] [
+        B{ CHAR: \n CHAR: \r } input read1-ignoring CHAR: = or
+        B{ CHAR: \n CHAR: \r } input read1-ignoring CHAR: = or
+        B{ CHAR: \n CHAR: \r } input read1-ignoring CHAR: = or
+        [ decode4 data (3sequence) ] 3keep
+        [ CHAR: = eq? 1 0 ? ] tri@ + +
+        [ head-slice* ] unless-zero
+        output stream-write
+    ] while drop ;
 
 PRIVATE>
 
 : decode-base64 ( -- )
-    input-stream get (decode-base64) ;
+    input-stream get output-stream get (decode-base64) ;
+
+<PRIVATE
+
+: ensure-encode-length ( base64 -- base64 )
+    dup length 3 /mod zero? [ 1 + ] unless 4 *
+    output-stream get expand ;
+
+: ensure-decode-length ( seq -- seq )
+    dup length 4 /mod zero? [ 1 + ] unless 3 *
+    output-stream get expand ;
+
+PRIVATE>
 
 : >base64 ( seq -- base64 )
-    binary [ binary [ encode-base64 ] with-byte-reader ] with-byte-writer ;
+    binary [
+        ensure-encode-length
+        binary [ encode-base64 ] with-byte-reader
+    ] with-byte-writer ;
 
 : base64> ( base64 -- seq )
-    binary [ binary [ decode-base64 ] with-byte-reader ] with-byte-writer ;
+    binary [
+        ensure-decode-length
+        binary [ decode-base64 ] with-byte-reader
+    ] with-byte-writer ;
 
 : >base64-lines ( seq -- base64 )
-    binary [ binary [ encode-base64-lines ] with-byte-reader ] with-byte-writer ;
+    binary [
+        ensure-encode-length
+        binary [ encode-base64-lines ] with-byte-reader
+    ] with-byte-writer ;
+
+: >urlsafe-base64 ( seq -- base64 )
+    >base64 H{
+        { CHAR: + CHAR: - }
+        { CHAR: / CHAR: _ }
+    } substitute ;
+
+: urlsafe-base64> ( base64 -- seq )
+    H{
+        { CHAR: - CHAR: + }
+        { CHAR: _ CHAR: / }
+    } substitute base64> ;
+
+: >urlsafe-base64-lines ( seq -- base64 )
+    >base64-lines H{
+        { CHAR: + CHAR: - }
+        { CHAR: / CHAR: _ }
+    } substitute ;

basis/base64/summary.txt

@@ -1 +1 @@
-Base64 encoding/decoding
+Base64 encoding/decoding (RFC 3548)

basis/binary-search/tags.txt

@@ -1 +1,2 @@
 algorithms
+collections

basis/bit-arrays/bit-arrays.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2007, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.accessors byte-arrays fry io.binary
-kernel kernel.private locals math math.bitwise parser
-prettyprint.custom sequences sequences.private ;
+kernel kernel.private locals math math.bitwise parser sequences
+sequences.private vocabs.loader ;
 IN: bit-arrays
 
 TUPLE: bit-array
@@ -98,6 +98,4 @@ SYNTAX: ?{ \ } [ >bit-array ] parse-literal ;
 
 INSTANCE: bit-array sequence
 
-M: bit-array pprint-delims drop \ ?{ \ } ;
-M: bit-array >pprint-sequence ;
-M: bit-array pprint* pprint-object ;
+{ "bit-arrays" "prettyprint" } "bit-arrays.prettyprint" require-when

basis/bit-arrays/prettyprint/prettyprint.factor

@@ -0,0 +1,6 @@
+USING: bit-arrays kernel prettyprint.custom ;
+IN: bit-arrays.prettyprint
+
+M: bit-array pprint-delims drop \ ?{ \ } ;
+M: bit-array >pprint-sequence ;
+M: bit-array pprint* pprint-object ;

basis/bit-vectors/bit-vectors.factor

@@ -1,8 +1,7 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays kernel kernel.private math sequences
-sequences.private growable bit-arrays prettyprint.custom
-parser accessors vectors.functor classes.parser ;
+USING: bit-arrays classes.parser growable kernel parser
+vectors.functor vocabs.loader ;
 IN: bit-vectors
 
 << "bit-vector" create-class-in \ bit-array \ <bit-array> define-vector >>
@@ -10,6 +9,5 @@ IN: bit-vectors
 SYNTAX: ?V{ \ } [ >bit-vector ] parse-literal ;
 
 M: bit-vector contract 2drop ;
-M: bit-vector >pprint-sequence ;
-M: bit-vector pprint-delims drop \ ?V{ \ } ;
-M: bit-vector pprint* pprint-object ;
+
+{ "bit-vectors" "prettyprint" } "bit-vectors.prettyprint" require-when

basis/bit-vectors/prettyprint/prettyprint.factor

@@ -0,0 +1,7 @@
+USING: bit-vectors kernel prettyprint.custom ;
+IN: bit-vectors.prettyprint
+
+M: bit-vector >pprint-sequence ;
+M: bit-vector pprint-delims drop \ ?V{ \ } ;
+M: bit-vector pprint* pprint-object ;
+

basis/bitstreams/bitstreams.factor

@@ -166,10 +166,10 @@ ERROR: not-enough-bits n bit-reader ;
     bs bytes>> subseq endian> execute( seq -- x )
     n bs subseq-endian execute( bignum n bs -- bits ) ;
 
-M: lsb0-bit-reader peek ( n bs -- bits )
+M: lsb0-bit-reader peek
     \ le> \ subseq>bits-le (peek) ;
 
-M: msb0-bit-reader peek ( n bs -- bits )
+M: msb0-bit-reader peek
     \ be> \ subseq>bits-be (peek) ;
 
 :: bit-writer-bytes ( writer -- bytes )

basis/bootstrap/image/image-docs.factor

@@ -46,7 +46,7 @@ HELP: sub-primitives
 
 ARTICLE: "bootstrap.image" "Bootstrapping new images"
 "A new image can be built from source; this is known as " { $emphasis "bootstrap" } ". Bootstrap is a two-step process. The first stage is the creation of a bootstrap image from a running Factor instance:"
-{ $subsections make-image }
+{ $subsections make-image make-my-image }
 "The second bootstrapping stage is initiated by running the resulting bootstrap image:"
 { $code "./factor -i=boot.x86.32.image" }
 "This stage loads additional code, compiles all words, and creates a final " { $snippet "factor.image" } "."

basis/bootstrap/image/image.factor

@@ -1,15 +1,15 @@
 ! Copyright (C) 2004, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs byte-arrays classes classes.builtin
-classes.private classes.tuple classes.tuple.private combinators
-combinators.short-circuit combinators.smart
-compiler.codegen.relocation compiler.units fry generic
-generic.single.private grouping hashtables hashtables.private io
-io.binary io.encodings.binary io.files io.pathnames kernel
-kernel.private layouts locals make math math.order namespaces
-namespaces.private parser parser.notes prettyprint quotations
-sequences sequences.private source-files strings system vectors
-vocabs words ;
+USING: accessors arrays assocs byte-arrays classes
+classes.builtin classes.private classes.tuple
+classes.tuple.private combinators combinators.short-circuit
+combinators.smart command-line compiler.codegen.relocation
+compiler.units fry generic generic.single.private grouping
+hashtables hashtables.private io io.binary io.encodings.binary
+io.files io.pathnames kernel kernel.private layouts locals make
+math math.order namespaces namespaces.private parser
+parser.notes prettyprint quotations sequences sequences.private
+source-files strings system vectors vocabs words ;
 IN: bootstrap.image
 
 : arch-name ( os cpu -- arch )
@@ -540,3 +540,8 @@ PRIVATE>
 
 : make-my-image ( -- )
     my-arch-name make-image ;
+
+: make-image-main ( -- )
+    command-line get [ make-my-image ] [ [ make-image ] each ] if-empty ;
+
+MAIN: make-image-main

basis/bootstrap/image/primitives/primitives.factor

@@ -778,8 +778,8 @@ CONSTANT: all-primitives {
     {
         "tools.profiler.sampling.private"
         {
-            { "profiling" ( n -- ) "sampling_profiler" { object } { } f }
-            { "(get-samples)" ( -- samples/f ) "get_samples" { } { object } f }
+            { "set-profiling" ( n -- ) "set_profiling" { object } { } f }
+            { "get-samples" ( -- samples/f ) "get_samples" { } { object } f }
         }
     }
     {

basis/bootstrap/image/upload/upload.factor

@@ -1,10 +1,10 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! Copyright (C) 2015 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: bootstrap.image checksums checksums.openssl cli.git fry
-io io.directories io.encodings.ascii io.encodings.utf8 io.files
+USING: bootstrap.image checksums checksums.openssl fry io
+io.directories io.encodings.ascii io.encodings.utf8 io.files
 io.files.temp io.files.unique io.launcher io.pathnames kernel
-make math.parser namespaces sequences splitting system ;
+make math.parser namespaces sequences splitting system unicode ;
 IN: bootstrap.image.upload
 
 SYMBOL: upload-images-destination
@@ -21,7 +21,11 @@ SYMBOL: build-images-destination
     or ;
 
 : factor-git-branch ( -- name )
-    image-path parent-directory git-current-branch ;
+    image-path parent-directory [
+        { "git" "rev-parse" "--abbrev-ref" "HEAD" }
+        utf8 <process-reader> stream-contents
+        [ blank? ] trim-tail
+    ] with-directory ;
 
 : git-branch-destination ( -- dest )
     build-images-destination get
@@ -43,14 +47,7 @@ SYMBOL: build-images-destination
         ] each
     ] with-file-writer ;
 
-! Windows scp doesn't like pathnames with colons, it treats them as hostnames.
-! Workaround for uploading checksums.txt created with temp-file.
-! e.g. C:\Users\\Doug\\AppData\\Local\\Temp/factorcode.org\\Factor/checksums.txt
-! ssh: Could not resolve hostname c: no address associated with name
-
-HOOK: scp-name os ( -- path )
-M: object scp-name "scp" ;
-M: windows scp-name "pscp" ;
+: scp-name ( -- path ) "scp" ;
 
 : upload-images ( -- )
     [

basis/cache/cache.factor

@@ -38,9 +38,9 @@ M: cache-assoc dispose* clear-assoc ;
 PRIVATE>
 
 : purge-cache ( cache -- )
-    [ assoc>> ] [ max-age>> ] bi V{ } clone [
+    dup [ assoc>> ] [ max-age>> ] bi V{ } clone [
         '[
             nip dup age>> 1 + [ >>age ] keep
             _ < [ drop t ] [ _ dispose-to f ] if
-        ] assoc-filter! drop
+        ] assoc-filter >>assoc drop 
     ] keep [ last rethrow ] unless-empty ;

basis/calendar/calendar-docs.factor

@@ -401,6 +401,22 @@ HELP: day-of-year
     }
 } ;
 
+HELP: week-number
+{ $values { "timestamp" timestamp } { "[1,53]" integer } }
+{ $description "Calculates the ISO 8601 week number from 1 to 53 (leap years). See " { $snippet "https://en.wikipedia.org/wiki/ISO_week_date" } }
+{ $examples
+    "Last day of 2018 is already in the first week of 2019."
+    { $example "USING: calendar prettyprint ;"
+               "2018 12 31 <date> week-number ."
+               "1"
+    }
+    "2020 is a leap year with 53 weeks, and January 1st, 2021 is still in week 53 of 2020."
+    { $example "USING: calendar prettyprint ;"
+               "2021 1 1 <date> week-number ."
+               "53"
+    }
+} ;
+
 HELP: sunday
 { $values { "timestamp" timestamp } { "new-timestamp" timestamp } }
 { $description "Returns the Sunday from the current week, which starts on a Sunday." } ;
@@ -573,6 +589,7 @@ ARTICLE: "calendar-facts" "Calendar facts"
     days-in-month
     day-of-year
     day-of-week
+    week-number
 }
 "Calculating a Julian day number:"
 { $subsections julian-day-number }

basis/calendar/calendar-tests.factor

@@ -194,3 +194,9 @@ IN: calendar
 
 ! pm
 [ now 30 pm ] [ not-in-interval? ] must-fail-with
+
+{ 1 } [ 2018 12 31 <date> week-number ] unit-test
+
+{ 16 } [ 2019 4 17 <date> week-number ] unit-test
+
+{ 53 } [ 2021 1 1 <date> week-number ] unit-test

basis/calendar/calendar.factor

@@ -40,10 +40,10 @@ CONSTANT: day-counts { 0 31 28 31 30 31 30 31 31 30 31 30 31 }
 
 GENERIC: leap-year? ( obj -- ? )
 
-M: integer leap-year? ( year -- ? )
+M: integer leap-year?
     dup 100 divisor? 400 4 ? divisor? ;
 
-M: timestamp leap-year? ( timestamp -- ? )
+M: timestamp leap-year?
     year>> leap-year? ;
 
 : (days-in-month) ( year month -- n )
@@ -121,10 +121,10 @@ GENERIC: easter ( obj -- obj' )
 
     h l + 7 m * - 114 + 31 /mod 1 + ;
 
-M: integer easter ( year -- timestamp )
+M: integer easter
     dup easter-month-day <date> ;
 
-M: timestamp easter ( timestamp -- timestamp )
+M: timestamp easter
     clone
     dup year>> easter-month-day
     swapd >>day swap >>month ;
@@ -167,52 +167,52 @@ GENERIC: +second ( timestamp x -- timestamp )
     { [ day>> 29 = ] [ month>> 2 = ] [ leap-year? not ] } 1&&
     [ 3 >>month 1 >>day ] when ;
 
-M: integer +year ( timestamp n -- timestamp )
+M: integer +year
     [ + ] curry change-year adjust-leap-year ;
 
-M: real +year ( timestamp n -- timestamp )
+M: real +year
     [ float>whole-part swapd days-per-year * +day swap +year ] unless-zero ;
 
 : months/years ( n -- months years )
     12 /rem [ 1 - 12 ] when-zero swap ; inline
 
-M: integer +month ( timestamp n -- timestamp )
+M: integer +month
     [ over month>> + months/years [ >>month ] dip +year ] unless-zero ;
 
-M: real +month ( timestamp n -- timestamp )
+M: real +month
     [ float>whole-part swapd average-month * +day swap +month ] unless-zero ;
 
-M: integer +day ( timestamp n -- timestamp )
+M: integer +day
     [
         over >date< julian-day-number + julian-day-number>date
         [ >>year ] [ >>month ] [ >>day ] tri*
     ] unless-zero ;
 
-M: real +day ( timestamp n -- timestamp )
+M: real +day
     [ float>whole-part swapd 24 * +hour swap +day ] unless-zero ;
 
 : hours/days ( n -- hours days )
     24 /rem swap ;
 
-M: integer +hour ( timestamp n -- timestamp )
+M: integer +hour
     [ over hour>> + hours/days [ >>hour ] dip +day ] unless-zero ;
 
-M: real +hour ( timestamp n -- timestamp )
+M: real +hour
     float>whole-part swapd 60 * +minute swap +hour ;
 
 : minutes/hours ( n -- minutes hours )
     60 /rem swap ;
 
-M: integer +minute ( timestamp n -- timestamp )
+M: integer +minute
     [ over minute>> + minutes/hours [ >>minute ] dip +hour ] unless-zero ;
 
-M: real +minute ( timestamp n -- timestamp )
+M: real +minute
     [ float>whole-part swapd 60 * +second swap +minute ] unless-zero ;
 
 : seconds/minutes ( n -- seconds minutes )
     60 /rem swap >integer ;
 
-M: number +second ( timestamp n -- timestamp )
+M: number +second
     [ over second>> + seconds/minutes [ >>second ] dip +minute ] unless-zero ;
 
 : (time+) ( timestamp duration -- timestamp' duration )
@@ -291,8 +291,7 @@ GENERIC: time- ( time1 time2 -- time3 )
         [ neg +year   0 ] change-year drop
     ] if ;
 
-M: timestamp <=> ( ts1 ts2 -- n )
-    [ >gmt tuple-slots ] compare ;
+M: timestamp <=> [ >gmt tuple-slots ] compare ;
 
 : same-day? ( ts1 ts2 -- ? )
     [ >gmt >date< <date> ] same? ;
@@ -376,8 +375,9 @@ M: duration time-
 
 GENERIC: days-in-year ( obj -- n )
 
-M: integer days-in-year ( year -- n ) leap-year? 366 365 ? ;
-M: timestamp days-in-year ( timestamp -- n ) year>> days-in-year ;
+M: integer days-in-year leap-year? 366 365 ? ;
+
+M: timestamp days-in-year year>> days-in-year ;
 
 : days-in-month ( timestamp -- n )
     >date< drop (days-in-month) ;
@@ -538,6 +538,16 @@ M: integer end-of-year 12 31 <date> ;
 : unix-time>timestamp ( seconds -- timestamp )
     [ unix-1970 ] dip +second ; inline
 
+: (week-number) ( timestamp -- [0,53] )
+    [ day-of-year ] [ day-of-week [ 7 ] when-zero ] bi - 10 + 7 /i ;
+
+: week-number ( timestamp -- [1,53] )
+    dup (week-number) {
+        {  0 [ year>> 1 - end-of-year (week-number) ] }
+        { 53 [ year>> 1 + <year> (week-number) 1 = 1 53 ? ] }
+        [ nip ]
+    } case ;
+
 {
     { [ os unix? ] [ "calendar.unix" ] }
     { [ os windows? ] [ "calendar.windows" ] }

basis/calendar/format/format.factor

@@ -52,15 +52,15 @@ MACRO: formatted ( spec -- quot )
 
 GENERIC: day. ( obj -- )
 
-M: integer day. ( n -- )
+M: integer day.
     number>string dup length 2 < [ bl ] when write ;
 
-M: timestamp day. ( timestamp -- )
+M: timestamp day.
     day>> day. ;
 
 GENERIC: month. ( obj -- )
 
-M: array month. ( pair -- )
+M: array month.
     first2
     [ month-name write bl number>string print ]
     [ 1 zeller-congruence ]
@@ -71,15 +71,15 @@ M: array month. ( pair -- )
         1 + + 7 mod zero? [ nl ] [ bl ] if
     ] with each-integer nl ;
 
-M: timestamp month. ( timestamp -- )
+M: timestamp month.
     [ year>> ] [ month>> ] bi 2array month. ;
 
 GENERIC: year. ( obj -- )
 
-M: integer year. ( n -- )
+M: integer year.
     12 [ 1 + 2array month. nl ] with each-integer ;
 
-M: timestamp year. ( timestamp -- )
+M: timestamp year.
     year>> year. ;
 
 : timestamp>mdtm ( timestamp -- str )

basis/calendar/format/tags.txt

@@ -0,0 +1 @@
+time

basis/calendar/unix/unix.factor

@@ -31,7 +31,7 @@ IN: calendar.unix
 : timezone-name ( -- string )
     get-time zone>> ;
 
-M: unix gmt-offset ( -- hours minutes seconds )
+M: unix gmt-offset
     get-time gmtoff>> 3600 /mod 60 /mod ;
 
 : current-timeval ( -- timeval )

basis/calendar/windows/windows.factor

@@ -28,10 +28,10 @@ IN: calendar.windows
         [ [ wSecond>> ] [ wMilliseconds>> 1000 / ] bi + ]
     } cleave instant <timestamp> ;
 
-M: windows gmt-offset ( -- hours minutes seconds )
+M: windows gmt-offset
     TIME_ZONE_INFORMATION <struct>
     dup GetTimeZoneInformation {
-        { TIME_ZONE_ID_INVALID [ win32-error-string throw ] }
+        { TIME_ZONE_ID_INVALID [ win32-error ] }
         { TIME_ZONE_ID_UNKNOWN [ Bias>> ] }
         { TIME_ZONE_ID_STANDARD [ Bias>> ] }
         { TIME_ZONE_ID_DAYLIGHT [ [ Bias>> ] [ DaylightBias>> ] bi + ] }

basis/channels/channels.factor

@@ -31,11 +31,11 @@ GENERIC: from ( channel -- value )
 
 PRIVATE>
 
-M: channel to ( value channel -- )
+M: channel to
     dup receivers>>
     [ dup wait to ] [ nip (to) ] if-empty ;
 
-M: channel from ( channel -- value )
+M: channel from
     [ self ] dip
     notify senders>>
     [ (from) ] unless-empty

basis/channels/remote/remote.factor

@@ -60,10 +60,10 @@ C: <remote-channel> remote-channel
 
 PRIVATE>
 
-M: remote-channel to ( value remote-channel -- )
+M: remote-channel to
     [ id>> swap to-message boa ] keep send-message drop ;
 
-M: remote-channel from ( remote-channel -- value )
+M: remote-channel from
     [ id>> from-message boa ] keep send-message ;
 
 [

basis/checksums/adler-32/adler-32.factor

@@ -8,10 +8,10 @@ SINGLETON: adler-32
 
 CONSTANT: adler-32-modulus 65521
 
-M: adler-32 checksum-bytes ( bytes checksum -- value )
+M: adler-32 checksum-bytes
     drop
     [ sum 1 + ]
-    [ [ dup length [1,b] <reversed> v. ] [ length ] bi + ] bi
+    [ [ dup length [1,b] <reversed> vdot ] [ length ] bi + ] bi
     [ adler-32-modulus mod ] bi@ 16 shift bitor ;
 
 INSTANCE: adler-32 checksum

basis/checksums/bsd/bsd.factor

@@ -5,7 +5,7 @@ IN: checksums.bsd
 
 SINGLETON: bsd
 
-M: bsd checksum-bytes ( bytes checksum -- value )
+M: bsd checksum-bytes
     drop 0 [
         [ [ -1 shift ] [ 1 bitand 15 shift ] bi + ] dip
         + 0xffff bitand

basis/checksums/fnv1/fnv1.factor

@@ -38,67 +38,67 @@ CONSTANT: fnv1-256-basis 0xdd268dbcaac550362d98c384c4e576ccc8b1536847b6bbb31023b
 CONSTANT: fnv1-512-basis 0xb86db0b1171f4416dca1e50f309990acac87d059c90000000000000000000d21e948f68a34c192f62ea79bc942dbe7ce182036415f56e34bac982aac4afe9fd9
 CONSTANT: fnv1-1024-basis 0x5f7a76758ecc4d32e56d5a591028b74b29fc4223fdada16c3bf34eda3674da9a21d9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c6d7eb6e73802734510a555f256cc005ae556bde8cc9c6a93b21aff4b16c71ee90b3
 
-M: fnv1-32 checksum-bytes ( bytes checksum -- value )
+M: fnv1-32 checksum-bytes
     drop
     fnv1-32-basis swap
     [ swap fnv1-32-prime * bitxor fnv1-32-mod bitand ] each ;
 
-M: fnv1a-32 checksum-bytes ( bytes checksum -- value )
+M: fnv1a-32 checksum-bytes
     drop
     fnv1-32-basis swap
     [ bitxor fnv1-32-prime * fnv1-32-mod bitand ] each ;
 
 
-M: fnv1-64 checksum-bytes ( bytes checksum -- value )
+M: fnv1-64 checksum-bytes
     drop
     fnv1-64-basis swap
     [ swap fnv1-64-prime * bitxor fnv1-64-mod bitand ] each ;
 
-M: fnv1a-64 checksum-bytes ( bytes checksum -- value )
+M: fnv1a-64 checksum-bytes
     drop
     fnv1-64-basis swap
     [ bitxor fnv1-64-prime * fnv1-64-mod bitand ] each ;
 
 
-M: fnv1-128 checksum-bytes ( bytes checksum -- value )
+M: fnv1-128 checksum-bytes
     drop
     fnv1-128-basis swap
     [ swap fnv1-128-prime * bitxor fnv1-128-mod bitand ] each ;
 
-M: fnv1a-128 checksum-bytes ( bytes checksum -- value )
+M: fnv1a-128 checksum-bytes
     drop
     fnv1-128-basis swap
     [ bitxor fnv1-128-prime * fnv1-128-mod bitand ] each ;
 
 
-M: fnv1-256 checksum-bytes ( bytes checksum -- value )
+M: fnv1-256 checksum-bytes
     drop
     fnv1-256-basis swap
     [ swap fnv1-256-prime * bitxor fnv1-256-mod bitand ] each ;
 
-M: fnv1a-256 checksum-bytes ( bytes checksum -- value )
+M: fnv1a-256 checksum-bytes
     drop
     fnv1-256-basis swap
     [ bitxor fnv1-256-prime * fnv1-256-mod bitand ] each ;
 
 
-M: fnv1-512 checksum-bytes ( bytes checksum -- value )
+M: fnv1-512 checksum-bytes
     drop
     fnv1-512-basis swap
     [ swap fnv1-512-prime * bitxor fnv1-512-mod bitand ] each ;
 
-M: fnv1a-512 checksum-bytes ( bytes checksum -- value )
+M: fnv1a-512 checksum-bytes
     drop
     fnv1-512-basis swap
     [ bitxor fnv1-512-prime * fnv1-512-mod bitand ] each ;
 
 
-M: fnv1-1024 checksum-bytes ( bytes checksum -- value )
+M: fnv1-1024 checksum-bytes
     drop
     fnv1-1024-basis swap
     [ swap fnv1-1024-prime * bitxor fnv1-1024-mod bitand ] each ;
 
-M: fnv1a-1024 checksum-bytes ( bytes checksum -- value )
+M: fnv1a-1024 checksum-bytes
     drop
     fnv1-1024-basis swap
     [ bitxor fnv1-1024-prime * fnv1-1024-mod bitand ] each ;

basis/checksums/murmur/murmur.factor

@@ -47,7 +47,7 @@ CONSTANT: n 0xe6546b64
 
 PRIVATE>
 
-M: murmur3-32 checksum-bytes ( bytes checksum -- value )
+M: murmur3-32 checksum-bytes
     seed>> 32 bits main-loop end-case avalanche ;
 
 INSTANCE: murmur3-32 checksum

basis/checksums/openssl/openssl.factor

@@ -38,13 +38,13 @@ M: evp-md-context dispose*
 : set-digest ( name ctx -- )
     handle>> swap digest-named f EVP_DigestInit_ex ssl-error ;
 
-M: openssl-checksum initialize-checksum-state ( checksum -- evp-md-context )
+M: openssl-checksum initialize-checksum-state
     maybe-init-ssl name>> <evp-md-context> [ set-digest ] keep ;
 
-M: evp-md-context add-checksum-bytes ( ctx bytes -- ctx' )
+M: evp-md-context add-checksum-bytes
     [ dup handle>> ] dip dup length EVP_DigestUpdate ssl-error ;
 
-M: evp-md-context get-checksum ( ctx -- value )
+M: evp-md-context get-checksum
     handle>>
     { { int EVP_MAX_MD_SIZE } int }
     [ EVP_DigestFinal_ex ssl-error ] with-out-parameters

basis/classes/struct/prettyprint/prettyprint.factor

@@ -116,7 +116,7 @@ M: struct-mirror delete-at
 M: struct-mirror clear-assoc
     object>> reset-struct-slots ;
 
-M: struct-mirror >alist ( mirror -- alist )
+M: struct-mirror >alist
     object>> [
         [ drop "underlying" ] [ >c-ptr ] bi 2array 1array
     ] [

basis/cocoa/types/types.factor

@@ -1,9 +1,11 @@
 ! Copyright (C) 2006, 2009 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types alien.syntax classes.struct cocoa.runtime
-core-graphics.types ;
+core-graphics.types kernel literals layouts ;
 IN: cocoa.types
 
+CONSTANT: NSNotFound $[ 32bit? 0x7fffffff 0x7fffffffffffffff ? ]
+
 TYPEDEF: long NSInteger
 TYPEDEF: ulong NSUInteger
 

basis/colors/cmyk/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/constants/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/gray/gray.factor

@@ -7,7 +7,7 @@ TUPLE: gray < color { gray read-only } { alpha read-only } ;
 
 C: <gray> gray
 
-M: gray >rgba ( gray -- rgba )
+M: gray >rgba
     [ gray>> dup dup ] [ alpha>> ] bi <rgba> ; inline
 
 M: gray red>> gray>> ;

basis/colors/gray/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/hex/hex.factor

@@ -6,12 +6,15 @@ lexer math math.parser sequences ;
 
 IN: colors.hex
 
+ERROR: invalid-hex-color hex ;
+
 : hex>rgba ( hex -- rgba )
     dup length {
         { 6 [ 2 group [ hex> 255 /f ] map first3 1.0 ] }
         { 8 [ 2 group [ hex> 255 /f ] map first4 ] }
         { 3 [ [ digit> 15 /f ] { } map-as first3 1.0 ] }
         { 4 [ [ digit> 15 /f ] { } map-as first4 ] }
+        [ drop invalid-hex-color ]
     } case <rgba> ;
 
 : rgba>hex ( rgba -- hex )

basis/colors/hex/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/hsl/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/hsv/hsv.factor

@@ -29,7 +29,7 @@ C: <hsva> hsva
 
 PRIVATE>
 
-M: hsva >rgba ( hsva -- rgba )
+M: hsva >rgba
     [
         dup Hi
         {

basis/colors/hsv/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/lab/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/lch/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/luv/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/mix/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/ryb/ryb.factor

@@ -61,7 +61,7 @@ C: <ryba> ryba
 
 PRIVATE>
 
-M: ryba >rgba ( ryba -- rgba )
+M: ryba >rgba
     [
         [ red>> ] [ yellow>> ] [ blue>> ] tri
         [ ryb>rgb ] normalized

basis/colors/ryb/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/xyy/tags.txt

@@ -0,0 +1 @@
+colors

basis/colors/xyz/tags.txt

@@ -0,0 +1 @@
+colors