From 675d2b558f67362ec0fcc3dec1019ecc9eef20e7 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 5 Jun 2016 14:12:12 -0700 Subject: [PATCH] frameworks: more syntax --- frameworks/db/sqlite/ffi/ffi.factor | 54 +++++++++---------- frameworks/game/input/dinput/dinput.factor | 2 +- frameworks/ui/backend/cocoa/cocoa.factor | 2 +- frameworks/ui/backend/gtk/gtk.factor | 8 +-- frameworks/ui/backend/gtk/io/unix/unix.factor | 2 +- frameworks/ui/backend/x11/x11.factor | 6 +-- .../ui/pixel-formats/pixel-formats.factor | 2 +- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/frameworks/db/sqlite/ffi/ffi.factor b/frameworks/db/sqlite/ffi/ffi.factor index 24361a20bd..175490343d 100644 --- a/frameworks/db/sqlite/ffi/ffi.factor +++ b/frameworks/db/sqlite/ffi/ffi.factor @@ -13,33 +13,33 @@ in: db.sqlite.ffi } cond cdecl add-library >> ! Return values from sqlite functions -CONSTANT: SQLITE_OK 0 ! Successful result ; -CONSTANT: SQLITE_ERROR 1 ! SQL error or missing database ; -CONSTANT: SQLITE_INTERNAL 2 ! An internal logic error in SQLite ; -CONSTANT: SQLITE_PERM 3 ! Access permission denied ; -CONSTANT: SQLITE_ABORT 4 ! Callback routine requested an abort ; -CONSTANT: SQLITE_BUSY 5 ! The database file is locked ; -CONSTANT: SQLITE_LOCKED 6 ! A table in the database is locked ; -CONSTANT: SQLITE_NOMEM 7 ! A malloc() failed ; -CONSTANT: SQLITE_READONLY 8 ! Attempt to write a readonly database ; -CONSTANT: SQLITE_INTERRUPT 9 ! Operation terminated by sqlite_interrupt() ; -CONSTANT: SQLITE_IOERR 10 ! Some kind of disk I/O error occurred ; -CONSTANT: SQLITE_CORRUPT 11 ! The database disk image is malformed ; -CONSTANT: SQLITE_NOTFOUND 12 ! (Internal Only) Table or record not found ; -CONSTANT: SQLITE_FULL 13 ! Insertion failed because database is full ; -CONSTANT: SQLITE_CANTOPEN 14 ! Unable to open the database file ; -CONSTANT: SQLITE_PROTOCOL 15 ! Database lock protocol error ; -CONSTANT: SQLITE_EMPTY 16 ! (Internal Only) Database table is empty ; -CONSTANT: SQLITE_SCHEMA 17 ! The database schema changed ; -CONSTANT: SQLITE_TOOBIG 18 ! Too much data for one row of a table ; -CONSTANT: SQLITE_CONSTRAINT 19 ! Abort due to contraint violation ; -CONSTANT: SQLITE_MISMATCH 20 ! Data type mismatch ; -CONSTANT: SQLITE_MISUSE 21 ! Library used incorrectly ; -CONSTANT: SQLITE_NOLFS 22 ! Uses OS features not supported on host ; -CONSTANT: SQLITE_AUTH 23 ! Authorization denied ; -CONSTANT: SQLITE_FORMAT 24 ! Auxiliary database format error ; -CONSTANT: SQLITE_RANGE 25 ! 2nd parameter to sqlite3_bind out of range ; -CONSTANT: SQLITE_NOTADB 26 ! File opened that is not a database file ; +CONSTANT: SQLITE_OK 0 ; ! Successful result +CONSTANT: SQLITE_ERROR 1 ; ! SQL error or missing database +CONSTANT: SQLITE_INTERNAL 2 ; ! An internal logic error in SQLite +CONSTANT: SQLITE_PERM 3 ; ! Access permission denied +CONSTANT: SQLITE_ABORT 4 ; ! Callback routine requested an abort +CONSTANT: SQLITE_BUSY 5 ; ! The database file is locked +CONSTANT: SQLITE_LOCKED 6 ; ! A table in the database is locked +CONSTANT: SQLITE_NOMEM 7 ; ! A malloc() failed +CONSTANT: SQLITE_READONLY 8 ; ! Attempt to write a readonly database +CONSTANT: SQLITE_INTERRUPT 9 ; ! Operation terminated by sqlite_interrupt() +CONSTANT: SQLITE_IOERR 10 ; ! Some kind of disk I/O error occurred +CONSTANT: SQLITE_CORRUPT 11 ; ! The database disk image is malformed +CONSTANT: SQLITE_NOTFOUND 12 ; ! (Internal Only) Table or record not found +CONSTANT: SQLITE_FULL 13 ; ! Insertion failed because database is full +CONSTANT: SQLITE_CANTOPEN 14 ; ! Unable to open the database file +CONSTANT: SQLITE_PROTOCOL 15 ; ! Database lock protocol error +CONSTANT: SQLITE_EMPTY 16 ; ! (Internal Only) Database table is empty +CONSTANT: SQLITE_SCHEMA 17 ; ! The database schema changed +CONSTANT: SQLITE_TOOBIG 18 ; ! Too much data for one row of a table +CONSTANT: SQLITE_CONSTRAINT 19 ; ! Abort due to contraint violation +CONSTANT: SQLITE_MISMATCH 20 ; ! Data type mismatch +CONSTANT: SQLITE_MISUSE 21 ; ! Library used incorrectly +CONSTANT: SQLITE_NOLFS 22 ; ! Uses OS features not supported on host +CONSTANT: SQLITE_AUTH 23 ; ! Authorization denied +CONSTANT: SQLITE_FORMAT 24 ; ! Auxiliary database format error +CONSTANT: SQLITE_RANGE 25 ; ! 2nd parameter to sqlite3_bind out of range +CONSTANT: SQLITE_NOTADB 26 ; ! File opened that is not a database file : sqlite-error-messages ( -- seq ) { "Successful result" diff --git a/frameworks/game/input/dinput/dinput.factor b/frameworks/game/input/dinput/dinput.factor index 27117af338..99dd5b20ff 100755 --- a/frameworks/game/input/dinput/dinput.factor +++ b/frameworks/game/input/dinput/dinput.factor @@ -275,7 +275,7 @@ CONSTANT: pov-values { pov-up pov-up-right pov-right pov-down-right pov-down pov-down-left pov-left pov-up-left - } + } ; : >axis ( long -- float ) 32767 - 32767.0 /f ; inline diff --git a/frameworks/ui/backend/cocoa/cocoa.factor b/frameworks/ui/backend/cocoa/cocoa.factor index 6198ef1969..1921d37c60 100644 --- a/frameworks/ui/backend/cocoa/cocoa.factor +++ b/frameworks/ui/backend/cocoa/cocoa.factor @@ -40,7 +40,7 @@ PIXEL-FORMAT-ATTRIBUTE-TABLE: NSOpenGLPFA { } H{ { aux-buffers { $ NSOpenGLPFAAuxBuffers } } { sample-buffers { $ NSOpenGLPFASampleBuffers } } { samples { $ NSOpenGLPFASamples } } -} +} ; M: cocoa-ui-backend (make-pixel-format) nip >NSOpenGLPFA-int-array diff --git a/frameworks/ui/backend/gtk/gtk.factor b/frameworks/ui/backend/gtk/gtk.factor index 9dcab3fe9d..d03bd63049 100644 --- a/frameworks/ui/backend/gtk/gtk.factor +++ b/frameworks/ui/backend/gtk/gtk.factor @@ -96,14 +96,14 @@ CONSTANT: events-mask GDK_KEY_PRESS_MASK GDK_KEY_RELEASE_MASK GDK_FOCUS_CHANGE_MASK - } + } ; CONSTANT: modifiers { { S+ $ GDK_SHIFT_MASK } { C+ $ GDK_CONTROL_MASK } { A+ $ GDK_MOD1_MASK } - } + } ; CONSTANT: action-key-codes H{ @@ -135,7 +135,7 @@ CONSTANT: action-key-codes { $ GDK_KEY_F10 "F10" } { $ GDK_KEY_F11 "F11" } { $ GDK_KEY_F12 "F12" } - } + } ; : event-modifiers ( event -- seq ) state>> modifiers modifier ; @@ -415,7 +415,7 @@ PIXEL-FORMAT-ATTRIBUTE-TABLE: gl-config-attribs { aux-buffers ${ GDK_GL_AUX_BUFFERS } } { sample-buffers ${ GDK_GL_SAMPLE_BUFFERS } } { samples ${ GDK_GL_SAMPLES } } - } + } ; M: gtk-ui-backend (make-pixel-format) nip >gl-config-attribs-int-array gdk_gl_config_new ; diff --git a/frameworks/ui/backend/gtk/io/unix/unix.factor b/frameworks/ui/backend/gtk/io/unix/unix.factor index c6433d1229..214a9c13f5 100644 --- a/frameworks/ui/backend/gtk/io/unix/unix.factor +++ b/frameworks/ui/backend/gtk/io/unix/unix.factor @@ -31,7 +31,7 @@ CONSTANT: poll-fd-events G_IO_ERR G_IO_HUP G_IO_NVAL - } + } ; : ( -- poll-fd ) GPollFD malloc-struct &free diff --git a/frameworks/ui/backend/x11/x11.factor b/frameworks/ui/backend/x11/x11.factor index ad01c2d835..8f4472d91f 100644 --- a/frameworks/ui/backend/x11/x11.factor +++ b/frameworks/ui/backend/x11/x11.factor @@ -78,7 +78,7 @@ PIXEL-FORMAT-ATTRIBUTE-TABLE: glx-visual { $ GLX_RGBA } H{ { aux-buffers { $ GLX_AUX_BUFFERS } } { sample-buffers { $ GLX_SAMPLE_BUFFERS } } { samples { $ GLX_SAMPLES } } -} +} ; M: x11-ui-backend (make-pixel-format) [ drop dpy get scr get ] dip @@ -100,7 +100,7 @@ CONSTANT: modifiers { S+ 0x1 } { C+ 0x4 } { A+ 0x8 } - } + } ; CONSTANT: key-codes H{ @@ -145,7 +145,7 @@ CONSTANT: key-codes { 0xFFEC f } ! Right super { 0xFFED f } ! Left hyper { 0xFFEE f } ! Right hyper - } + } ; : key-code ( keysym -- keycode action? ) dup key-codes at* [ nip dup t and ] [ [ 1string ] dip ] if ; diff --git a/frameworks/ui/pixel-formats/pixel-formats.factor b/frameworks/ui/pixel-formats/pixel-formats.factor index f49d4672d0..cbce576519 100644 --- a/frameworks/ui/pixel-formats/pixel-formats.factor +++ b/frameworks/ui/pixel-formats/pixel-formats.factor @@ -84,7 +84,7 @@ M: pixel-format-attribute >PFA ;FUNCTOR SYNTAX: PIXEL-FORMAT-ATTRIBUTE-TABLE: - scan-token scan-object scan-object define-pixel-format-attribute-table ; + scan-token scan-object scan-object ";" expect define-pixel-format-attribute-table ; PRIVATE>