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

db4
Slava Pestov 2008-04-11 20:06:46 -05:00
commit 481bb0b9bd
3 changed files with 286 additions and 286 deletions

View File

@ -17,9 +17,9 @@ ERROR: cairo-error string ;
: cairo-png-error ( n -- )
{
{ \ CAIRO_STATUS_NO_MEMORY [ "Cairo: no memory" cairo-error ] }
{ \ CAIRO_STATUS_FILE_NOT_FOUND [ "Cairo: file not found" cairo-error ] }
{ \ CAIRO_STATUS_READ_ERROR [ "Cairo: read error" cairo-error ] }
{ CAIRO_STATUS_NO_MEMORY [ "Cairo: no memory" cairo-error ] }
{ CAIRO_STATUS_FILE_NOT_FOUND [ "Cairo: file not found" cairo-error ] }
{ CAIRO_STATUS_READ_ERROR [ "Cairo: read error" cairo-error ] }
[ drop ]
} cond ;

View File

@ -116,8 +116,8 @@ SYMBOL: SQL-TYPE-UNKNOWN
: succeeded? ( n -- bool )
#! Did the call succeed (SQL-SUCCESS or SQL-SUCCESS-WITH-INFO)
{
{ \ SQL-SUCCESS [ t ] }
{ \ SQL-SUCCESS-WITH-INFO [ t ] }
{ SQL-SUCCESS [ t ] }
{ SQL-SUCCESS-WITH-INFO [ t ] }
[ drop f ]
} case ;

View File

@ -35,18 +35,18 @@ C: <connection> connection
: check-result ( result -- )
{
{ \ OCI_SUCCESS [ ] }
{ \ OCI_ERROR [ err get get-oci-error ] }
{ \ OCI_INVALID_HANDLE [ "invalid handle" throw ] }
{ OCI_SUCCESS [ ] }
{ OCI_ERROR [ err get get-oci-error ] }
{ OCI_INVALID_HANDLE [ "invalid handle" throw ] }
[ "operation failed" throw ]
} case ;
: check-status ( status -- bool )
{
{ \ OCI_SUCCESS [ t ] }
{ \ OCI_ERROR [ err get get-oci-error ] }
{ \ OCI_INVALID_HANDLE [ "invalid handle" throw ] }
{ \ OCI_NO_DATA [ f ] }
{ OCI_SUCCESS [ t ] }
{ OCI_ERROR [ err get get-oci-error ] }
{ OCI_INVALID_HANDLE [ "invalid handle" throw ] }
{ OCI_NO_DATA [ f ] }
[ "operation failed" throw ]
} case ;
@ -155,12 +155,12 @@ C: <connection> connection
: calculate-size ( type -- size )
{
{ \ SQLT_INT [ "int" heap-size ] }
{ \ SQLT_FLT [ "float" heap-size ] }
{ \ SQLT_CHR [ "char" heap-size ] }
{ \ SQLT_NUM [ "int" heap-size 10 * ] }
{ \ SQLT_STR [ 64 ] }
{ \ SQLT_ODT [ 256 ] }
{ SQLT_INT [ "int" heap-size ] }
{ SQLT_FLT [ "float" heap-size ] }
{ SQLT_CHR [ "char" heap-size ] }
{ SQLT_NUM [ "int" heap-size 10 * ] }
{ SQLT_STR [ 64 ] }
{ SQLT_ODT [ 256 ] }
} case ;
: define-by-position ( position type -- )