Merge branch 'clean-linux-x86-32' of git://factorcode.org/git/factor
Eduardo Cavazos
commit
c648220bb5
109
README.txt
109
README.txt
|
|
@ -6,7 +6,6 @@ implementation. It is not an introduction to the language itself.
|
|||
|
||||
* Contents
|
||||
|
||||
- Platform support
|
||||
- Compiling the Factor VM
|
||||
- Libraries needed for compilation
|
||||
- Bootstrapping the Factor image
|
||||
|
|
@ -19,80 +18,50 @@ implementation. It is not an introduction to the language itself.
|
|||
- Source organization
|
||||
- Community
|
||||
|
||||
* Platform support
|
||||
|
||||
Factor supports the following platforms:
|
||||
|
||||
Linux/x86
|
||||
Linux/AMD64
|
||||
Linux/PowerPC
|
||||
Linux/ARM
|
||||
Mac OS X/x86
|
||||
Mac OS X/PowerPC
|
||||
FreeBSD/x86
|
||||
FreeBSD/AMD64
|
||||
OpenBSD/x86
|
||||
OpenBSD/AMD64
|
||||
Solaris/x86
|
||||
Solaris/AMD64
|
||||
MS Windows/x86 (XP and above)
|
||||
MS Windows CE/ARM
|
||||
|
||||
Please donate time or hardware if you wish to see Factor running on
|
||||
other platforms. In particular, we are interested in:
|
||||
|
||||
Windows/AMD64
|
||||
Mac OS X/AMD64
|
||||
Solaris/UltraSPARC
|
||||
Linux/MIPS
|
||||
|
||||
* Compiling the Factor VM
|
||||
|
||||
The Factor runtime is written in GNU C99, and is built with GNU make and
|
||||
gcc.
|
||||
|
||||
Factor requires gcc 3.4 or later. On x86, it /will not/ build using gcc
|
||||
3.3 or earlier. If you are using gcc 4.3, you might get an unusable
|
||||
Factor binary unless you add 'SITE_CFLAGS=-fno-forward-propagate' to the
|
||||
command-line arguments for make.
|
||||
Factor supports various platforms. For an up-to-date list, see
|
||||
<http://factorcode.org/getfactor.fhtml>.
|
||||
|
||||
Run 'make' (or 'gmake' on *BSD) with no parameters to see a list of
|
||||
targets and build options. Then run 'make' with the appropriate target
|
||||
for your platform.
|
||||
Factor requires gcc 3.4 or later.
|
||||
|
||||
On x86, Factor /will not/ build using gcc 3.3 or earlier.
|
||||
|
||||
If you are using gcc 4.3, you might get an unusable Factor binary unless
|
||||
you add 'SITE_CFLAGS=-fno-forward-propagate' to the command-line
|
||||
arguments for make.
|
||||
|
||||
Run 'make' ('gmake' on *BSD) with no parameters to build the Factor VM.
|
||||
|
||||
Compilation will yield an executable named 'factor' on Unix,
|
||||
'factor-nt.exe' on Windows XP/Vista, and 'factor-ce.exe' on Windows CE.
|
||||
'factor.exe' on Windows XP/Vista, and 'factor-ce.exe' on Windows CE.
|
||||
|
||||
* Libraries needed for compilation
|
||||
|
||||
For X11 support, you need recent development libraries for libc, Freetype,
|
||||
X11, OpenGL and GLUT. On a Debian-derived Linux distribution (like Ubuntu),
|
||||
you can use the line
|
||||
For X11 support, you need recent development libraries for libc,
|
||||
Freetype, X11, OpenGL and GLUT. On a Debian-derived Linux distribution
|
||||
(like Ubuntu), you can use the line
|
||||
|
||||
sudo apt-get install libc6-dev libfreetype6-dev libx11-dev glutg3-dev
|
||||
sudo apt-get install libc6-dev libfreetype6-dev libx11-dev glutg3-dev
|
||||
|
||||
to grab everything (if you're on a non-debian-derived distro please tell us
|
||||
what the equivalent command is on there and it can be added :)
|
||||
to grab everything (if you're on a non-debian-derived distro please tell
|
||||
us what the equivalent command is on there and it can be added).
|
||||
|
||||
* Bootstrapping the Factor image
|
||||
|
||||
The boot images are no longer included with the Factor distribution
|
||||
due to size concerns. Instead, download a boot image from:
|
||||
|
||||
http://factorcode.org/images/
|
||||
|
||||
Once you have compiled the Factor runtime, you must bootstrap the Factor
|
||||
system using the image that corresponds to your CPU architecture.
|
||||
|
||||
Once you download the right image, bootstrap the system with the
|
||||
Boot images can be obtained from <http://factorcode.org/images/latest/>.
|
||||
|
||||
Once you download the right image, bootstrap Factor with the
|
||||
following command line:
|
||||
|
||||
./factor -i=boot.<cpu>.image
|
||||
|
||||
Or this command for Mac OS X systems:
|
||||
|
||||
./Factor.app/Contents/MacOS/factor -i=boot.<cpu>.image
|
||||
|
||||
Bootstrap can take a while, depending on your system. When the process
|
||||
completes, a 'factor.image' file will be generated. Note that this image
|
||||
is both CPU and OS-specific, so in general cannot be shared between
|
||||
|
|
@ -122,9 +91,8 @@ The latter keeps the terminal listener running.
|
|||
|
||||
* Running Factor on Mac OS X - Cocoa UI
|
||||
|
||||
On Mac OS X 10.4 and later, a Cocoa UI is available in addition to the
|
||||
terminal listener. If you are using Mac OS X 10.3, you can only run the
|
||||
X11 UI, as documented in the next section.
|
||||
On Mac OS X, a Cocoa UI is available in addition to the terminal
|
||||
listener.
|
||||
|
||||
The 'factor' executable runs the terminal listener:
|
||||
|
||||
|
|
@ -136,17 +104,16 @@ contains factor.image and the library sources.
|
|||
|
||||
* Running Factor on Mac OS X - X11 UI
|
||||
|
||||
The X11 UI is available on Mac OS X, however its use is not recommended
|
||||
since it does not integrate with the host OS. However, if you are
|
||||
running Mac OS X 10.3, it is your only choice.
|
||||
The X11 UI is also available on Mac OS X, however its use is not
|
||||
recommended since it does not integrate with the host OS.
|
||||
|
||||
When compiling Factor, pass the X11=1 parameter:
|
||||
|
||||
make macosx-ppc X11=1
|
||||
make X11=1
|
||||
|
||||
Then bootstrap with the following switches:
|
||||
|
||||
./factor -i=boot.ppc.image -ui-backend=x11
|
||||
./factor -i=boot.<cpu>.image -ui-backend=x11
|
||||
|
||||
Now if $DISPLAY is set, running ./factor will start the UI.
|
||||
|
||||
|
|
@ -155,40 +122,36 @@ Now if $DISPLAY is set, running ./factor will start the UI.
|
|||
If you did not download the binary package, you can bootstrap Factor in
|
||||
the command prompt:
|
||||
|
||||
factor-nt.exe -i=boot.x86.32.image
|
||||
factor.exe -i=boot.<cpu>.image
|
||||
|
||||
Once bootstrapped, double-clicking factor.exe starts the Factor UI.
|
||||
|
||||
To run the listener in the command prompt:
|
||||
|
||||
factor-nt.exe -run=listener
|
||||
factor.exe -run=listener
|
||||
|
||||
* The Factor FAQ
|
||||
|
||||
The Factor FAQ lives online at http://factorcode.org/faq.fhtml
|
||||
The Factor FAQ is available at <http://factorcode.org/faq.fhtml>.
|
||||
|
||||
* Command line usage
|
||||
|
||||
The Factor VM supports a number of command line switches. To read
|
||||
command line usage documentation, either enter the following in the UI
|
||||
listener:
|
||||
Factor supports a number of command line switches. To read command line
|
||||
usage documentation, enter the following in the UI listener:
|
||||
|
||||
"command-line" about
|
||||
|
||||
* Source organization
|
||||
|
||||
The following two directories are managed by the module system; consult
|
||||
the documentation for details:
|
||||
The Factor source tree is organized as follows:
|
||||
|
||||
build-support/ - scripts used for compiling Factor
|
||||
core/ - Factor core library and compiler
|
||||
extra/ - more libraries
|
||||
|
||||
The following directories contain additional files:
|
||||
|
||||
misc/ - editor modes, icons, etc
|
||||
vm/ - sources for the Factor runtime, written in C
|
||||
fonts/ - TrueType fonts used by UI
|
||||
misc/ - editor modes, icons, etc
|
||||
unmaintained/ - unmaintained contributions, please help!
|
||||
vm/ - sources for the Factor VM, written in C
|
||||
|
||||
* Community
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ TUPLE: library path abi dll ;
|
|||
: library ( name -- library ) libraries get at ;
|
||||
|
||||
: <library> ( path abi -- library )
|
||||
over dup [ dlopen ] when \ library construct-boa ;
|
||||
over dup [ dlopen ] when \ library boa ;
|
||||
|
||||
: load-library ( name -- dll )
|
||||
library dup [ library-dll ] when ;
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@ boxer prep unboxer
|
|||
getter setter
|
||||
reg-class size align stack-align? ;
|
||||
|
||||
: construct-c-type ( class -- type )
|
||||
construct-empty
|
||||
: new-c-type ( class -- type )
|
||||
new
|
||||
int-regs >>reg-class ;
|
||||
|
||||
: <c-type> ( -- type )
|
||||
\ c-type construct-c-type ;
|
||||
\ c-type new-c-type ;
|
||||
|
||||
SYMBOL: c-types
|
||||
|
||||
|
|
@ -189,7 +189,7 @@ DEFER: >c-ushort-array
|
|||
TUPLE: long-long-type < c-type ;
|
||||
|
||||
: <long-long-type> ( -- type )
|
||||
long-long-type construct-c-type ;
|
||||
long-long-type new-c-type ;
|
||||
|
||||
M: long-long-type unbox-parameter ( n type -- )
|
||||
c-type-unboxer %unbox-long-long ;
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ M: no-such-library compiler-error-type
|
|||
drop +linkage+ ;
|
||||
|
||||
: no-such-library ( name -- )
|
||||
\ no-such-library construct-boa
|
||||
\ no-such-library boa
|
||||
compiling-word get compiler-error ;
|
||||
|
||||
TUPLE: no-such-symbol name ;
|
||||
|
|
@ -232,7 +232,7 @@ M: no-such-symbol compiler-error-type
|
|||
drop +linkage+ ;
|
||||
|
||||
: no-such-symbol ( name -- )
|
||||
\ no-such-symbol construct-boa
|
||||
\ no-such-symbol boa
|
||||
compiling-word get compiler-error ;
|
||||
|
||||
: check-dlsym ( symbols dll -- )
|
||||
|
|
@ -251,7 +251,7 @@ M: no-such-symbol compiler-error-type
|
|||
\ alien-invoke [
|
||||
! Four literals
|
||||
4 ensure-values
|
||||
#alien-invoke construct-empty
|
||||
#alien-invoke new
|
||||
! Compile-time parameters
|
||||
pop-parameters >>parameters
|
||||
pop-literal nip >>function
|
||||
|
|
@ -288,7 +288,7 @@ M: alien-indirect-error summary
|
|||
! Three literals and function pointer
|
||||
4 ensure-values
|
||||
4 reify-curries
|
||||
#alien-indirect construct-empty
|
||||
#alien-indirect new
|
||||
! Compile-time parameters
|
||||
pop-literal nip >>abi
|
||||
pop-parameters >>parameters
|
||||
|
|
@ -335,7 +335,7 @@ M: alien-callback-error summary
|
|||
|
||||
\ alien-callback [
|
||||
4 ensure-values
|
||||
#alien-callback construct-empty dup node,
|
||||
#alien-callback new dup node,
|
||||
pop-literal nip >>quot
|
||||
pop-literal nip >>abi
|
||||
pop-parameters >>parameters
|
||||
|
|
@ -381,7 +381,7 @@ TUPLE: callback-context ;
|
|||
: wrap-callback-quot ( node -- quot )
|
||||
[
|
||||
[ quot>> ] [ prepare-callback-return ] bi append ,
|
||||
[ callback-context construct-empty do-callback ] %
|
||||
[ callback-context new do-callback ] %
|
||||
] [ ] make ;
|
||||
|
||||
: %unnest-stacks ( -- ) "unnest_stacks" f %alien-invoke ;
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ M: struct-type stack-size
|
|||
|
||||
: (define-struct) ( name vocab size align fields -- )
|
||||
>r [ align ] keep r>
|
||||
struct-type construct-boa
|
||||
struct-type boa
|
||||
-rot define-c-type ;
|
||||
|
||||
: make-field ( struct-name vocab type field-name -- spec )
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ M: array resize resize-array ;
|
|||
|
||||
: >array ( seq -- array ) { } clone-like ;
|
||||
|
||||
M: object new drop f <array> ;
|
||||
M: object new-sequence drop f <array> ;
|
||||
|
||||
M: f new drop dup zero? [ drop f ] [ f <array> ] if ;
|
||||
M: f new-sequence drop dup zero? [ drop f ] [ f <array> ] if ;
|
||||
|
||||
M: array like drop dup array? [ >array ] unless ;
|
||||
|
||||
|
|
|
|||
|
|
@ -69,14 +69,14 @@ ARTICLE: "assocs-lookup" "Lookup and querying of assocs"
|
|||
ARTICLE: "assocs-sets" "Set-theoretic operations on assocs"
|
||||
"It is often useful to use the keys of an associative mapping as a set, exploiting the constant or logarithmic lookup time of most implementations (" { $link "alists" } " being a notable exception)."
|
||||
{ $subsection subassoc? }
|
||||
{ $subsection intersect }
|
||||
{ $subsection assoc-intersect }
|
||||
{ $subsection update }
|
||||
{ $subsection union }
|
||||
{ $subsection diff }
|
||||
{ $subsection assoc-union }
|
||||
{ $subsection assoc-diff }
|
||||
{ $subsection remove-all }
|
||||
{ $subsection substitute }
|
||||
{ $subsection substitute-here }
|
||||
{ $see-also key? } ;
|
||||
{ $see-also key? assoc-contains? assoc-all? "sets" } ;
|
||||
|
||||
ARTICLE: "assocs-mutation" "Storing keys and values in assocs"
|
||||
"Utility operations built up from the " { $link "assocs-protocol" } ":"
|
||||
|
|
@ -97,6 +97,7 @@ $nl
|
|||
{ $subsection assoc-map }
|
||||
{ $subsection assoc-push-if }
|
||||
{ $subsection assoc-subset }
|
||||
{ $subsection assoc-contains? }
|
||||
{ $subsection assoc-all? }
|
||||
"Three additional combinators:"
|
||||
{ $subsection cache }
|
||||
|
|
@ -206,9 +207,13 @@ HELP: assoc-subset
|
|||
{ $values { "assoc" assoc } { "quot" "a quotation with stack effect " { $snippet "( key value -- ? )" } } { "subassoc" "a new assoc" } }
|
||||
{ $description "Outputs an assoc of the same type as " { $snippet "assoc" } " consisting of all entries for which the predicate quotation yields true." } ;
|
||||
|
||||
HELP: assoc-contains?
|
||||
{ $values { "assoc" assoc } { "quot" "a quotation with stack effect " { $snippet "( key value -- ? )" } } { "?" "a boolean" } }
|
||||
{ $description "Tests if the assoc contains an entry satisfying a predicate by applying the quotation to each entry in turn. Iteration stops if an entry is found for which the quotation outputs a true value." } ;
|
||||
|
||||
HELP: assoc-all?
|
||||
{ $values { "assoc" assoc } { "quot" "a quotation with stack effect " { $snippet "( key value -- ? )" } } { "?" "a boolean" } }
|
||||
{ $description "Applies a predicate quotation to entry in the assoc. Outputs true if the assoc yields true for each entry (which includes the case where the assoc is empty)." } ;
|
||||
{ $description "Tests if all entries in the assoc satisfy a predicate by applying the quotation to each entry in turn. a predicate quotation to entry in the assoc. Iteration stops if an entry is found for which the quotation outputs " { $link f } ". If the assoc is empty, always outputs " { $link t } "." } ;
|
||||
|
||||
HELP: subassoc?
|
||||
{ $values { "assoc1" assoc } { "assoc2" assoc } { "?" "a new assoc" } }
|
||||
|
|
@ -260,7 +265,7 @@ HELP: values
|
|||
|
||||
{ keys values } related-words
|
||||
|
||||
HELP: intersect
|
||||
HELP: assoc-intersect
|
||||
{ $values { "assoc1" assoc } { "assoc2" assoc } { "intersection" "a new assoc" } }
|
||||
{ $description "Outputs an assoc consisting of all entries from " { $snippet "assoc2" } " such that the key is also present in " { $snippet "assoc1" } "." }
|
||||
{ $notes "The values of the keys in " { $snippet "assoc1" } " are disregarded, so this word is usually used for set-theoretic calculations where the assoc in question either has dummy sentinels as values, or the values equal the keys." } ;
|
||||
|
|
@ -270,11 +275,11 @@ HELP: update
|
|||
{ $description "Adds all entries from " { $snippet "assoc2" } " to " { $snippet "assoc1" } "." }
|
||||
{ $side-effects "assoc1" } ;
|
||||
|
||||
HELP: union
|
||||
HELP: assoc-union
|
||||
{ $values { "assoc1" assoc } { "assoc2" assoc } { "union" "a new assoc" } }
|
||||
{ $description "Outputs a assoc consisting of all entries from " { $snippet "assoc1" } " and " { $snippet "assoc2" } ", with entries from " { $snippet "assoc2" } " taking precedence in case the corresponding values are not equal." } ;
|
||||
|
||||
HELP: diff
|
||||
HELP: assoc-diff
|
||||
{ $values { "assoc1" assoc } { "assoc2" assoc } { "diff" "a new assoc" } }
|
||||
{ $description "Outputs an assoc consisting of all entries from " { $snippet "assoc2" } " whose key is not contained in " { $snippet "assoc1" } "." }
|
||||
;
|
||||
|
|
|
|||
|
|
@ -58,24 +58,24 @@ H{ } clone "cache-test" set
|
|||
] [
|
||||
H{ { "factor" "rocks" } { "dup" "sq" } { 3 4 } }
|
||||
H{ { "factor" "rocks" } { 1 2 } { 2 3 } { 3 4 } }
|
||||
intersect
|
||||
assoc-intersect
|
||||
] unit-test
|
||||
|
||||
[
|
||||
H{ { 1 2 } { 2 3 } { 6 5 } }
|
||||
] [
|
||||
H{ { 2 4 } { 6 5 } } H{ { 1 2 } { 2 3 } }
|
||||
union
|
||||
assoc-union
|
||||
] unit-test
|
||||
|
||||
[ H{ { 1 2 } { 2 3 } } t ] [
|
||||
f H{ { 1 2 } { 2 3 } } [ union ] 2keep swap union dupd =
|
||||
f H{ { 1 2 } { 2 3 } } [ assoc-union ] 2keep swap assoc-union dupd =
|
||||
] unit-test
|
||||
|
||||
[
|
||||
H{ { 1 f } }
|
||||
] [
|
||||
H{ { 1 f } } H{ { 1 f } } intersect
|
||||
H{ { 1 f } } H{ { 1 f } } assoc-intersect
|
||||
] unit-test
|
||||
|
||||
[ { 1 3 } ] [ H{ { 2 2 } } { 1 2 3 } remove-all ] unit-test
|
||||
|
|
|
|||
|
|
@ -109,17 +109,17 @@ M: assoc assoc-clone-like ( assoc exemplar -- newassoc )
|
|||
>r over r> hashcode* 2/ >r dupd hashcode* r> bitxor
|
||||
] { } assoc>map hashcode* ;
|
||||
|
||||
: intersect ( assoc1 assoc2 -- intersection )
|
||||
: assoc-intersect ( assoc1 assoc2 -- intersection )
|
||||
swap [ nip key? ] curry assoc-subset ;
|
||||
|
||||
: update ( assoc1 assoc2 -- )
|
||||
swap [ swapd set-at ] curry assoc-each ;
|
||||
|
||||
: union ( assoc1 assoc2 -- union )
|
||||
: assoc-union ( assoc1 assoc2 -- union )
|
||||
2dup [ assoc-size ] bi@ + pick new-assoc
|
||||
[ rot update ] keep [ swap update ] keep ;
|
||||
|
||||
: diff ( assoc1 assoc2 -- diff )
|
||||
: assoc-diff ( assoc1 assoc2 -- diff )
|
||||
swap [ nip key? not ] curry assoc-subset ;
|
||||
|
||||
: remove-all ( assoc seq -- subseq )
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ M: bit-array clone (clone) ;
|
|||
|
||||
M: bit-array like drop dup bit-array? [ >bit-array ] unless ;
|
||||
|
||||
M: bit-array new drop <bit-array> ;
|
||||
M: bit-array new-sequence drop <bit-array> ;
|
||||
|
||||
M: bit-array equal?
|
||||
over bit-array? [ sequence= ] [ 2drop f ] if ;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ IN: bit-vectors
|
|||
<PRIVATE
|
||||
|
||||
: bit-array>vector ( bit-array length -- bit-vector )
|
||||
bit-vector construct-boa ; inline
|
||||
bit-vector boa ; inline
|
||||
|
||||
PRIVATE>
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ M: bit-vector like
|
|||
[ dup length bit-array>vector ] [ >bit-vector ] if
|
||||
] unless ;
|
||||
|
||||
M: bit-vector new
|
||||
M: bit-vector new-sequence
|
||||
drop [ <bit-array> ] keep >fixnum bit-array>vector ;
|
||||
|
||||
M: bit-vector equal?
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ nl
|
|||
"." write flush
|
||||
|
||||
{
|
||||
new nth push pop peek
|
||||
new-sequence nth push pop peek
|
||||
} compile
|
||||
|
||||
"." write flush
|
||||
|
|
|
|||
|
|
@ -36,4 +36,4 @@ tag-numbers get H{
|
|||
{ word 17 }
|
||||
{ byte-array 18 }
|
||||
{ tuple-layout 19 }
|
||||
} union type-numbers set
|
||||
} assoc-union type-numbers set
|
||||
|
|
|
|||
|
|
@ -390,7 +390,7 @@ define-builtin
|
|||
|
||||
! Create special tombstone values
|
||||
"tombstone" "hashtables.private" create
|
||||
"tuple" "kernel" lookup
|
||||
tuple
|
||||
{ } define-tuple-class
|
||||
|
||||
"((empty))" "hashtables.private" create
|
||||
|
|
@ -403,7 +403,7 @@ define-builtin
|
|||
|
||||
! Some tuple classes
|
||||
"hashtable" "hashtables" create
|
||||
"tuple" "kernel" lookup
|
||||
tuple
|
||||
{
|
||||
{
|
||||
{ "array-capacity" "sequences.private" }
|
||||
|
|
@ -424,7 +424,7 @@ define-builtin
|
|||
} define-tuple-class
|
||||
|
||||
"sbuf" "sbufs" create
|
||||
"tuple" "kernel" lookup
|
||||
tuple
|
||||
{
|
||||
{
|
||||
{ "string" "strings" }
|
||||
|
|
@ -440,7 +440,7 @@ define-builtin
|
|||
} define-tuple-class
|
||||
|
||||
"vector" "vectors" create
|
||||
"tuple" "kernel" lookup
|
||||
tuple
|
||||
{
|
||||
{
|
||||
{ "array" "arrays" }
|
||||
|
|
@ -456,7 +456,7 @@ define-builtin
|
|||
} define-tuple-class
|
||||
|
||||
"byte-vector" "byte-vectors" create
|
||||
"tuple" "kernel" lookup
|
||||
tuple
|
||||
{
|
||||
{
|
||||
{ "byte-array" "byte-arrays" }
|
||||
|
|
@ -472,7 +472,7 @@ define-builtin
|
|||
} define-tuple-class
|
||||
|
||||
"bit-vector" "bit-vectors" create
|
||||
"tuple" "kernel" lookup
|
||||
tuple
|
||||
{
|
||||
{
|
||||
{ "bit-array" "bit-arrays" }
|
||||
|
|
@ -488,7 +488,7 @@ define-builtin
|
|||
} define-tuple-class
|
||||
|
||||
"float-vector" "float-vectors" create
|
||||
"tuple" "kernel" lookup
|
||||
tuple
|
||||
{
|
||||
{
|
||||
{ "float-array" "float-arrays" }
|
||||
|
|
@ -504,7 +504,7 @@ define-builtin
|
|||
} define-tuple-class
|
||||
|
||||
"curry" "kernel" create
|
||||
"tuple" "kernel" lookup
|
||||
tuple
|
||||
{
|
||||
{
|
||||
{ "object" "kernel" }
|
||||
|
|
@ -525,7 +525,7 @@ define-builtin
|
|||
[ tuple-layout [ <tuple-boa> ] curry ] tri define
|
||||
|
||||
"compose" "kernel" create
|
||||
"tuple" "kernel" lookup
|
||||
tuple
|
||||
{
|
||||
{
|
||||
{ "object" "kernel" }
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ kernel.private math memory continuations kernel io.files
|
|||
io.backend system parser vocabs sequences prettyprint
|
||||
vocabs.loader combinators splitting source-files strings
|
||||
definitions assocs compiler.errors compiler.units
|
||||
math.parser generic ;
|
||||
math.parser generic sets ;
|
||||
IN: bootstrap.stage2
|
||||
|
||||
SYMBOL: bootstrap-time
|
||||
|
|
@ -24,7 +24,7 @@ SYMBOL: bootstrap-time
|
|||
: load-components ( -- )
|
||||
"exclude" "include"
|
||||
[ get-global " " split [ empty? not ] subset ] bi@
|
||||
seq-diff
|
||||
diff
|
||||
[ "bootstrap." prepend require ] each ;
|
||||
|
||||
! : compile-remaining ( -- )
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ IN: boxes
|
|||
|
||||
TUPLE: box value full? ;
|
||||
|
||||
: <box> ( -- box ) box construct-empty ;
|
||||
: <box> ( -- box ) box new ;
|
||||
|
||||
: >box ( value box -- )
|
||||
dup box-full? [ "Box already has a value" throw ] when
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ M: byte-array nth-unsafe swap >fixnum alien-unsigned-1 ;
|
|||
M: byte-array set-nth-unsafe swap >fixnum set-alien-unsigned-1 ;
|
||||
: >byte-array ( seq -- byte-array ) B{ } clone-like ; inline
|
||||
M: byte-array like drop dup byte-array? [ >byte-array ] unless ;
|
||||
M: byte-array new drop <byte-array> ;
|
||||
M: byte-array new-sequence drop <byte-array> ;
|
||||
|
||||
M: byte-array equal?
|
||||
over byte-array? [ sequence= ] [ 2drop f ] if ;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ IN: byte-vectors
|
|||
<PRIVATE
|
||||
|
||||
: byte-array>vector ( byte-array length -- byte-vector )
|
||||
byte-vector construct-boa ; inline
|
||||
byte-vector boa ; inline
|
||||
|
||||
PRIVATE>
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ M: byte-vector like
|
|||
[ dup length byte-array>vector ] [ >byte-vector ] if
|
||||
] unless ;
|
||||
|
||||
M: byte-vector new
|
||||
M: byte-vector new-sequence
|
||||
drop [ <byte-array> ] keep >fixnum byte-array>vector ;
|
||||
|
||||
M: byte-vector equal?
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
! See http://factorcode.org/license.txt for BSD license.
|
||||
USING: kernel classes classes.builtin combinators accessors
|
||||
sequences arrays vectors assocs namespaces words sorting layouts
|
||||
math hashtables kernel.private ;
|
||||
math hashtables kernel.private sets ;
|
||||
IN: classes.algebra
|
||||
|
||||
: 2cache ( key1 key2 assoc quot -- value )
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ M: word reset-class drop ;
|
|||
dup reset-class
|
||||
dup deferred? [ dup define-symbol ] when
|
||||
dup word-props
|
||||
r> union over set-word-props
|
||||
r> assoc-union over set-word-props
|
||||
dup predicate-word
|
||||
[ 1quotation "predicate" set-word-prop ]
|
||||
[ swap "predicating" set-word-prop ]
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ TUPLE: check-mixin-class mixin ;
|
|||
|
||||
: check-mixin-class ( mixin -- mixin )
|
||||
dup mixin-class? [
|
||||
\ check-mixin-class construct-boa throw
|
||||
\ check-mixin-class boa throw
|
||||
] unless ;
|
||||
|
||||
: if-mixin-member? ( class mixin true false -- )
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ generic.standard sequences definitions compiler.units ;
|
|||
IN: classes.tuple
|
||||
|
||||
ARTICLE: "parametrized-constructors" "Parameterized constructors"
|
||||
"A " { $emphasis "parametrized constructor" } " is a word which directly or indirectly calls " { $link construct-empty } " or " { $link construct-boa } ", but instead of passing a literal class symbol, it takes the class symbol as an input from the stack."
|
||||
"A " { $emphasis "parametrized constructor" } " is a word which directly or indirectly calls " { $link new } " or " { $link boa } ", but instead of passing a literal class symbol, it takes the class symbol as an input from the stack."
|
||||
$nl
|
||||
"Parametrized constructors are useful in many situations, in particular with subclassing. For example, consider the following code:"
|
||||
{ $code
|
||||
|
|
@ -14,14 +14,14 @@ $nl
|
|||
""
|
||||
"TUPLE: car < vehicle engine ;"
|
||||
": <car> ( max-speed engine -- car )"
|
||||
" car construct-empty"
|
||||
" car new"
|
||||
" V{ } clone >>occupants"
|
||||
" swap >>engine"
|
||||
" swap >>max-speed ;"
|
||||
""
|
||||
"TUPLE: aeroplane < vehicle max-altitude ;"
|
||||
": <aeroplane> ( max-speed max-altitude -- aeroplane )"
|
||||
" aeroplane construct-empty"
|
||||
" aeroplane new"
|
||||
" V{ } clone >>occupants"
|
||||
" swap >>max-altitude"
|
||||
" swap >>max-speed ;"
|
||||
|
|
@ -32,28 +32,28 @@ $nl
|
|||
""
|
||||
": add-occupant ( person vehicle -- ) occupants>> push ;"
|
||||
""
|
||||
": construct-vehicle ( class -- vehicle )"
|
||||
" construct-empty"
|
||||
": new-vehicle ( class -- vehicle )"
|
||||
" new"
|
||||
" V{ } clone >>occupants ;"
|
||||
""
|
||||
"TUPLE: car < vehicle engine ;"
|
||||
": <car> ( max-speed engine -- car )"
|
||||
" car construct-vehicle"
|
||||
" car new-vehicle"
|
||||
" swap >>engine"
|
||||
" swap >>max-speed ;"
|
||||
""
|
||||
"TUPLE: aeroplane < vehicle max-altitude ;"
|
||||
": <aeroplane> ( max-speed max-altitude -- aeroplane )"
|
||||
" aeroplane construct-vehicle"
|
||||
" aeroplane new-vehicle"
|
||||
" swap >>max-altitude"
|
||||
" swap >>max-speed ;"
|
||||
}
|
||||
"The naming convention for parametrized constructors is " { $snippet "construct-" { $emphasis "class" } } "." ;
|
||||
"The naming convention for parametrized constructors is " { $snippet "new-" { $emphasis "class" } } "." ;
|
||||
|
||||
ARTICLE: "tuple-constructors" "Tuple constructors"
|
||||
"Tuples are created by calling one of two constructor primitives:"
|
||||
{ $subsection construct-empty }
|
||||
{ $subsection construct-boa }
|
||||
{ $subsection new }
|
||||
{ $subsection boa }
|
||||
"A shortcut for defining BOA constructors:"
|
||||
{ $subsection POSTPONE: C: }
|
||||
"By convention, construction logic is encapsulated in a word named after the tuple class surrounded in angle brackets; for example, the constructor word for a " { $snippet "point" } " class might be named " { $snippet "<point>" } "."
|
||||
|
|
@ -64,13 +64,16 @@ $nl
|
|||
{ $code
|
||||
"TUPLE: color red green blue alpha ;"
|
||||
""
|
||||
"! The following two are equivalent"
|
||||
"C: <rgba> rgba"
|
||||
": <rgba> color construct-boa ; ! identical to above"
|
||||
": <rgba> color boa ;"
|
||||
""
|
||||
"! We can define constructors which call other constructors"
|
||||
": <rgb> f <rgba> ;"
|
||||
""
|
||||
": <color> construct-empty ;"
|
||||
": <color> f f f f <rgba> ; ! identical to above"
|
||||
"! The following two are equivalent"
|
||||
": <color> color new ;"
|
||||
": <color> f f f f <rgba> ;"
|
||||
}
|
||||
{ $subsection "parametrized-constructors" } ;
|
||||
|
||||
|
|
@ -129,7 +132,7 @@ $nl
|
|||
$nl
|
||||
"The second is to use ad-hoc slot polymorphism. If two classes define a slot with the same name, then code which uses " { $link "accessors" } " can operate on instances of both objects, assuming the values stored in that slot implement a common protocol. This allows code to be shared without creating contrieved relationships between classes."
|
||||
{ $heading "Anti-pattern #3: subclassing to override a method definition" }
|
||||
"While method overriding is a very powerful tool, improper use can cause tight coupling of code and lead to difficulty in testing and refactoring. Subclassing should not be used as a means of ``monkey patching'' methods to fix bugs and add features. Only subclass from classes which were designed to be inherited from, and when writing classes of your own which are intended to be subclassed, clearly document that subclasses may and may not do. This includes construction policy; document whether subclasses should use " { $link construct-empty } ", " { $link construct-boa } ", or a custom parametrized constructor."
|
||||
"While method overriding is a very powerful tool, improper use can cause tight coupling of code and lead to difficulty in testing and refactoring. Subclassing should not be used as a means of ``monkey patching'' methods to fix bugs and add features. Only subclass from classes which were designed to be inherited from, and when writing classes of your own which are intended to be subclassed, clearly document that subclasses may and may not do. This includes construction policy; document whether subclasses should use " { $link new } ", " { $link boa } ", or a custom parametrized constructor."
|
||||
{ $see-also "parametrized-constructors" } ;
|
||||
|
||||
ARTICLE: "tuple-subclassing" "Tuple subclassing"
|
||||
|
|
@ -164,11 +167,11 @@ ARTICLE: "tuple-examples" "Tuple examples"
|
|||
}
|
||||
"We can define a constructor which makes an empty employee:"
|
||||
{ $code ": <employee> ( -- employee )"
|
||||
" employee construct-empty ;" }
|
||||
" employee new ;" }
|
||||
"Or we may wish the default constructor to always give employees a starting salary:"
|
||||
{ $code
|
||||
": <employee> ( -- employee )"
|
||||
" employee construct-empty"
|
||||
" employee new"
|
||||
" 40000 >>salary ;"
|
||||
}
|
||||
"We can define more refined constructors:"
|
||||
|
|
@ -178,7 +181,7 @@ ARTICLE: "tuple-examples" "Tuple examples"
|
|||
"An alternative strategy is to define the most general BOA constructor first:"
|
||||
{ $code
|
||||
": <employee> ( name position -- person )"
|
||||
" 40000 employee construct-boa ;"
|
||||
" 40000 employee boa ;"
|
||||
}
|
||||
"Now we can define more specific constructors:"
|
||||
{ $code
|
||||
|
|
@ -191,7 +194,7 @@ ARTICLE: "tuple-examples" "Tuple examples"
|
|||
"SYMBOL: checks"
|
||||
""
|
||||
": <check> ( to amount -- check )"
|
||||
" checks counter check construct-boa ;"
|
||||
" checks counter check boa ;"
|
||||
""
|
||||
": biweekly-paycheck ( employee -- check )"
|
||||
" dup name>> swap salary>> 26 / <check> ;"
|
||||
|
|
@ -326,20 +329,20 @@ HELP: tuple>array ( tuple -- array )
|
|||
|
||||
HELP: <tuple> ( layout -- tuple )
|
||||
{ $values { "layout" tuple-layout } { "tuple" tuple } }
|
||||
{ $description "Low-level tuple constructor. User code should never call this directly, and instead use " { $link construct-empty } "." } ;
|
||||
{ $description "Low-level tuple constructor. User code should never call this directly, and instead use " { $link new } "." } ;
|
||||
|
||||
HELP: <tuple-boa> ( ... layout -- tuple )
|
||||
{ $values { "..." "values" } { "layout" tuple-layout } { "tuple" tuple } }
|
||||
{ $description "Low-level tuple constructor. User code should never call this directly, and instead use " { $link construct-boa } "." } ;
|
||||
{ $description "Low-level tuple constructor. User code should never call this directly, and instead use " { $link boa } "." } ;
|
||||
|
||||
HELP: construct-empty
|
||||
HELP: new
|
||||
{ $values { "class" tuple-class } { "tuple" tuple } }
|
||||
{ $description "Creates a new instance of " { $snippet "class" } " with all slots initially set to " { $link f } "." }
|
||||
{ $examples
|
||||
{ $example
|
||||
"USING: kernel prettyprint ;"
|
||||
"TUPLE: employee number name department ;"
|
||||
"employee construct-empty ."
|
||||
"employee new ."
|
||||
"T{ employee f f f f }"
|
||||
}
|
||||
} ;
|
||||
|
|
@ -361,12 +364,12 @@ HELP: construct
|
|||
" color construct ;"
|
||||
}
|
||||
"The last definition is actually equivalent to the following:"
|
||||
{ $code ": <rgba> ( r g b a -- color ) rgba construct-boa ;" }
|
||||
{ $code ": <rgba> ( r g b a -- color ) rgba boa ;" }
|
||||
"Which can be abbreviated further:"
|
||||
{ $code "C: <rgba> color" }
|
||||
} ;
|
||||
|
||||
HELP: construct-boa
|
||||
HELP: boa
|
||||
{ $values { "..." "slot values" } { "class" tuple-class } { "tuple" tuple } }
|
||||
{ $description "Creates a new instance of " { $snippet "class" } " and fill in the slots from the stack, with the top-most stack element being stored in the right-most slot." }
|
||||
{ $notes "The " { $snippet "-boa" } " suffix is shorthand for ``by order of arguments'', and ``BOA constructor'' is a pun on ``boa constrictor''." } ;
|
||||
{ $notes "The name " { $snippet "boa" } " is shorthand for ``by order of arguments'', and ``BOA constructor'' is a pun on ``boa constrictor''." } ;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ calendar prettyprint io.streams.string splitting inspector ;
|
|||
IN: classes.tuple.tests
|
||||
|
||||
TUPLE: rect x y w h ;
|
||||
: <rect> rect construct-boa ;
|
||||
: <rect> rect boa ;
|
||||
|
||||
: move ( x rect -- rect )
|
||||
[ + ] change-x ;
|
||||
|
|
@ -198,8 +198,8 @@ SYMBOL: not-a-tuple-class
|
|||
] unit-test
|
||||
|
||||
! Missing check
|
||||
[ not-a-tuple-class construct-boa ] must-fail
|
||||
[ not-a-tuple-class construct-empty ] must-fail
|
||||
[ not-a-tuple-class boa ] must-fail
|
||||
[ not-a-tuple-class new ] must-fail
|
||||
|
||||
TUPLE: erg's-reshape-problem a b c d ;
|
||||
|
||||
|
|
@ -207,8 +207,8 @@ C: <erg's-reshape-problem> erg's-reshape-problem
|
|||
|
||||
! We want to make sure constructors are recompiled when
|
||||
! tuples are reshaped
|
||||
: cons-test-1 \ erg's-reshape-problem construct-empty ;
|
||||
: cons-test-2 \ erg's-reshape-problem construct-boa ;
|
||||
: cons-test-1 \ erg's-reshape-problem new ;
|
||||
: cons-test-2 \ erg's-reshape-problem boa ;
|
||||
|
||||
"IN: classes.tuple.tests TUPLE: erg's-reshape-problem a b c d e f ;" eval
|
||||
|
||||
|
|
@ -538,3 +538,6 @@ TUPLE: another-forget-accessors-test ;
|
|||
] with-string-writer empty?
|
||||
] with-variable
|
||||
] unit-test
|
||||
|
||||
! Missing error check
|
||||
[ "IN: tuples.test USE: words TUPLE: wrong-superclass < word ;" eval ] must-fail
|
||||
|
|
|
|||
|
|
@ -58,6 +58,8 @@ PRIVATE>
|
|||
: all-slot-names ( class -- slots )
|
||||
superclasses [ slot-names ] map concat \ class prefix ;
|
||||
|
||||
ERROR: bad-superclass class ;
|
||||
|
||||
<PRIVATE
|
||||
|
||||
: tuple= ( tuple1 tuple2 -- ? )
|
||||
|
|
@ -185,21 +187,28 @@ M: tuple-class update-class
|
|||
: tuple-class-unchanged? ( class superclass slots -- ? )
|
||||
rot tuck [ superclass = ] [ slot-names = ] 2bi* and ;
|
||||
|
||||
: valid-superclass? ( class -- ? )
|
||||
[ tuple-class? ] [ tuple eq? ] bi or ;
|
||||
|
||||
: check-superclass ( superclass -- )
|
||||
dup valid-superclass? [ bad-superclass ] unless drop ;
|
||||
|
||||
PRIVATE>
|
||||
|
||||
GENERIC# define-tuple-class 2 ( class superclass slots -- )
|
||||
|
||||
M: word define-tuple-class
|
||||
over check-superclass
|
||||
define-new-tuple-class ;
|
||||
|
||||
M: tuple-class define-tuple-class
|
||||
3dup tuple-class-unchanged?
|
||||
[ 3dup redefine-tuple-class ] unless
|
||||
[ over check-superclass 3dup redefine-tuple-class ] unless
|
||||
3drop ;
|
||||
|
||||
: define-error-class ( class superclass slots -- )
|
||||
[ define-tuple-class ] [ 2drop ] 3bi
|
||||
dup [ construct-boa throw ] curry define ;
|
||||
dup [ boa throw ] curry define ;
|
||||
|
||||
M: tuple-class reset-class
|
||||
[
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
IN: combinators
|
||||
USING: arrays sequences sequences.private math.private
|
||||
kernel kernel.private math assocs quotations vectors
|
||||
hashtables sorting words ;
|
||||
hashtables sorting words sets ;
|
||||
|
||||
: cleave ( x seq -- )
|
||||
[ call ] with each ;
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@ USING: kernel tools.test compiler.units ;
|
|||
TUPLE: color red green blue ;
|
||||
|
||||
[ T{ color f 1 2 3 } ]
|
||||
[ 1 2 3 [ color construct-boa ] compile-call ] unit-test
|
||||
[ 1 2 3 [ color boa ] compile-call ] unit-test
|
||||
|
||||
[ 1 3 ] [
|
||||
1 2 3 color construct-boa
|
||||
1 2 3 color boa
|
||||
[ { color-red color-blue } get-slots ] compile-call
|
||||
] unit-test
|
||||
|
||||
[ T{ color f 10 2 20 } ] [
|
||||
10 20
|
||||
1 2 3 color construct-boa [
|
||||
1 2 3 color boa [
|
||||
[
|
||||
{ set-color-red set-color-blue } set-slots
|
||||
] compile-call
|
||||
|
|
@ -21,4 +21,4 @@ TUPLE: color red green blue ;
|
|||
] unit-test
|
||||
|
||||
[ T{ color f f f f } ]
|
||||
[ [ color construct-empty ] compile-call ] unit-test
|
||||
[ [ color new ] compile-call ] unit-test
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ SYMBOL: new-definitions
|
|||
TUPLE: redefine-error def ;
|
||||
|
||||
: redefine-error ( definition -- )
|
||||
\ redefine-error construct-boa
|
||||
\ redefine-error boa
|
||||
{ { "Continue" t } } throw-restarts drop ;
|
||||
|
||||
: add-once ( key assoc -- )
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
! See http://factorcode.org/license.txt for BSD license.
|
||||
USING: arrays generic kernel kernel.private math memory
|
||||
namespaces sequences layouts system hashtables classes alien
|
||||
byte-arrays bit-arrays float-arrays combinators words ;
|
||||
byte-arrays bit-arrays float-arrays combinators words sets ;
|
||||
IN: cpu.architecture
|
||||
|
||||
! A pseudo-register class for parameters spilled on the stack
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ M: indirect extended? indirect-base extended? ;
|
|||
canonicalize-ESP ;
|
||||
|
||||
: <indirect> ( base index scale displacement -- indirect )
|
||||
indirect construct-boa dup canonicalize ;
|
||||
indirect boa dup canonicalize ;
|
||||
|
||||
: reg-code "register" word-prop 7 bitand ;
|
||||
|
||||
|
|
|
|||
|
|
@ -215,7 +215,10 @@ M: check-method summary
|
|||
drop "Invalid parameters for create-method" ;
|
||||
|
||||
M: no-tuple-class summary
|
||||
drop "Invalid class for define-constructor" ;
|
||||
drop "BOA constructors can only be defined for tuple classes" ;
|
||||
|
||||
M: bad-superclass summary
|
||||
drop "Tuple classes can only inherit from other tuple classes" ;
|
||||
|
||||
M: no-cond summary
|
||||
drop "Fall-through in cond" ;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
USING: dlists dlists.private kernel tools.test random assocs
|
||||
hashtables sequences namespaces sorting debugger io prettyprint
|
||||
sets sequences namespaces sorting debugger io prettyprint
|
||||
math ;
|
||||
IN: dlists.tests
|
||||
|
||||
|
|
@ -79,7 +79,7 @@ IN: dlists.tests
|
|||
[ dlist-push-all ] keep
|
||||
[ dlist-delete-all ] keep
|
||||
dlist>array
|
||||
] 2keep seq-diff assert-same-elements
|
||||
] 2keep diff assert-same-elements
|
||||
] unit-test
|
||||
|
||||
[ ] [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ IN: dlists
|
|||
TUPLE: dlist front back length ;
|
||||
|
||||
: <dlist> ( -- obj )
|
||||
dlist construct-empty
|
||||
dlist new
|
||||
0 >>length ;
|
||||
|
||||
: dlist-empty? ( dlist -- ? ) front>> not ;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ TUPLE: effect in out terminated? ;
|
|||
|
||||
: <effect> ( in out -- effect )
|
||||
dup { "*" } sequence= [ drop { } t ] [ f ] if
|
||||
effect construct-boa ;
|
||||
effect boa ;
|
||||
|
||||
: effect-height ( effect -- n )
|
||||
dup effect-out length swap effect-in length - ;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ M: float-array set-nth-unsafe
|
|||
M: float-array like
|
||||
drop dup float-array? [ >float-array ] unless ;
|
||||
|
||||
M: float-array new drop 0.0 <float-array> ;
|
||||
M: float-array new-sequence drop 0.0 <float-array> ;
|
||||
|
||||
M: float-array equal?
|
||||
over float-array? [ sequence= ] [ 2drop f ] if ;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ IN: float-vectors
|
|||
<PRIVATE
|
||||
|
||||
: float-array>vector ( float-array length -- float-vector )
|
||||
float-vector construct-boa ; inline
|
||||
float-vector boa ; inline
|
||||
|
||||
PRIVATE>
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ M: float-vector like
|
|||
[ dup length float-array>vector ] [ >float-vector ] if
|
||||
] unless ;
|
||||
|
||||
M: float-vector new
|
||||
M: float-vector new-sequence
|
||||
drop [ 0.0 <float-array> ] keep >fixnum float-array>vector ;
|
||||
|
||||
M: float-vector equal?
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ IN: generator.fixup
|
|||
|
||||
TUPLE: frame-required n ;
|
||||
|
||||
: frame-required ( n -- ) \ frame-required construct-boa , ;
|
||||
: frame-required ( n -- ) \ frame-required boa , ;
|
||||
|
||||
: stack-frame-size ( code -- n )
|
||||
no-stack-frame [
|
||||
|
|
@ -25,7 +25,7 @@ GENERIC: fixup* ( frame-size obj -- frame-size )
|
|||
|
||||
TUPLE: label offset ;
|
||||
|
||||
: <label> ( -- label ) label construct-empty ;
|
||||
: <label> ( -- label ) label new ;
|
||||
|
||||
M: label fixup*
|
||||
compiled-offset swap set-label-offset ;
|
||||
|
|
@ -74,7 +74,7 @@ SYMBOL: label-table
|
|||
|
||||
TUPLE: label-fixup label class ;
|
||||
|
||||
: label-fixup ( label class -- ) \ label-fixup construct-boa , ;
|
||||
: label-fixup ( label class -- ) \ label-fixup boa , ;
|
||||
|
||||
M: label-fixup fixup*
|
||||
dup label-fixup-class rc-absolute?
|
||||
|
|
@ -84,7 +84,7 @@ M: label-fixup fixup*
|
|||
|
||||
TUPLE: rel-fixup arg class type ;
|
||||
|
||||
: rel-fixup ( arg class type -- ) \ rel-fixup construct-boa , ;
|
||||
: rel-fixup ( arg class type -- ) \ rel-fixup boa , ;
|
||||
|
||||
: (rel-fixup) ( arg class type offset -- pair )
|
||||
pick rc-absolute-cell = cell 4 ? -
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ M: #dispatch generate-node
|
|||
: define-if>boolean-intrinsics ( word intrinsics -- )
|
||||
[
|
||||
>r [ if>boolean-intrinsic ] curry r>
|
||||
{ { f "if-scratch" } } +scratch+ associate union
|
||||
{ { f "if-scratch" } } +scratch+ associate assoc-union
|
||||
] assoc-map "intrinsics" set-word-prop ;
|
||||
|
||||
: define-if-intrinsics ( word intrinsics -- )
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ USING: arrays assocs classes classes.private classes.algebra
|
|||
combinators cpu.architecture generator.fixup hashtables kernel
|
||||
layouts math namespaces quotations sequences system vectors
|
||||
words effects alien byte-arrays bit-arrays float-arrays
|
||||
accessors ;
|
||||
accessors sets ;
|
||||
IN: generator.registers
|
||||
|
||||
SYMBOL: +input+
|
||||
|
|
@ -76,7 +76,7 @@ INSTANCE: temp-reg value
|
|||
! A data stack location.
|
||||
TUPLE: ds-loc n class ;
|
||||
|
||||
: <ds-loc> f ds-loc construct-boa ;
|
||||
: <ds-loc> f ds-loc boa ;
|
||||
|
||||
M: ds-loc minimal-ds-loc* ds-loc-n min ;
|
||||
M: ds-loc operand-class* ds-loc-class ;
|
||||
|
|
@ -87,7 +87,7 @@ M: ds-loc live-loc?
|
|||
! A retain stack location.
|
||||
TUPLE: rs-loc n class ;
|
||||
|
||||
: <rs-loc> f rs-loc construct-boa ;
|
||||
: <rs-loc> f rs-loc boa ;
|
||||
M: rs-loc operand-class* rs-loc-class ;
|
||||
M: rs-loc set-operand-class set-rs-loc-class ;
|
||||
M: rs-loc live-loc?
|
||||
|
|
@ -128,7 +128,7 @@ INSTANCE: cached value
|
|||
TUPLE: tagged vreg class ;
|
||||
|
||||
: <tagged> ( vreg -- tagged )
|
||||
f tagged construct-boa ;
|
||||
f tagged boa ;
|
||||
|
||||
M: tagged v>operand tagged-vreg v>operand ;
|
||||
M: tagged set-operand-class set-tagged-class ;
|
||||
|
|
@ -237,8 +237,8 @@ M: phantom-stack clone
|
|||
|
||||
GENERIC: finalize-height ( stack -- )
|
||||
|
||||
: construct-phantom-stack ( class -- stack )
|
||||
>r 0 V{ } clone r> construct-boa ; inline
|
||||
: new-phantom-stack ( class -- stack )
|
||||
>r 0 V{ } clone r> boa ; inline
|
||||
|
||||
: (loc)
|
||||
#! Utility for methods on <loc>
|
||||
|
|
@ -257,7 +257,7 @@ GENERIC: <loc> ( n stack -- loc )
|
|||
TUPLE: phantom-datastack < phantom-stack ;
|
||||
|
||||
: <phantom-datastack> ( -- stack )
|
||||
phantom-datastack construct-phantom-stack ;
|
||||
phantom-datastack new-phantom-stack ;
|
||||
|
||||
M: phantom-datastack <loc> (loc) <ds-loc> ;
|
||||
|
||||
|
|
@ -267,7 +267,7 @@ M: phantom-datastack finalize-height
|
|||
TUPLE: phantom-retainstack < phantom-stack ;
|
||||
|
||||
: <phantom-retainstack> ( -- stack )
|
||||
phantom-retainstack construct-phantom-stack ;
|
||||
phantom-retainstack new-phantom-stack ;
|
||||
|
||||
M: phantom-retainstack <loc> (loc) <rs-loc> ;
|
||||
|
||||
|
|
@ -381,7 +381,7 @@ M: value (lazy-load)
|
|||
: (compute-free-vregs) ( used class -- vector )
|
||||
#! Find all vregs in 'class' which are not in 'used'.
|
||||
[ vregs length reverse ] keep
|
||||
[ <vreg> ] curry map seq-diff
|
||||
[ <vreg> ] curry map diff
|
||||
>vector ;
|
||||
|
||||
: compute-free-vregs ( -- )
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ TUPLE: check-method class generic ;
|
|||
|
||||
: check-method ( class generic -- class generic )
|
||||
over class? over generic? and [
|
||||
\ check-method construct-boa throw
|
||||
\ check-method boa throw
|
||||
] unless ; inline
|
||||
|
||||
: with-methods ( generic quot -- )
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ TUPLE: tuple-dispatch-engine echelons ;
|
|||
dupd <echelon-dispatch-engine>
|
||||
] if
|
||||
] assoc-map [ nip ] assoc-subset
|
||||
\ tuple-dispatch-engine construct-boa ;
|
||||
\ tuple-dispatch-engine boa ;
|
||||
|
||||
: convert-tuple-methods ( assoc -- assoc' )
|
||||
tuple bootstrap-word
|
||||
|
|
|
|||
|
|
@ -183,22 +183,22 @@ M: ceo salary
|
|||
|
||||
[ salary ] must-infer
|
||||
|
||||
[ 24000 ] [ employee construct-boa salary ] unit-test
|
||||
[ 24000 ] [ employee boa salary ] unit-test
|
||||
|
||||
[ 24000 ] [ tape-monkey construct-boa salary ] unit-test
|
||||
[ 24000 ] [ tape-monkey boa salary ] unit-test
|
||||
|
||||
[ 36000 ] [ junior-manager construct-boa salary ] unit-test
|
||||
[ 36000 ] [ junior-manager boa salary ] unit-test
|
||||
|
||||
[ 41000 ] [ middle-manager construct-boa salary ] unit-test
|
||||
[ 41000 ] [ middle-manager boa salary ] unit-test
|
||||
|
||||
[ 51000 ] [ senior-manager construct-boa salary ] unit-test
|
||||
[ 51000 ] [ senior-manager boa salary ] unit-test
|
||||
|
||||
[ 102000 ] [ executive construct-boa salary ] unit-test
|
||||
[ 102000 ] [ executive boa salary ] unit-test
|
||||
|
||||
[ ceo construct-boa salary ]
|
||||
[ ceo boa salary ]
|
||||
[ T{ inconsistent-next-method f ceo salary } = ] must-fail-with
|
||||
|
||||
[ intern construct-boa salary ]
|
||||
[ intern boa salary ]
|
||||
[ T{ no-next-method f intern salary } = ] must-fail-with
|
||||
|
||||
! Weird shit
|
||||
|
|
|
|||
|
|
@ -49,11 +49,7 @@ $nl
|
|||
ARTICLE: "hashtables.utilities" "Hashtable utilities"
|
||||
"Utility words to create a new hashtable from a single key/value pair:"
|
||||
{ $subsection associate }
|
||||
{ $subsection ?set-at }
|
||||
"The final two words pertain to sequences but use a hashtable internally. Removing duplicate elements from a sequence in linear time, using a hashtable:"
|
||||
{ $subsection prune }
|
||||
"Test if a sequence contains duplicates in linear time:"
|
||||
{ $subsection all-unique? } ;
|
||||
{ $subsection ?set-at } ;
|
||||
|
||||
ABOUT: "hashtables"
|
||||
|
||||
|
|
@ -138,22 +134,6 @@ HELP: >hashtable
|
|||
{ $values { "assoc" "an assoc" } { "hashtable" "a hashtable" } }
|
||||
{ $description "Constructs a hashtable from any assoc." } ;
|
||||
|
||||
HELP: prune
|
||||
{ $values { "seq" "a sequence" } { "newseq" "a sequence" } }
|
||||
{ $description "Outputs a new sequence with each distinct element of " { $snippet "seq" } " appearing only once. Elements are compared for equality using " { $link = } " and elements are ordered according to their position in " { $snippet "seq" } "." }
|
||||
{ $examples
|
||||
{ $example "USING: hashtables prettyprint ;" "{ 1 1 t 3 t } prune ." "V{ 1 t 3 }" }
|
||||
} ;
|
||||
|
||||
HELP: all-unique?
|
||||
{ $values { "seq" sequence } { "?" "a boolean" } }
|
||||
{ $description "Tests whether a sequence contains any repeated elements." }
|
||||
{ $example
|
||||
"USING: hashtables prettyprint ;"
|
||||
"{ 0 1 1 2 3 5 } all-unique? ."
|
||||
"f"
|
||||
} ;
|
||||
|
||||
HELP: rehash
|
||||
{ $values { "hash" hashtable } }
|
||||
{ $description "Rebuild the hashtable. This word should be called if the hashcodes of the hashtable's keys have changed, or if the hashing algorithms themselves have changed, neither of which should occur during normal operation." } ;
|
||||
|
|
|
|||
|
|
@ -164,6 +164,3 @@ H{ } "x" set
|
|||
[ { "one" "two" 3 } ] [
|
||||
{ 1 2 3 } H{ { 1 "one" } { 2 "two" } } substitute
|
||||
] unit-test
|
||||
|
||||
[ f ] [ { 0 1 1 2 3 5 } all-unique? ] unit-test
|
||||
[ t ] [ { 0 1 2 3 4 5 } all-unique? ] unit-test
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ IN: hashtables
|
|||
PRIVATE>
|
||||
|
||||
: <hashtable> ( n -- hash )
|
||||
hashtable construct-empty [ reset-hash ] keep ;
|
||||
hashtable new [ reset-hash ] keep ;
|
||||
|
||||
M: hashtable at* ( key hash -- value ? )
|
||||
key@ [ 3 fixnum+fast slot t ] [ 2drop f f ] if ;
|
||||
|
|
@ -174,18 +174,4 @@ M: hashtable assoc-like
|
|||
: ?set-at ( value key assoc/f -- assoc )
|
||||
[ [ set-at ] keep ] [ associate ] if* ;
|
||||
|
||||
: (prune) ( hash vec elt -- )
|
||||
rot 2dup key?
|
||||
[ 3drop ] [ dupd dupd set-at swap push ] if ; inline
|
||||
|
||||
: prune ( seq -- newseq )
|
||||
[ length <hashtable> ]
|
||||
[ length <vector> ]
|
||||
[ ] tri
|
||||
[ >r 2dup r> (prune) ] each nip ;
|
||||
|
||||
: all-unique? ( seq -- ? )
|
||||
[ length ]
|
||||
[ prune length ] bi = ;
|
||||
|
||||
INSTANCE: hashtable assoc
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@ GENERIC: heap-size ( heap -- n )
|
|||
TUPLE: heap data ;
|
||||
|
||||
: <heap> ( class -- heap )
|
||||
>r V{ } clone r> construct-boa ; inline
|
||||
>r V{ } clone r> boa ; inline
|
||||
|
||||
TUPLE: entry value key heap index ;
|
||||
|
||||
: <entry> ( value key heap -- entry ) f entry construct-boa ;
|
||||
: <entry> ( value key heap -- entry ) f entry boa ;
|
||||
|
||||
PRIVATE>
|
||||
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ M: inference-error compiler-error-type type>> ;
|
|||
M: inference-error error-help error>> error-help ;
|
||||
|
||||
: (inference-error) ( ... class type -- * )
|
||||
>r construct-boa r>
|
||||
>r boa r>
|
||||
recursive-state get
|
||||
\ inference-error construct-boa throw ; inline
|
||||
\ inference-error boa throw ; inline
|
||||
|
||||
: inference-error ( ... class -- * )
|
||||
+error+ (inference-error) ; inline
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ IN: inference.dataflow
|
|||
TUPLE: value < identity-tuple literal uid recursion ;
|
||||
|
||||
: <value> ( obj -- value )
|
||||
<computed> recursive-state get value construct-boa ;
|
||||
<computed> recursive-state get value boa ;
|
||||
|
||||
M: value hashcode* nip value-uid ;
|
||||
|
||||
|
|
@ -68,16 +68,16 @@ M: object flatten-curry , ;
|
|||
[ in-d>> ] [ out-d>> ] bi <effect> ;
|
||||
|
||||
: param-node ( param class -- node )
|
||||
construct-empty swap >>param ; inline
|
||||
new swap >>param ; inline
|
||||
|
||||
: in-node ( seq class -- node )
|
||||
construct-empty swap >>in-d ; inline
|
||||
new swap >>in-d ; inline
|
||||
|
||||
: all-in-node ( class -- node )
|
||||
flatten-meta-d swap in-node ; inline
|
||||
|
||||
: out-node ( seq class -- node )
|
||||
construct-empty swap >>out-d ; inline
|
||||
new swap >>out-d ; inline
|
||||
|
||||
: all-out-node ( class -- node )
|
||||
flatten-meta-d swap out-node ; inline
|
||||
|
|
@ -111,19 +111,19 @@ TUPLE: #call-label < node ;
|
|||
|
||||
TUPLE: #push < node ;
|
||||
|
||||
: #push ( -- node ) \ #push construct-empty ;
|
||||
: #push ( -- node ) \ #push new ;
|
||||
|
||||
TUPLE: #shuffle < node ;
|
||||
|
||||
: #shuffle ( -- node ) \ #shuffle construct-empty ;
|
||||
: #shuffle ( -- node ) \ #shuffle new ;
|
||||
|
||||
TUPLE: #>r < node ;
|
||||
|
||||
: #>r ( -- node ) \ #>r construct-empty ;
|
||||
: #>r ( -- node ) \ #>r new ;
|
||||
|
||||
TUPLE: #r> < node ;
|
||||
|
||||
: #r> ( -- node ) \ #r> construct-empty ;
|
||||
: #r> ( -- node ) \ #r> new ;
|
||||
|
||||
TUPLE: #values < node ;
|
||||
|
||||
|
|
@ -150,7 +150,7 @@ TUPLE: #merge < node ;
|
|||
|
||||
TUPLE: #terminate < node ;
|
||||
|
||||
: #terminate ( -- node ) \ #terminate construct-empty ;
|
||||
: #terminate ( -- node ) \ #terminate new ;
|
||||
|
||||
TUPLE: #declare < node ;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ classes ;
|
|||
|
||||
[ 512 ] [ 1 { { 1+ 8 } } bitfield-quot call ] unit-test
|
||||
|
||||
\ construct-empty must-infer
|
||||
\ new must-infer
|
||||
|
||||
TUPLE: a-tuple x y z ;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
USING: arrays kernel words sequences generic math namespaces
|
||||
quotations assocs combinators math.bitfields inference.backend
|
||||
inference.dataflow inference.state classes.tuple.private effects
|
||||
inspector hashtables classes generic ;
|
||||
inspector hashtables classes generic sets ;
|
||||
IN: inference.transforms
|
||||
|
||||
: pop-literals ( n -- rstate seq )
|
||||
|
|
@ -82,12 +82,12 @@ M: duplicated-slots-error summary
|
|||
[ <reversed> [get-slots] ] [ duplicated-slots-error ] if
|
||||
] 1 define-transform
|
||||
|
||||
\ construct-boa [
|
||||
\ boa [
|
||||
dup +inlined+ depends-on
|
||||
tuple-layout [ <tuple-boa> ] curry
|
||||
] 1 define-transform
|
||||
|
||||
\ construct-empty [
|
||||
\ new [
|
||||
1 ensure-values
|
||||
peek-d value? [
|
||||
pop-literal
|
||||
|
|
@ -95,7 +95,7 @@ M: duplicated-slots-error summary
|
|||
tuple-layout [ <tuple> ] curry
|
||||
swap infer-quot
|
||||
] [
|
||||
\ construct-empty 1 1 <effect> make-call-node
|
||||
\ new 1 1 <effect> make-call-node
|
||||
] if
|
||||
] "infer" set-word-prop
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
! See http://factorcode.org/license.txt for BSD license.
|
||||
USING: arrays generic hashtables io kernel assocs math
|
||||
namespaces prettyprint sequences strings io.styles vectors words
|
||||
quotations mirrors splitting math.parser classes vocabs refs ;
|
||||
quotations mirrors splitting math.parser classes vocabs refs
|
||||
sets ;
|
||||
IN: inspector
|
||||
|
||||
GENERIC: summary ( object -- string )
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ ERROR: encode-error ;
|
|||
|
||||
<PRIVATE
|
||||
|
||||
M: tuple-class <decoder> construct-empty <decoder> ;
|
||||
M: tuple <decoder> f decoder construct-boa ;
|
||||
M: tuple-class <decoder> new <decoder> ;
|
||||
M: tuple <decoder> f decoder boa ;
|
||||
|
||||
: >decoder< ( decoder -- stream encoding )
|
||||
[ stream>> ] [ code>> ] bi ;
|
||||
|
|
@ -104,8 +104,8 @@ M: decoder stream-readln ( stream -- str )
|
|||
M: decoder dispose decoder-stream dispose ;
|
||||
|
||||
! Encoding
|
||||
M: tuple-class <encoder> construct-empty <encoder> ;
|
||||
M: tuple <encoder> encoder construct-boa ;
|
||||
M: tuple-class <encoder> new <encoder> ;
|
||||
M: tuple <encoder> encoder boa ;
|
||||
|
||||
: >encoder< ( encoder -- stream encoding )
|
||||
[ stream>> ] [ code>> ] bi ;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ IN: io.streams.duplex.tests
|
|||
! Test duplex stream close behavior
|
||||
TUPLE: closing-stream closed? ;
|
||||
|
||||
: <closing-stream> closing-stream construct-empty ;
|
||||
: <closing-stream> closing-stream new ;
|
||||
|
||||
M: closing-stream dispose
|
||||
dup closing-stream-closed? [
|
||||
|
|
@ -15,7 +15,7 @@ M: closing-stream dispose
|
|||
|
||||
TUPLE: unclosable-stream ;
|
||||
|
||||
: <unclosable-stream> unclosable-stream construct-empty ;
|
||||
: <unclosable-stream> unclosable-stream new ;
|
||||
|
||||
M: unclosable-stream dispose
|
||||
"Can't close me!" throw ;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ IN: io.streams.duplex
|
|||
TUPLE: duplex-stream in out closed ;
|
||||
|
||||
: <duplex-stream> ( in out -- stream )
|
||||
f duplex-stream construct-boa ;
|
||||
f duplex-stream boa ;
|
||||
|
||||
ERROR: stream-closed-twice ;
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ C: <ignore-close-stream> ignore-close-stream
|
|||
TUPLE: style-stream < filter-writer style ;
|
||||
|
||||
: do-nested-style ( style style-stream -- style stream )
|
||||
[ style>> swap union ] [ stream>> ] bi ; inline
|
||||
[ style>> swap assoc-union ] [ stream>> ] bi ; inline
|
||||
|
||||
C: <style-stream> style-stream
|
||||
|
||||
|
|
|
|||
|
|
@ -142,10 +142,10 @@ M: object clone ;
|
|||
M: callstack clone (clone) ;
|
||||
|
||||
! Tuple construction
|
||||
: construct-empty ( class -- tuple )
|
||||
: new ( class -- tuple )
|
||||
tuple-layout <tuple> ;
|
||||
|
||||
: construct-boa ( ... class -- tuple )
|
||||
: boa ( ... class -- tuple )
|
||||
tuple-layout <tuple-boa> ;
|
||||
|
||||
! Quotation building
|
||||
|
|
@ -203,7 +203,7 @@ GENERIC# get-slots 1 ( tuple slots -- ... )
|
|||
GENERIC# set-slots 1 ( ... tuple slots -- )
|
||||
|
||||
: construct ( ... slots class -- tuple )
|
||||
construct-empty [ swap set-slots ] keep ; inline
|
||||
new [ swap set-slots ] keep ; inline
|
||||
|
||||
: construct-delegate ( delegate class -- tuple )
|
||||
>r { set-delegate } r> construct ; inline
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ IN: mirrors
|
|||
TUPLE: mirror object slots ;
|
||||
|
||||
: <mirror> ( object -- mirror )
|
||||
dup object-slots mirror construct-boa ;
|
||||
dup object-slots mirror boa ;
|
||||
|
||||
: >mirror< ( mirror -- obj slots )
|
||||
dup mirror-object swap mirror-slots ;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ SYMBOL: optimizer-changed
|
|||
GENERIC: optimize-node* ( node -- node/t changed? )
|
||||
|
||||
: ?union ( assoc/f assoc -- hash )
|
||||
over [ union ] [ nip ] if ;
|
||||
over [ assoc-union ] [ nip ] if ;
|
||||
|
||||
: add-node-literals ( assoc node -- )
|
||||
over assoc-empty? [
|
||||
|
|
@ -82,7 +82,7 @@ M: node optimize-node* drop t f ;
|
|||
2dup at* [ swap follow nip ] [ 2drop ] if ;
|
||||
|
||||
: union* ( assoc1 assoc2 -- assoc )
|
||||
union [ keys ] keep
|
||||
assoc-union [ keys ] keep
|
||||
[ dupd follow ] curry
|
||||
H{ } map>assoc ;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ sequences.private combinators ;
|
|||
] "output-classes" set-word-prop
|
||||
] each
|
||||
|
||||
\ construct-empty [
|
||||
\ new [
|
||||
dup node-in-d peek node-literal
|
||||
dup class? [ drop tuple ] unless 1array f
|
||||
] "output-classes" set-word-prop
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ TUPLE: silly-tuple a b ;
|
|||
|
||||
[ t ] [ \ node-successor-f-bug compiled? ] unit-test
|
||||
|
||||
[ ] [ [ construct-empty ] dataflow optimize drop ] unit-test
|
||||
[ ] [ [ new ] dataflow optimize drop ] unit-test
|
||||
|
||||
[ ] [ [ <tuple> ] dataflow optimize drop ] unit-test
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ prettyprint sequences strings vectors words quotations inspector
|
|||
io.styles io combinators sorting splitting math.parser effects
|
||||
continuations debugger io.files io.streams.string vocabs
|
||||
io.encodings.utf8 source-files classes classes.tuple hashtables
|
||||
compiler.errors compiler.units accessors ;
|
||||
compiler.errors compiler.units accessors sets ;
|
||||
IN: parser
|
||||
|
||||
TUPLE: lexer text line line-text line-length column ;
|
||||
|
|
@ -17,9 +17,14 @@ TUPLE: lexer text line line-text line-length column ;
|
|||
0 >>column
|
||||
drop ;
|
||||
|
||||
: new-lexer ( text class -- lexer )
|
||||
new
|
||||
0 >>line
|
||||
swap >>text
|
||||
dup next-line ; inline
|
||||
|
||||
: <lexer> ( text -- lexer )
|
||||
0 { set-lexer-text set-lexer-line } lexer construct
|
||||
dup next-line ;
|
||||
lexer new-lexer ;
|
||||
|
||||
: location ( -- loc )
|
||||
file get lexer get lexer-line 2dup and
|
||||
|
|
@ -159,7 +164,7 @@ name>char-hook global [
|
|||
TUPLE: parse-error file line column line-text error ;
|
||||
|
||||
: <parse-error> ( msg -- error )
|
||||
\ parse-error construct-empty
|
||||
\ parse-error new
|
||||
file get >>file
|
||||
lexer get line>> >>line
|
||||
lexer get column>> >>column
|
||||
|
|
@ -256,7 +261,7 @@ M: no-word-error summary
|
|||
drop "Word not found in current vocabulary search path" ;
|
||||
|
||||
: no-word ( name -- newword )
|
||||
dup no-word-error construct-boa
|
||||
dup no-word-error boa
|
||||
swap words-named [ forward-reference? not ] subset
|
||||
word-restarts throw-restarts
|
||||
dup word-vocabulary (use+) ;
|
||||
|
|
@ -288,7 +293,7 @@ M: no-word-error summary
|
|||
scan-word bootstrap-word scan-word create-method-in ;
|
||||
|
||||
: shadowed-slots ( superclass slots -- shadowed )
|
||||
>r all-slot-names r> seq-intersect ;
|
||||
>r all-slot-names r> intersect ;
|
||||
|
||||
: check-slot-shadowing ( class superclass slots -- )
|
||||
shadowed-slots [
|
||||
|
|
@ -501,14 +506,14 @@ SYMBOL: interactive-vocabs
|
|||
] if ;
|
||||
|
||||
: filter-moved ( assoc1 assoc2 -- seq )
|
||||
diff [
|
||||
assoc-diff [
|
||||
drop where dup [ first ] when
|
||||
file get source-file-path =
|
||||
] assoc-subset keys ;
|
||||
|
||||
: removed-definitions ( -- assoc1 assoc2 )
|
||||
new-definitions old-definitions
|
||||
[ get first2 union ] bi@ ;
|
||||
[ get first2 assoc-union ] bi@ ;
|
||||
|
||||
: removed-classes ( -- assoc1 assoc2 )
|
||||
new-definitions old-definitions
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@ $nl
|
|||
{ $subsection short-section }
|
||||
{ $subsection long-section }
|
||||
"Utilities to use when implementing sections:"
|
||||
{ $subsection construct-section }
|
||||
{ $subsection construct-block }
|
||||
{ $subsection new-section }
|
||||
{ $subsection new-block }
|
||||
{ $subsection add-section } ;
|
||||
|
||||
ARTICLE: "prettyprint-sections" "Prettyprinter sections"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@ vectors words prettyprint.backend prettyprint.sections
|
|||
prettyprint.config sorting splitting math.parser vocabs
|
||||
definitions effects classes.builtin classes.tuple io.files
|
||||
classes continuations hashtables classes.mixin classes.union
|
||||
classes.predicate classes.singleton combinators quotations ;
|
||||
classes.predicate classes.singleton combinators quotations
|
||||
sets ;
|
||||
|
||||
: make-pprint ( obj quot -- block in use )
|
||||
[
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ HELP: section
|
|||
{ { $snippet "overhang" } " - number of columns which must be left blank before the wrap margin for the prettyprinter to consider emitting this section as a " { $link short-section } ". Avoids lone hanging closing brackets" }
|
||||
} } ;
|
||||
|
||||
HELP: construct-section
|
||||
HELP: new-section
|
||||
{ $values { "length" integer } { "class" "a subclass of " { $link section } } { "section" section } }
|
||||
{ $description "Creates a new section with the given length starting from " { $link position } ", advancing " { $link position } "." } ;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ SYMBOL: pprinter-use
|
|||
|
||||
TUPLE: pprinter last-newline line-count end-printing indent ;
|
||||
|
||||
: <pprinter> ( -- pprinter ) 0 1 f 0 pprinter construct-boa ;
|
||||
: <pprinter> ( -- pprinter ) 0 1 f 0 pprinter boa ;
|
||||
|
||||
: record-vocab ( word -- )
|
||||
word-vocabulary [ dup pprinter-use get set-at ] when* ;
|
||||
|
|
@ -71,8 +71,8 @@ start end
|
|||
start-group? end-group?
|
||||
style overhang ;
|
||||
|
||||
: construct-section ( length class -- section )
|
||||
construct-empty
|
||||
: new-section ( length class -- section )
|
||||
new
|
||||
position get >>start
|
||||
swap position [ + ] change
|
||||
position get >>end
|
||||
|
|
@ -127,7 +127,7 @@ M: object short-section? section-fits? ;
|
|||
TUPLE: line-break < section type ;
|
||||
|
||||
: <line-break> ( type -- section )
|
||||
0 \ line-break construct-section
|
||||
0 \ line-break new-section
|
||||
swap >>type ;
|
||||
|
||||
M: line-break short-section drop ;
|
||||
|
|
@ -137,13 +137,13 @@ M: line-break long-section drop ;
|
|||
! Block sections
|
||||
TUPLE: block < section sections ;
|
||||
|
||||
: construct-block ( style class -- block )
|
||||
0 swap construct-section
|
||||
: new-block ( style class -- block )
|
||||
0 swap new-section
|
||||
V{ } clone >>sections
|
||||
swap >>style ; inline
|
||||
|
||||
: <block> ( style -- block )
|
||||
block construct-block ;
|
||||
block new-block ;
|
||||
|
||||
: pprinter-block ( -- block ) pprinter-stack get peek ;
|
||||
|
||||
|
|
@ -200,7 +200,7 @@ M: block short-section ( block -- )
|
|||
TUPLE: text < section string ;
|
||||
|
||||
: <text> ( string style -- text )
|
||||
over length 1+ \ text construct-section
|
||||
over length 1+ \ text new-section
|
||||
swap >>style
|
||||
swap >>string ;
|
||||
|
||||
|
|
@ -216,7 +216,7 @@ M: text long-section short-section ;
|
|||
TUPLE: inset < block narrow? ;
|
||||
|
||||
: <inset> ( narrow? -- block )
|
||||
H{ } inset construct-block
|
||||
H{ } inset new-block
|
||||
2 >>overhang
|
||||
swap >>narrow? ;
|
||||
|
||||
|
|
@ -237,7 +237,7 @@ M: inset newline-after? drop t ;
|
|||
TUPLE: flow < block ;
|
||||
|
||||
: <flow> ( -- block )
|
||||
H{ } flow construct-block ;
|
||||
H{ } flow new-block ;
|
||||
|
||||
M: flow short-section? ( section -- ? )
|
||||
#! If we can make room for this entire block by inserting
|
||||
|
|
@ -253,7 +253,7 @@ M: flow short-section? ( section -- ? )
|
|||
TUPLE: colon < block ;
|
||||
|
||||
: <colon> ( -- block )
|
||||
H{ } colon construct-block ;
|
||||
H{ } colon new-block ;
|
||||
|
||||
M: colon long-section short-section ;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,6 @@ IN: sbufs.tests
|
|||
|
||||
[ SBUF" x" ] [ 1 <sbuf> CHAR: x >bignum over push ] unit-test
|
||||
|
||||
[ fixnum ] [ 1 >bignum SBUF" " new length class ] unit-test
|
||||
[ fixnum ] [ 1 >bignum SBUF" " new-sequence length class ] unit-test
|
||||
|
||||
[ fixnum ] [ 1 >bignum [ ] SBUF" " map-as length class ] unit-test
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ IN: sbufs
|
|||
<PRIVATE
|
||||
|
||||
: string>sbuf ( string length -- sbuf )
|
||||
sbuf construct-boa ; inline
|
||||
sbuf boa ; inline
|
||||
|
||||
PRIVATE>
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ PRIVATE>
|
|||
M: sbuf set-nth-unsafe
|
||||
underlying >r >r >fixnum r> >fixnum r> set-string-nth ;
|
||||
|
||||
M: sbuf new drop [ 0 <string> ] keep >fixnum string>sbuf ;
|
||||
M: sbuf new-sequence drop [ 0 <string> ] keep >fixnum string>sbuf ;
|
||||
|
||||
: >sbuf ( seq -- sbuf ) SBUF" " clone-like ; inline
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ ARTICLE: "sequence-protocol" "Sequence protocol"
|
|||
"An optional generic word for creating sequences of the same class as a given sequence:"
|
||||
{ $subsection like }
|
||||
"Optional generic words for optimization purposes:"
|
||||
{ $subsection new }
|
||||
{ $subsection new-sequence }
|
||||
{ $subsection new-resizable }
|
||||
{ $see-also "sequences-unsafe" } ;
|
||||
|
||||
|
|
@ -64,8 +64,7 @@ ARTICLE: "sequences-add-remove" "Adding and removing sequence elements"
|
|||
{ $subsection prefix }
|
||||
{ $subsection suffix }
|
||||
"Removing elements:"
|
||||
{ $subsection remove }
|
||||
{ $subsection seq-diff } ;
|
||||
{ $subsection remove } ;
|
||||
|
||||
ARTICLE: "sequences-reshape" "Reshaping sequences"
|
||||
"A " { $emphasis "repetition" } " is a virtual sequence consisting of a single element repeated multiple times:"
|
||||
|
|
@ -234,6 +233,7 @@ $nl
|
|||
{ $subsection "sequences-destructive" }
|
||||
{ $subsection "sequences-stacks" }
|
||||
{ $subsection "sequences-sorting" }
|
||||
{ $subsection "sets" }
|
||||
"For inner loops:"
|
||||
{ $subsection "sequences-unsafe" } ;
|
||||
|
||||
|
|
@ -281,7 +281,7 @@ HELP: immutable
|
|||
{ $description "Throws an " { $link immutable } " error." }
|
||||
{ $error-description "Thrown if an attempt is made to modify an immutable sequence." } ;
|
||||
|
||||
HELP: new
|
||||
HELP: new-sequence
|
||||
{ $values { "len" "a non-negative integer" } { "seq" sequence } { "newseq" "a mutable sequence" } }
|
||||
{ $contract "Outputs a mutable sequence of length " { $snippet "n" } " which can hold the elements of " { $snippet "seq" } "." } ;
|
||||
|
||||
|
|
@ -528,12 +528,7 @@ HELP: contains?
|
|||
|
||||
HELP: all?
|
||||
{ $values { "seq" sequence } { "quot" "a quotation with stack effect " { $snippet "( elt -- ? )" } } { "?" "a boolean" } }
|
||||
{ $description "Tests if all elements in the sequence satisfy the predicate by checking each element in turn. Given an empty sequence, vacuously outputs " { $link t } "." }
|
||||
{ $notes
|
||||
"The implementation makes use of a well-known logical identity:"
|
||||
$nl
|
||||
{ $snippet "P[x] for all x <==> not ((not P[x]) for some x)" }
|
||||
} ;
|
||||
{ $description "Tests if all elements in the sequence satisfy the predicate by checking each element in turn. Given an empty sequence, vacuously outputs " { $link t } "." } ;
|
||||
|
||||
HELP: push-if
|
||||
{ $values { "elt" object } { "quot" "a quotation with stack effect " { $snippet "( elt -- ? )" } } { "accum" "a resizable mutable sequence" } }
|
||||
|
|
@ -660,10 +655,6 @@ HELP: prefix
|
|||
{ $example "USING: prettyprint sequences ;" "{ 1 2 3 } 0 prefix ." "{ 0 1 2 3 }" }
|
||||
} ;
|
||||
|
||||
HELP: seq-diff
|
||||
{ $values { "seq1" sequence } { "seq2" sequence } { "newseq" sequence } }
|
||||
{ $description "Outputs a sequence consisting of elements present in " { $snippet "seq2" } " but not " { $snippet "seq1" } ", comparing elements for equality." } ;
|
||||
|
||||
HELP: sum-lengths
|
||||
{ $values { "seq" "a sequence of sequences" } { "n" integer } }
|
||||
{ $description "Outputs the sum of the lengths of all sequences in " { $snippet "seq" } "." } ;
|
||||
|
|
|
|||
|
|
@ -240,8 +240,8 @@ unit-test
|
|||
|
||||
[ ?{ f t } ] [ 0 2 ?{ f t f } subseq ] unit-test
|
||||
|
||||
[ V{ f f f } ] [ 3 V{ } new ] unit-test
|
||||
[ SBUF" \0\0\0" ] [ 3 SBUF" " new ] unit-test
|
||||
[ V{ f f f } ] [ 3 V{ } new-sequence ] unit-test
|
||||
[ SBUF" \0\0\0" ] [ 3 SBUF" " new-sequence ] unit-test
|
||||
|
||||
[ 0 ] [ f length ] unit-test
|
||||
[ f first ] must-fail
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ GENERIC: length ( seq -- n ) flushable
|
|||
GENERIC: set-length ( n seq -- )
|
||||
GENERIC: nth ( n seq -- elt ) flushable
|
||||
GENERIC: set-nth ( elt n seq -- )
|
||||
GENERIC: new ( len seq -- newseq ) flushable
|
||||
GENERIC: new-sequence ( len seq -- newseq ) flushable
|
||||
GENERIC: new-resizable ( len seq -- newseq ) flushable
|
||||
GENERIC: like ( seq exemplar -- newseq ) flushable
|
||||
GENERIC: clone-like ( seq exemplar -- newseq ) flushable
|
||||
|
||||
: new-like ( len exemplar quot -- seq )
|
||||
over >r >r new r> call r> like ; inline
|
||||
over >r >r new-sequence r> call r> like ; inline
|
||||
|
||||
M: sequence like drop ;
|
||||
|
||||
|
|
@ -162,7 +162,7 @@ M: virtual-sequence set-nth virtual@ set-nth ;
|
|||
M: virtual-sequence nth-unsafe virtual@ nth-unsafe ;
|
||||
M: virtual-sequence set-nth-unsafe virtual@ set-nth-unsafe ;
|
||||
M: virtual-sequence like virtual-seq like ;
|
||||
M: virtual-sequence new virtual-seq new ;
|
||||
M: virtual-sequence new-sequence virtual-seq new-sequence ;
|
||||
|
||||
INSTANCE: virtual-sequence sequence
|
||||
|
||||
|
|
@ -197,7 +197,7 @@ ERROR: slice-error reason ;
|
|||
: <slice> ( from to seq -- slice )
|
||||
dup slice? [ collapse-slice ] when
|
||||
check-slice
|
||||
slice construct-boa ; inline
|
||||
slice boa ; inline
|
||||
|
||||
M: slice virtual-seq slice-seq ;
|
||||
|
||||
|
|
@ -250,7 +250,7 @@ INSTANCE: repetition immutable-sequence
|
|||
dup 0 <= [ 2drop 2drop ] [ 1- ((copy)) (copy) ] if ; inline
|
||||
|
||||
: prepare-subseq ( from to seq -- dst i src j n )
|
||||
[ >r swap - r> new dup 0 ] 3keep
|
||||
[ >r swap - r> new-sequence dup 0 ] 3keep
|
||||
-rot drop roll length ; inline
|
||||
|
||||
: check-copy ( src n dst -- )
|
||||
|
|
@ -275,7 +275,7 @@ PRIVATE>
|
|||
(copy) drop ; inline
|
||||
|
||||
M: sequence clone-like
|
||||
>r dup length r> new [ 0 swap copy ] keep ;
|
||||
>r dup length r> new-sequence [ 0 swap copy ] keep ;
|
||||
|
||||
M: immutable-sequence clone-like like ;
|
||||
|
||||
|
|
@ -444,9 +444,6 @@ PRIVATE>
|
|||
: memq? ( obj seq -- ? )
|
||||
[ eq? ] with contains? ;
|
||||
|
||||
: seq-intersect ( seq1 seq2 -- seq1/\seq2 )
|
||||
swap [ member? ] curry subset ;
|
||||
|
||||
: remove ( obj seq -- newseq )
|
||||
[ = not ] with subset ;
|
||||
|
||||
|
|
@ -512,9 +509,6 @@ M: slice equal? over slice? [ sequence= ] [ 2drop f ] if ;
|
|||
[ 0 swap copy ] keep
|
||||
] new-like ;
|
||||
|
||||
: seq-diff ( seq1 seq2 -- newseq )
|
||||
swap [ member? not ] curry subset ;
|
||||
|
||||
: peek ( seq -- elt ) dup length 1- swap nth ;
|
||||
|
||||
: pop* ( seq -- ) dup length 1- swap set-length ;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
Slava Pestov
|
||||
Doug Coleman
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
USING: kernel help.markup help.syntax sequences ;
|
||||
IN: sets
|
||||
|
||||
ARTICLE: "sets" "Set-theoretic operations on sequences"
|
||||
"Set-theoretic operations on sequences are defined on the " { $vocab-link "sets" } " vocabulary. These operations use hashtables internally to achieve linear running time."
|
||||
$nl
|
||||
"Remove duplicates:"
|
||||
{ $subsection prune }
|
||||
"Test for duplicates:"
|
||||
{ $subsection all-unique? }
|
||||
"Set operations on sequences:"
|
||||
{ $subsection diff }
|
||||
{ $subsection intersect }
|
||||
{ $subsection union }
|
||||
{ $see-also member? memq? contains? all? "assocs-sets" } ;
|
||||
|
||||
HELP: unique
|
||||
{ $values { "seq" "a sequence" } { "assoc" "an assoc" } }
|
||||
{ $description "Outputs a new assoc where the keys and values are equal." }
|
||||
{ $examples
|
||||
{ $example "USING: sets prettyprint ;" "{ 1 1 2 2 3 3 } unique ." "H{ { 1 1 } { 2 2 } { 3 3 } }" }
|
||||
} ;
|
||||
|
||||
HELP: prune
|
||||
{ $values { "seq" "a sequence" } { "newseq" "a sequence" } }
|
||||
{ $description "Outputs a new sequence with each distinct element of " { $snippet "seq" } " appearing only once. Elements are compared for equality using " { $link = } " and elements are ordered according to their position in " { $snippet "seq" } "." }
|
||||
{ $examples
|
||||
{ $example "USING: sets prettyprint ;" "{ 1 1 t 3 t } prune ." "V{ 1 t 3 }" }
|
||||
} ;
|
||||
|
||||
HELP: all-unique?
|
||||
{ $values { "seq" sequence } { "?" "a boolean" } }
|
||||
{ $description "Tests whether a sequence contains any repeated elements." }
|
||||
{ $example
|
||||
"USING: sets prettyprint ;"
|
||||
"{ 0 1 1 2 3 5 } all-unique? ."
|
||||
"f"
|
||||
} ;
|
||||
|
||||
HELP: diff
|
||||
{ $values { "seq1" sequence } { "seq2" sequence } { "newseq" sequence } }
|
||||
{ $description "Outputs a sequence consisting of elements present in " { $snippet "seq2" } " but not " { $snippet "seq1" } ", comparing elements for equality."
|
||||
} { $examples
|
||||
{ $example "USING: sets prettyprint ;" "{ 1 2 3 } { 2 3 4 } diff ." "{ 4 }" }
|
||||
} ;
|
||||
|
||||
HELP: intersect
|
||||
{ $values { "seq1" sequence } { "seq2" sequence } { "newseq" sequence } }
|
||||
{ $description "Outputs a sequence consisting of elements present in both " { $snippet "seq1" } " and " { $snippet "seq2" } "." }
|
||||
{ $examples
|
||||
{ $example "USING: sets prettyprint ;" "{ 1 2 3 } { 2 3 4 } intersect ." "{ 2 3 }" }
|
||||
} ;
|
||||
|
||||
HELP: union
|
||||
{ $values { "seq1" sequence } { "seq2" sequence } { "newseq" sequence } }
|
||||
{ $description "Outputs a sequence consisting of elements present in " { $snippet "seq1" } " and " { $snippet "seq2" } " which does not contain duplicate values." }
|
||||
{ $examples
|
||||
{ $example "USING: sets prettyprint ;" "{ 1 2 3 } { 2 3 4 } union ." "V{ 1 2 3 4 }" }
|
||||
} ;
|
||||
|
||||
{ diff intersect union } related-words
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
USING: kernel sets tools.test ;
|
||||
IN: sets.tests
|
||||
|
||||
[ f ] [ { 0 1 1 2 3 5 } all-unique? ] unit-test
|
||||
[ t ] [ { 0 1 2 3 4 5 } all-unique? ] unit-test
|
||||
|
||||
[ V{ 1 2 3 } ] [ { 1 2 2 3 3 } prune ] unit-test
|
||||
[ V{ 3 2 1 } ] [ { 3 3 2 2 1 } prune ] unit-test
|
||||
|
||||
[ { } ] [ { } { } intersect ] unit-test
|
||||
[ { 2 3 } ] [ { 1 2 3 } { 2 3 4 } intersect ] unit-test
|
||||
|
||||
[ { } ] [ { } { } diff ] unit-test
|
||||
[ { 4 } ] [ { 1 2 3 } { 2 3 4 } diff ] unit-test
|
||||
|
||||
[ V{ } ] [ { } { } union ] unit-test
|
||||
[ V{ 1 2 3 4 } ] [ { 1 2 3 } { 2 3 4 } union ] unit-test
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
! Copyright (C) 2008 Slava Pestov, Doug Coleman.
|
||||
! See http://factorcode.org/license.txt for BSD license.
|
||||
USING: assocs hashtables kernel sequences vectors ;
|
||||
IN: sets
|
||||
|
||||
: (prune) ( elt hash vec -- )
|
||||
3dup drop key?
|
||||
[ [ drop dupd set-at ] [ nip push ] [ ] 3tri ] unless
|
||||
3drop ; inline
|
||||
|
||||
: prune ( seq -- newseq )
|
||||
[ ] [ length <hashtable> ] [ length <vector> ] tri
|
||||
[ [ (prune) ] 2curry each ] keep ;
|
||||
|
||||
: unique ( seq -- assoc )
|
||||
[ dup ] H{ } map>assoc ;
|
||||
|
||||
: (all-unique?) ( elt hash -- ? )
|
||||
2dup key? [ 2drop f ] [ dupd set-at t ] if ;
|
||||
|
||||
: all-unique? ( seq -- ? )
|
||||
dup length <hashtable> [ (all-unique?) ] curry all? ;
|
||||
|
||||
: intersect ( seq1 seq2 -- newseq )
|
||||
unique [ key? ] curry subset ;
|
||||
|
||||
: diff ( seq1 seq2 -- newseq )
|
||||
swap unique [ key? not ] curry subset ;
|
||||
|
||||
: union ( seq1 seq2 -- newseq )
|
||||
append prune ;
|
||||
|
|
@ -0,0 +1 @@
|
|||
Set-theoretic operations on sequences
|
||||
|
|
@ -0,0 +1 @@
|
|||
collections
|
||||
|
|
@ -69,7 +69,7 @@ M: pathname forget*
|
|||
pathname-string forget-source ;
|
||||
|
||||
: rollback-source-file ( file -- )
|
||||
dup source-file-definitions new-definitions get [ union ] 2map
|
||||
dup source-file-definitions new-definitions get [ assoc-union ] 2map
|
||||
swap set-source-file-definitions ;
|
||||
|
||||
SYMBOL: file
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
! Copyright (C) 2005, 2007 Slava Pestov.
|
||||
! See http://factorcode.org/license.txt for BSD license.
|
||||
USING: kernel math namespaces strings arrays vectors sequences ;
|
||||
USING: kernel math namespaces strings arrays vectors sequences
|
||||
sets ;
|
||||
IN: splitting
|
||||
|
||||
TUPLE: groups seq n sliced? ;
|
||||
|
|
@ -8,7 +9,7 @@ TUPLE: groups seq n sliced? ;
|
|||
: check-groups 0 <= [ "Invalid group count" throw ] when ;
|
||||
|
||||
: <groups> ( seq n -- groups )
|
||||
dup check-groups f groups construct-boa ; inline
|
||||
dup check-groups f groups boa ; inline
|
||||
|
||||
: <sliced-groups> ( seq n -- groups )
|
||||
<groups> t over set-groups-sliced? ;
|
||||
|
|
@ -69,7 +70,7 @@ INSTANCE: groups sequence
|
|||
: split ( seq separators -- pieces ) [ split, ] { } make ;
|
||||
|
||||
: string-lines ( str -- seq )
|
||||
dup "\r\n" seq-intersect empty? [
|
||||
dup "\r\n" intersect empty? [
|
||||
1array
|
||||
] [
|
||||
"\n" split [
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ unit-test
|
|||
[ ] [
|
||||
[
|
||||
4 [
|
||||
100 [ drop "obdurak" ] map
|
||||
100 [ drop "obdurak" clone ] map
|
||||
gc
|
||||
dup [
|
||||
1234 0 rot set-string-nth
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ M: string resize resize-string ;
|
|||
|
||||
: >string ( seq -- str ) "" clone-like ;
|
||||
|
||||
M: string new drop 0 <string> ;
|
||||
M: string new-sequence drop 0 <string> ;
|
||||
|
||||
INSTANCE: string sequence
|
||||
|
|
|
|||
|
|
@ -573,21 +573,21 @@ HELP: ERROR:
|
|||
""
|
||||
"TUPLE: invalid-values x y ;"
|
||||
": invalid-values ( x y -- * )"
|
||||
" \\ invalid-values construct-boa throw ;"
|
||||
" \\ invalid-values boa throw ;"
|
||||
}
|
||||
} ;
|
||||
|
||||
HELP: C:
|
||||
{ $syntax "C: constructor class" }
|
||||
{ $values { "constructor" "a new word to define" } { "class" tuple-class } }
|
||||
{ $description "Define a constructor word for a tuple class which simply performs BOA (by order of arguments) construction using " { $link construct-boa } "." }
|
||||
{ $description "Define a constructor word for a tuple class which simply performs BOA (by order of arguments) construction using " { $link boa } "." }
|
||||
{ $examples
|
||||
"Suppose the following tuple has been defined:"
|
||||
{ $code "TUPLE: color red green blue ;" }
|
||||
"The following two lines are equivalent:"
|
||||
{ $code
|
||||
"C: <color> color"
|
||||
": <color> color construct-boa ;"
|
||||
": <color> color boa ;"
|
||||
}
|
||||
"In both cases, a word " { $snippet "<color>" } " is defined, which reads three values from the stack and creates a " { $snippet "color" } " instance having these values in the " { $snippet "red" } ", " { $snippet "green" } " and " { $snippet "blue" } " slots, respectively."
|
||||
} ;
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ IN: bootstrap.syntax
|
|||
"C:" [
|
||||
CREATE-WORD
|
||||
scan-word dup check-tuple
|
||||
[ construct-boa ] curry define-inline
|
||||
[ boa ] curry define-inline
|
||||
] define-syntax
|
||||
|
||||
"ERROR:" [
|
||||
|
|
|
|||
|
|
@ -56,13 +56,16 @@ mailbox variables sleep-entry ;
|
|||
|
||||
PRIVATE>
|
||||
|
||||
: <thread> ( quot name -- thread )
|
||||
\ thread construct-empty
|
||||
: new-thread ( quot name class -- thread )
|
||||
new
|
||||
swap >>name
|
||||
swap >>quot
|
||||
\ thread counter >>id
|
||||
<box> >>continuation
|
||||
[ ] >>exit-handler ;
|
||||
[ ] >>exit-handler ; inline
|
||||
|
||||
: <thread> ( quot name -- thread )
|
||||
\ thread new-thread ;
|
||||
|
||||
: run-queue 42 getenv ;
|
||||
|
||||
|
|
|
|||
|
|
@ -94,6 +94,6 @@ IN: vectors.tests
|
|||
100 >array dup >vector <reversed> >array >r reverse r> =
|
||||
] unit-test
|
||||
|
||||
[ fixnum ] [ 1 >bignum V{ } new length class ] unit-test
|
||||
[ fixnum ] [ 1 >bignum V{ } new-sequence length class ] unit-test
|
||||
|
||||
[ fixnum ] [ 1 >bignum [ ] V{ } map-as length class ] unit-test
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ IN: vectors
|
|||
<PRIVATE
|
||||
|
||||
: array>vector ( array length -- vector )
|
||||
vector construct-boa ; inline
|
||||
vector boa ; inline
|
||||
|
||||
PRIVATE>
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ M: vector like
|
|||
dup array? [ dup length array>vector ] [ >vector ] if
|
||||
] unless ;
|
||||
|
||||
M: vector new drop [ f <array> ] keep >fixnum array>vector ;
|
||||
M: vector new-sequence drop [ f <array> ] keep >fixnum array>vector ;
|
||||
|
||||
M: vector equal?
|
||||
over vector? [ sequence= ] [ 2drop f ] if ;
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ SYMBOL: load-vocab-hook ! ( name -- )
|
|||
TUPLE: vocab-link name ;
|
||||
|
||||
: <vocab-link> ( name -- vocab-link )
|
||||
vocab-link construct-boa ;
|
||||
vocab-link boa ;
|
||||
|
||||
M: vocab-link hashcode*
|
||||
vocab-link-name hashcode* ;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ SYMBOL: alarm-thread
|
|||
pick callable? [ "Not a quotation" throw ] unless ; inline
|
||||
|
||||
: <alarm> ( quot time frequency -- alarm )
|
||||
check-alarm <box> alarm construct-boa ;
|
||||
check-alarm <box> alarm boa ;
|
||||
|
||||
: register-alarm ( alarm -- )
|
||||
dup dup alarm-time alarms get-global heap-push*
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Non-core array words
|
||||
|
|
@ -48,7 +48,7 @@ SYMBOL: elements
|
|||
|
||||
TUPLE: element syntax id tag tagclass encoding contentlength newobj objtype ;
|
||||
|
||||
: <element> element construct-empty ;
|
||||
: <element> element new ;
|
||||
|
||||
: set-id ( -- boolean )
|
||||
read1 dup elements get set-element-id ;
|
||||
|
|
@ -172,7 +172,7 @@ SYMBOL: tagnum
|
|||
|
||||
TUPLE: tag value ;
|
||||
|
||||
: <tag> ( -- <tag> ) 4 tag construct-boa ;
|
||||
: <tag> ( -- <tag> ) 4 tag boa ;
|
||||
|
||||
: with-ber ( quot -- )
|
||||
[
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ M: x30 g ;
|
|||
"benchmark.dispatch1" words [ tuple-class? ] subset ;
|
||||
|
||||
: a-bunch-of-objects ( -- seq )
|
||||
my-classes [ construct-empty ] map ;
|
||||
my-classes [ new ] map ;
|
||||
|
||||
: dispatch-benchmark ( -- )
|
||||
1000000 a-bunch-of-objects
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ INSTANCE: x30 g
|
|||
"benchmark.dispatch5" words [ tuple-class? ] subset ;
|
||||
|
||||
: a-bunch-of-objects ( -- seq )
|
||||
my-classes [ construct-empty ] map ;
|
||||
my-classes [ new ] map ;
|
||||
|
||||
: dispatch-benchmark ( -- )
|
||||
1000000 a-bunch-of-objects
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@ TUPLE: hello n ;
|
|||
|
||||
: foo 0 100000000 [ over hello-n + ] times ;
|
||||
|
||||
: typecheck-main 0 hello construct-boa foo 2drop ;
|
||||
: typecheck-main 0 hello boa foo 2drop ;
|
||||
|
||||
MAIN: typecheck-main
|
||||
|
|
|
|||
|
|
@ -7,6 +7,6 @@ TUPLE: hello n ;
|
|||
|
||||
: foo 0 100000000 [ over hello-n* + ] times ;
|
||||
|
||||
: typecheck-main 0 hello construct-boa foo 2drop ;
|
||||
: typecheck-main 0 hello boa foo 2drop ;
|
||||
|
||||
MAIN: typecheck-main
|
||||
|
|
|
|||
|
|
@ -7,6 +7,6 @@ TUPLE: hello n ;
|
|||
|
||||
: foo 0 100000000 [ over hello-n* + ] times ;
|
||||
|
||||
: typecheck-main 0 hello construct-boa foo 2drop ;
|
||||
: typecheck-main 0 hello boa foo 2drop ;
|
||||
|
||||
MAIN: typecheck-main
|
||||
|
|
|
|||
|
|
@ -7,6 +7,6 @@ TUPLE: hello n ;
|
|||
|
||||
: foo 0 100000000 [ over hello-n* + ] times ;
|
||||
|
||||
: typecheck-main 0 hello construct-boa foo 2drop ;
|
||||
: typecheck-main 0 hello boa foo 2drop ;
|
||||
|
||||
MAIN: typecheck-main
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ TUPLE: check< number bound ;
|
|||
M: check< summary drop "Number exceeds upper bound" ;
|
||||
|
||||
: check< ( num cmp -- num )
|
||||
2dup < [ drop ] [ \ check< construct-boa throw ] if ;
|
||||
2dup < [ drop ] [ \ check< boa throw ] if ;
|
||||
|
||||
: ?check ( length -- )
|
||||
safe-bitfields? get [ 2^ , \ check< , ] [ drop ] if ;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ IN: bubble-chamber.particle.axion
|
|||
|
||||
TUPLE: axion < particle ;
|
||||
|
||||
: <axion> ( -- axion ) axion construct-empty initialize-particle ;
|
||||
: <axion> ( -- axion ) axion new initialize-particle ;
|
||||
|
||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ IN: bubble-chamber.particle.hadron
|
|||
|
||||
TUPLE: hadron < particle ;
|
||||
|
||||
: <hadron> ( -- hadron ) hadron construct-empty initialize-particle ;
|
||||
: <hadron> ( -- hadron ) hadron new initialize-particle ;
|
||||
|
||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ IN: bubble-chamber.particle.muon
|
|||
|
||||
TUPLE: muon < particle ;
|
||||
|
||||
: <muon> ( -- muon ) muon construct-empty initialize-particle ;
|
||||
: <muon> ( -- muon ) muon new initialize-particle ;
|
||||
|
||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ IN: bubble-chamber.particle.quark
|
|||
|
||||
TUPLE: quark < particle ;
|
||||
|
||||
: <quark> ( -- quark ) quark construct-empty initialize-particle ;
|
||||
: <quark> ( -- quark ) quark new initialize-particle ;
|
||||
|
||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ TUPLE: bunny-buffers array element-array nv ni ;
|
|||
|
||||
: <bunny-dlist> ( model -- geom )
|
||||
GL_COMPILE [ first3 draw-triangles ] make-dlist
|
||||
bunny-dlist construct-boa ;
|
||||
bunny-dlist boa ;
|
||||
|
||||
: <bunny-buffers> ( model -- geom )
|
||||
{
|
||||
|
|
@ -76,7 +76,7 @@ TUPLE: bunny-buffers array element-array nv ni ;
|
|||
]
|
||||
[ first length 3 * ]
|
||||
[ third length 3 * ]
|
||||
} cleave bunny-buffers construct-boa ;
|
||||
} cleave bunny-buffers boa ;
|
||||
|
||||
GENERIC: bunny-geom ( geom -- )
|
||||
GENERIC: draw-bunny ( geom draw -- )
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue