From 28970d9469e6e610e167c5037e3611729033ac54 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 11 Mar 2008 16:03:22 -0500 Subject: [PATCH] Fix bugs --- extra/db/postgresql/ffi/ffi.factor | 2 +- extra/http/server/auth/auth.factor | 3 ++- extra/http/server/auth/providers/providers.factor | 2 +- extra/http/server/callbacks/callbacks-tests.factor | 4 ++-- extra/xmode/tokens/tokens.factor | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/extra/db/postgresql/ffi/ffi.factor b/extra/db/postgresql/ffi/ffi.factor index 1e3a9655a2..be491b8c85 100755 --- a/extra/db/postgresql/ffi/ffi.factor +++ b/extra/db/postgresql/ffi/ffi.factor @@ -6,7 +6,7 @@ IN: db.postgresql.ffi << "postgresql" { { [ win32? ] [ "libpq.dll" ] } - { [ macosx? ] [ "/opt/local/lib/postgresql81/libpq.dylib" ] } + { [ macosx? ] [ "/opt/local/lib/postgresql82/libpq.dylib" ] } { [ unix? ] [ "libpq.so" ] } } cond "cdecl" add-library >> diff --git a/extra/http/server/auth/auth.factor b/extra/http/server/auth/auth.factor index a9645693fb..1b1534b85e 100755 --- a/extra/http/server/auth/auth.factor +++ b/extra/http/server/auth/auth.factor @@ -1,6 +1,7 @@ ! Copyright (c) 2008 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. -USING: http.server.sessions accessors ; +USING: http.server.sessions accessors +http.server.auth.providers ; IN: http.server.auth SYMBOL: logged-in-user diff --git a/extra/http/server/auth/providers/providers.factor b/extra/http/server/auth/providers/providers.factor index 08b71432cd..0aa27f870d 100755 --- a/extra/http/server/auth/providers/providers.factor +++ b/extra/http/server/auth/providers/providers.factor @@ -17,7 +17,7 @@ GENERIC: new-user ( user provider -- user/f ) : check-login ( password username provider -- user/f ) get-user dup [ [ password>> = ] keep and ] [ 2drop f ] if ; -:: set-password ( password username provider -- ) +:: set-password ( password username provider -- ? ) [let | user [ username provider get-user ] | user [ user diff --git a/extra/http/server/callbacks/callbacks-tests.factor b/extra/http/server/callbacks/callbacks-tests.factor index 4397ee5d15..4cad097cf5 100755 --- a/extra/http/server/callbacks/callbacks-tests.factor +++ b/extra/http/server/callbacks/callbacks-tests.factor @@ -9,7 +9,7 @@ splitting kernel hashtables continuations ; [ exit-continuation set "xxx" - [ [ "hello" print 123 ] show-final ] >>get + [ [ "hello" print 123 ] show-final ] >>display call-responder ] callcc1 @@ -24,7 +24,7 @@ splitting kernel hashtables continuations ; ] show-page "byebye" print [ 123 ] show-final - ] >>get + ] >>display "r" set [ 123 ] [ diff --git a/extra/xmode/tokens/tokens.factor b/extra/xmode/tokens/tokens.factor index 7b913cbac0..018164dfcf 100755 --- a/extra/xmode/tokens/tokens.factor +++ b/extra/xmode/tokens/tokens.factor @@ -3,9 +3,9 @@ compiler.units ; IN: xmode.tokens ! Based on org.gjt.sp.jedit.syntax.Token +<< SYMBOL: tokens -<< { "COMMENT1" "COMMENT2" "COMMENT3" "COMMENT4" "DIGIT" "FUNCTION" "INVALID" "KEYWORD1" "KEYWORD2" "KEYWORD3" "KEYWORD4" "LABEL" "LITERAL1" "LITERAL2" "LITERAL3" "LITERAL4" "MARKUP" "OPERATOR" "END" "NULL" } [ create-in dup define-symbol dup word-name swap