steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

odbc: fix referencing and dereferencing the aliens

char-rename
Alexander Iljin 2016-10-29 21:42:41 +03:00 committed by John Benediktsson
parent b9eaaa706a
commit 32bb390d4f
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
unmaintained/odbc/odbc.factor
View File

@ -131,8 +131,8 @@ FUNCTION: SQLRETURN SQLDescribeCol ( SQLHSTMT statementHandle, SQLSMALLINT colum
FUNCTION: SQLRETURN SQLGetData ( SQLHSTMT statementHandle, SQLUSMALLINT columnNumber, SQLSMALLINT targetType, SQLPOINTER targetValuePtr, SQLINTEGER bufferLength, SQLINTEGER* strlen_or_indPtr ) FUNCTION: SQLRETURN SQLGetData ( SQLHSTMT statementHandle, SQLUSMALLINT columnNumber, SQLSMALLINT targetType, SQLPOINTER targetValuePtr, SQLINTEGER bufferLength, SQLINTEGER* strlen_or_indPtr )
: alloc-handle ( type parent -- handle ) : alloc-handle ( type parent -- handle )
f <void*> [ SQLAllocHandle ] keep swap succeeded? [ f void* <ref> [ SQLAllocHandle ] keep swap succeeded? [
*void* void* deref
] [ ] [
drop f drop f
] if ; ] if ;
@ -158,7 +158,7 @@ FUNCTION: SQLRETURN SQLGetData ( SQLHSTMT statementHandle, SQLUSMALLINT columnNu
: odbc-connect ( env dsn -- dbc ) : odbc-connect ( env dsn -- dbc )
>r alloc-dbc-handle dup r> >r alloc-dbc-handle dup r>
f swap dup length 1024 temp-string 0 <short> SQL-DRIVER-NOPROMPT f swap dup length 1024 temp-string 0 short <ref> SQL-DRIVER-NOPROMPT
SQLDriverConnect succeeded? [ "odbc-connect failed" throw ] unless ; SQLDriverConnect succeeded? [ "odbc-connect failed" throw ] unless ;
: odbc-disconnect ( dbc -- ) : odbc-disconnect ( dbc -- )
@ -177,8 +177,8 @@ FUNCTION: SQLRETURN SQLGetData ( SQLHSTMT statementHandle, SQLUSMALLINT columnNu
SQLFetch succeeded? ; SQLFetch succeeded? ;
: odbc-number-of-columns ( statement -- number ) : odbc-number-of-columns ( statement -- number )
0 <short> [ SQLNumResultCols succeeded? ] keep swap [ 0 short <ref> [ SQLNumResultCols succeeded? ] keep swap [
*short short deref
] [ ] [
drop f drop f
] if ; ] if ;
@ -191,16 +191,16 @@ C: <column> column
dup >r dup >r
1024 CHAR: space <string> ascii string>alien dup >r 1024 CHAR: space <string> ascii string>alien dup >r
1024 1024
0 <short> 0 short <ref>
0 <short> dup >r 0 short <ref> dup >r
0 <uint> dup >r 0 uint <ref> dup >r
0 <short> dup >r 0 short <ref> dup >r
0 <short> dup >r 0 short <ref> dup >r
SQLDescribeCol succeeded? [ SQLDescribeCol succeeded? [
r> *short r> short deref
r> *short r> short deref
r> *uint r> uint deref
r> *short convert-sql-type r> short deref convert-sql-type
r> ascii alien>string r> ascii alien>string
r> <column> r> <column>
] [ ] [
@ -216,13 +216,13 @@ C: <column> column
{ SQL-WCHAR [ ascii alien>string ] } { SQL-WCHAR [ ascii alien>string ] }
{ SQL-WCHARVAR [ ascii alien>string ] } { SQL-WCHARVAR [ ascii alien>string ] }
{ SQL-WLONGCHARVAR [ ascii alien>string ] } { SQL-WLONGCHARVAR [ ascii alien>string ] }
{ SQL-SMALLINT [ *short ] } { SQL-SMALLINT [ short deref ] }
{ SQL-INTEGER [ *long ] } { SQL-INTEGER [ long deref ] }
{ SQL-REAL [ *float ] } { SQL-REAL [ float deref ] }
{ SQL-FLOAT [ *double ] } { SQL-FLOAT [ double deref ] }
{ SQL-DOUBLE [ *double ] } { SQL-DOUBLE [ double deref ] }
{ SQL-TINYINT [ *char ] } { SQL-TINYINT [ char deref ] }
{ SQL-BIGINT [ *longlong ] } { SQL-BIGINT [ longlong deref ] }
[ nip [ "Unknown SQL Type: " % name>> % ] "" make ] [ nip [ "Unknown SQL Type: " % name>> % ] "" make ]
} case ; } case ;