use radix literals

[factor.git] / basis / db / sqlite / ffi / ffi.factor

diff --git a/basis/db/sqlite/ffi/ffi.factor b/basis/db/sqlite/ffi/ffi.factor
index 341995634e1a971cfc0032d6f939a9602489686b..7fcb4babf52dbff06e148f4f99a1a621940e32b7 100644 (file)
--- a/basis/db/sqlite/ffi/ffi.factor
+++ b/basis/db/sqlite/ffi/ffi.factor
@@ -3,14 +3,14 @@
 ! An interface to the sqlite database. Tested against sqlite v3.1.3.
 ! Not all functions have been wrapped.
 USING: alien compiler kernel math namespaces sequences strings alien.syntax
-    system combinators alien.c-types ;
+system combinators alien.c-types alien.libraries ;
 IN: db.sqlite.ffi
 
 << "sqlite" {
-        { [ os winnt? ]  [ "sqlite3.dll" ] }
+        { [ os windows? ]  [ "sqlite3.dll" ] }
         { [ os macosx? ] [ "/usr/lib/libsqlite3.dylib" ] }
         { [ os unix? ]  [ "libsqlite3.so" ] }
-    } cond "cdecl" add-library >>
+    } cond cdecl add-library >>
 
 ! Return values from sqlite functions
 CONSTANT: SQLITE_OK           0 ! Successful result
@@ -86,30 +86,30 @@ CONSTANT: SQLITE_NULL        5
 CONSTANT: SQLITE_STATIC      0
 CONSTANT: SQLITE_TRANSIENT   -1
 
-CONSTANT: SQLITE_OPEN_READONLY         HEX: 00000001
-CONSTANT: SQLITE_OPEN_READWRITE        HEX: 00000002
-CONSTANT: SQLITE_OPEN_CREATE           HEX: 00000004
-CONSTANT: SQLITE_OPEN_DELETEONCLOSE    HEX: 00000008
-CONSTANT: SQLITE_OPEN_EXCLUSIVE        HEX: 00000010
-CONSTANT: SQLITE_OPEN_MAIN_DB          HEX: 00000100
-CONSTANT: SQLITE_OPEN_TEMP_DB          HEX: 00000200
-CONSTANT: SQLITE_OPEN_TRANSIENT_DB     HEX: 00000400
-CONSTANT: SQLITE_OPEN_MAIN_JOURNAL     HEX: 00000800
-CONSTANT: SQLITE_OPEN_TEMP_JOURNAL     HEX: 00001000
-CONSTANT: SQLITE_OPEN_SUBJOURNAL       HEX: 00002000
-CONSTANT: SQLITE_OPEN_MASTER_JOURNAL   HEX: 00004000
+CONSTANT: SQLITE_OPEN_READONLY         0x00000001
+CONSTANT: SQLITE_OPEN_READWRITE        0x00000002
+CONSTANT: SQLITE_OPEN_CREATE           0x00000004
+CONSTANT: SQLITE_OPEN_DELETEONCLOSE    0x00000008
+CONSTANT: SQLITE_OPEN_EXCLUSIVE        0x00000010
+CONSTANT: SQLITE_OPEN_MAIN_DB          0x00000100
+CONSTANT: SQLITE_OPEN_TEMP_DB          0x00000200
+CONSTANT: SQLITE_OPEN_TRANSIENT_DB     0x00000400
+CONSTANT: SQLITE_OPEN_MAIN_JOURNAL     0x00000800
+CONSTANT: SQLITE_OPEN_TEMP_JOURNAL     0x00001000
+CONSTANT: SQLITE_OPEN_SUBJOURNAL       0x00002000
+CONSTANT: SQLITE_OPEN_MASTER_JOURNAL   0x00004000
 
-TYPEDEF: void sqlite3
-TYPEDEF: void sqlite3_stmt
+C-TYPE: sqlite3
+C-TYPE: sqlite3_stmt
 TYPEDEF: longlong sqlite3_int64
 TYPEDEF: ulonglong sqlite3_uint64
 
 LIBRARY: sqlite
-FUNCTION: int sqlite3_open ( char* filename, void* ppDb ) ;
+FUNCTION: int sqlite3_open ( c-string filename, void* ppDb ) ;
 FUNCTION: int sqlite3_close ( sqlite3* pDb ) ;
