From 37d07053e64235d903bdfbc063ba8422f2f45c96 Mon Sep 17 00:00:00 2001 From: slava Date: Fri, 25 Aug 2006 04:25:43 +0000 Subject: [PATCH] contrib/ load fixes --- contrib/README.txt | 10 ++++++++++ contrib/all.factor | 7 ++++--- contrib/cairo/cairo.factor | 2 +- contrib/emacs.factor | 3 ++- contrib/random-tester/random-tester.factor | 14 +++++++------- contrib/sqlite/tuple-db.factor | 2 +- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/contrib/README.txt b/contrib/README.txt index 29c8d34db0..0af73ef1f5 100644 --- a/contrib/README.txt +++ b/contrib/README.txt @@ -7,6 +7,7 @@ Modules can be loaded from the listener: Credits: +- action-field -- Extended field gadget for UI (Eduardo Cavazos) - automata -- Graphics demo for the UI (Eduardo Cavazos) - boids -- Graphics demo for the UI (Eduardo Cavazos) - cairo -- cairo bindings (Sampo Vuori) @@ -15,10 +16,15 @@ Credits: - coroutines -- coroutines (Chris Double) - crypto -- Various cryptographic algorithms (Doug Coleman) - dlists -- double-linked-lists (Mackenzie Straight) +- emacs -- emacs integration (Eduardo Cavazos) +- embedded -- simple template processor (Alex Chapman) - factory -- X11 window manager (Eduardo Cavazos) - gap-buffer -- Efficient text editor buffer (Alex Chapman) - hexdump -- Hexdump routine (Doug Coleman) - httpd -- Web framework (HTTP server, client, XML parser, HTML generation...) (Slava Pestov, Chris Double, Daniel Ehrenberg) +- jedit -- jEdit editor integration (Slava Pestov) +- json -- JSON reader and writer (Chris Double) +- lambda -- Lambda calculus interpreter (Matthew Willis) - lazy-lists -- Lazy evaluation lists (Chris Double, Matthew Willis) - math -- extended math library (Doug Coleman, Slava Pestov) - parser-combinators -- Haskell-style parser combinators (Chris Double) @@ -29,4 +35,8 @@ Credits: - space-invaders -- Intel 8080-based Space Invaders arcade machine emulator (Chris Double) - splay-trees -- Splay trees (Mackenzie Straight) - sqlite -- SQLite binding (Chris Double) +- topology -- Computational algebraic topology (Slava Pestov) +- units -- Unit conversion (Doug Coleman) +- vars -- Alternative syntax for variables (Eduardo Cavazos) +- vim -- VIM integration (Alex Chapman) - x11 -- X Window System client library (Eduardo Cavazos) diff --git a/contrib/all.factor b/contrib/all.factor index 7ad5ba1447..c0059ce80e 100644 --- a/contrib/all.factor +++ b/contrib/all.factor @@ -1,9 +1,10 @@ USING: kernel modules words ; REQUIRES: automata boids cairo calendar concurrency coroutines -crypto dlists embedded gap-buffer hexdump httpd lambda math postgresql -process random-tester slate splay-trees sqlite topology units -vars ; +crypto dlists emacs embedded gap-buffer hexdump httpd jedit +json lambda lazy-lists math parser-combinators postgresql +process random-tester slate space-invaders splay-trees sqlite +topology units vars vim ; "x11" vocab [ "factory" require diff --git a/contrib/cairo/cairo.factor b/contrib/cairo/cairo.factor index 89d4949bf0..cf14f0ae7d 100644 --- a/contrib/cairo/cairo.factor +++ b/contrib/cairo/cairo.factor @@ -185,7 +185,7 @@ C-ENUM: : cairo_set_operator ( cairo_t cairo_operator_t -- ) "void" "cairo" "cairo_set_operator" [ "cairo_t*" "int" ] ; -: cairo_image_surface_create_for_data ( data format width height stride -- cairo_surface_t) +: cairo_image_surface_create_for_data ( data format width height stride -- cairo_surface_t ) "void*" "cairo" "cairo_image_surface_create_for_data" [ "void*" "uint" "int" "int" "int" ] alien-invoke ; : cairo_set_source_rgb ( cairo_t red green blue -- ) diff --git a/contrib/emacs.factor b/contrib/emacs.factor index 131be3fd6c..a5352a08cd 100644 --- a/contrib/emacs.factor +++ b/contrib/emacs.factor @@ -1,6 +1,7 @@ REQUIRES: process ; -USING: definitions kernel parser words sequences math process ; +USING: definitions kernel parser words sequences math process +namespaces ; IN: emacs diff --git a/contrib/random-tester/random-tester.factor b/contrib/random-tester/random-tester.factor index 240d4db9b7..1341782b33 100644 --- a/contrib/random-tester/random-tester.factor +++ b/contrib/random-tester/random-tester.factor @@ -14,7 +14,7 @@ IN: random-tester 1+ 1- >bignum >digit >fixnum abs absq arg bitnot bits>double bits>float ceiling cis conjugate cos cosec cosech cosh cot coth denominator double>bits exp float>bits floor imaginary - log neg numerator quadrant real sec ! next-power-of-2 + log neg numerator real sec ! next-power-of-2 sech sgn sin sinh sq sqrt tan tanh truncate } ; @@ -39,7 +39,7 @@ IN: random-tester 1+ 1- >bignum >digit >fixnum abs absq arg bitnot bits>double bits>float ceiling cis conjugate cos cosec cosech cosh cot coth denominator double>bits exp float>bits floor imaginary - log neg next-power-of-2 numerator quadrant real sec + log neg next-power-of-2 numerator real sec sech sgn sin sinh sq sqrt tan tanh truncate } ; @@ -48,7 +48,7 @@ IN: random-tester 1+ 1- >bignum >digit >fixnum abs absq arg ceiling cis conjugate cos cosec cosech cosh cot coth double>bits exp float>bits floor imaginary - log neg next-power-of-2 quadrant real sec + log neg next-power-of-2 real sec sech sgn sin sinh sq sqrt tan tanh truncate } ; @@ -57,14 +57,14 @@ IN: random-tester 1+ 1- >bignum >digit >fixnum abs absq arg ceiling cis conjugate cos cosec cosech cosh cot coth double>bits exp float>bits floor imaginary - log neg quadrant real sec ! next-power-of-2 + log neg real sec ! next-power-of-2 sech sgn sin sinh sq sqrt tan tanh truncate } ; : 1-complex>x { 1+ 1- abs absq arg conjugate cos cosec cosech - cosh cot coth exp imaginary log neg quadrant real + cosh cot coth exp imaginary log neg real sec sech sin sinh sq sqrt tan tanh } ; @@ -86,7 +86,7 @@ IN: random-tester 1+ 1- >bignum >digit >fixnum abs absq bitnot ceiling conjugate denominator double>bits float>bits floor imaginary - neg next-power-of-2 numerator quadrant + neg next-power-of-2 numerator real sgn sq truncate } ; @@ -104,7 +104,7 @@ IN: random-tester 1+ 1- abs absq arg conjugate cosec cosech cosh cot coth exp - log neg quadrant + log neg sech sin sinh sq sqrt tanh } ; diff --git a/contrib/sqlite/tuple-db.factor b/contrib/sqlite/tuple-db.factor index b26d50ad26..b64c146176 100644 --- a/contrib/sqlite/tuple-db.factor +++ b/contrib/sqlite/tuple-db.factor @@ -148,7 +148,7 @@ M: mapping delete-sql ( mapping -- string ) ] "" make ; GENERIC: update-sql -M: mapping update-sql ( mapping -- string) +M: mapping update-sql ( mapping -- string ) #! Return the SQL used to update the tuple [ "update " % dup mapping-table %