-FUNCTION: char* sqlite3_errmsg ( sqlite3* pDb ) ;
-FUNCTION: int sqlite3_prepare ( sqlite3* pDb, char* zSql, int nBytes, void* ppStmt, void* pzTail ) ;
-FUNCTION: int sqlite3_prepare_v2 ( sqlite3* pDb, char* zSql, int nBytes, void* ppStmt, void* pzTail ) ;
+FUNCTION: c-string sqlite3_errmsg ( sqlite3* pDb ) ;
+FUNCTION: int sqlite3_prepare ( sqlite3* pDb, c-string zSql, int nBytes, void* ppStmt, void* pzTail ) ;
+FUNCTION: int sqlite3_prepare_v2 ( sqlite3* pDb, c-string zSql, int nBytes, void* ppStmt, void* pzTail ) ;
 FUNCTION: int sqlite3_finalize ( sqlite3_stmt* pStmt ) ;
 FUNCTION: int sqlite3_reset ( sqlite3_stmt* pStmt ) ;
 FUNCTION: int sqlite3_step ( sqlite3_stmt* pStmt ) ;
@@ -119,24 +119,22 @@ FUNCTION: int sqlite3_bind_double ( sqlite3_stmt* pStmt, int index, double x ) ;
 FUNCTION: int sqlite3_bind_int ( sqlite3_stmt* pStmt, int index, int n ) ;
 FUNCTION: int sqlite3_bind_int64 ( sqlite3_stmt* pStmt, int index, sqlite3_int64 n ) ;
 ! Bind the same function as above, but for unsigned 64bit integers
-: sqlite3-bind-uint64 ( pStmt index in64 -- int )
-    "int" "sqlite" "sqlite3_bind_int64"
-    { "sqlite3_stmt*" "int" "sqlite3_uint64" } alien-invoke ;
+FUNCTION-ALIAS: sqlite3-bind-uint64
+    int sqlite3_bind_int64 ( sqlite3_stmt* pStmt, int index, sqlite3_uint64 in64 ) ;
 FUNCTION: int sqlite3_bind_null ( sqlite3_stmt* pStmt, int n ) ;
-FUNCTION: int sqlite3_bind_text ( sqlite3_stmt* pStmt, int index, char* text, int len, int destructor ) ;
-FUNCTION: int sqlite3_bind_parameter_index ( sqlite3_stmt* pStmt, char* name ) ;
+FUNCTION: int sqlite3_bind_text ( sqlite3_stmt* pStmt, int index, c-string text, int len, int destructor ) ;
+FUNCTION: int sqlite3_bind_parameter_index ( sqlite3_stmt* pStmt, c-string name ) ;
 FUNCTION: int sqlite3_clear_bindings ( sqlite3_stmt* pStmt ) ;
 FUNCTION: int sqlite3_column_count ( sqlite3_stmt* pStmt ) ;
 FUNCTION: void* sqlite3_column_blob ( sqlite3_stmt* pStmt, int col ) ;
 FUNCTION: int sqlite3_column_bytes ( sqlite3_stmt* pStmt, int col ) ;
-FUNCTION: char* sqlite3_column_decltype ( sqlite3_stmt* pStmt, int col ) ;
+FUNCTION: c-string sqlite3_column_decltype ( sqlite3_stmt* pStmt, int col ) ;
 FUNCTION: int sqlite3_column_int ( sqlite3_stmt* pStmt, int col ) ;
 FUNCTION: sqlite3_int64 sqlite3_column_int64 ( sqlite3_stmt* pStmt, int col ) ;
 ! Bind the same function as above, but for unsigned 64bit integers
-: sqlite3-column-uint64 ( pStmt col -- uint64 )
-    "sqlite3_uint64" "sqlite" "sqlite3_column_int64"
-    { "sqlite3_stmt*" "int" } alien-invoke ;
+FUNCTION-ALIAS: sqlite3-column-uint64
+    sqlite3_uint64 sqlite3_column_int64 ( sqlite3_stmt* pStmt, int col ) ;
 FUNCTION: double sqlite3_column_double ( sqlite3_stmt* pStmt, int col ) ;
-FUNCTION: char* sqlite3_column_name ( sqlite3_stmt* pStmt, int col ) ;
-FUNCTION: char* sqlite3_column_text ( sqlite3_stmt* pStmt, int col ) ;
+FUNCTION: c-string sqlite3_column_name ( sqlite3_stmt* pStmt, int col ) ;
+FUNCTION: c-string sqlite3_column_text ( sqlite3_stmt* pStmt, int col ) ;
 FUNCTION: int sqlite3_column_type ( sqlite3_stmt* pStmt, int col ) ;