diff --git a/ffi/cocoa/messages/messages.factor b/ffi/cocoa/messages/messages.factor index 3426e3d579..75e33a65fe 100644 --- a/ffi/cocoa/messages/messages.factor +++ b/ffi/cocoa/messages/messages.factor @@ -202,8 +202,8 @@ ERROR: no-objc-type name ; [ [ 1 + ] dip ] [ nth ] 2bi { { [ dup "rnNoORV" member? ] [ drop (parse-objc-type) ] } { [ dup char: ^ = ] [ 3drop void* ] } - { [ dup char: { = ] [ drop objc-struct-type ] } - { [ dup char: [ = ] [ 3drop void* ] } + { [ dup char: \{ = ] [ drop objc-struct-type ] } + { [ dup char: \[ = ] [ 3drop void* ] } [ 2nip decode-type ] } cond ; diff --git a/ffi/cocoa/views/views.factor b/ffi/cocoa/views/views.factor index 6b6b8bd396..dc25ec12c9 100644 --- a/ffi/cocoa/views/views.factor +++ b/ffi/cocoa/views/views.factor @@ -47,18 +47,18 @@ CONSTANT: NSOpenGLCPSurfaceOpacity 236 ; [ -> alloc ] [ [ 0 0 ] dip first2 ] [ handle>> ] tri* - -> initWithFrame:pixelFormat: - dup 1 -> setPostsBoundsChangedNotifications: - dup 1 -> setPostsFrameChangedNotifications: ; + send\ initWithFrame:pixelFormat: + dup 1 send\ setPostsBoundsChangedNotifications: + dup 1 send\ setPostsFrameChangedNotifications: ; : view-dim ( view -- dim ) - -> bounds + send\ bounds [ CGRect-w >fixnum ] [ CGRect-h >fixnum ] bi 2array ; : mouse-location ( view event -- loc ) [ - -> locationInWindow f -> convertPoint:fromView: + send\ locationInWindow f send\ convertPoint:fromView: [ x>> ] [ y>> ] bi ] [ drop -> frame CGRect-h ] 2bi swap - [ >integer ] bi@ 2array ; diff --git a/ffi/cocoa/windows/windows.factor b/ffi/cocoa/windows/windows.factor index 28e475366c..258b05052d 100644 --- a/ffi/cocoa/windows/windows.factor +++ b/ffi/cocoa/windows/windows.factor @@ -22,19 +22,19 @@ CONSTANT: NSBackingStoreNonretained 1 ; CONSTANT: NSBackingStoreBuffered 2 ; : ( rect style class -- window ) - [ -> alloc ] curry 2dip NSBackingStoreBuffered 1 - -> initWithContentRect:styleMask:backing:defer: ; + [ send\ alloc ] curry 2dip NSBackingStoreBuffered 1 + send\ initWithContentRect:styleMask:backing:defer: ; : class-for-style ( style -- NSWindow/NSPanel ) 0x1ef0 bitand zero? NSWindow NSPanel ? ; : ( view rect style -- window ) - dup class-for-style [ swap -> setContentView: ] keep - dup dup -> contentView -> setInitialFirstResponder: - dup 1 -> setAcceptsMouseMovedEvents: - dup 0 -> setReleasedWhenClosed: ; + dup class-for-style [ swap send\ setContentView: ] keep + dup dup send\ contentView send\ setInitialFirstResponder: + dup 1 send\ setAcceptsMouseMovedEvents: + dup 0 send\ setReleasedWhenClosed: ; : window-content-rect ( window -- rect ) - dup -> class swap - [ -> frame ] [ -> styleMask ] bi - -> contentRectForFrameRect:styleMask: ; + dup send\ class swap + [ send\ frame ] [ send\ styleMask ] bi + send\ contentRectForFrameRect:styleMask: ; diff --git a/modern-transition.factor b/modern-transition.factor index 1b91946cd9..8fd6971490 100644 --- a/modern-transition.factor +++ b/modern-transition.factor @@ -4,13 +4,11 @@ ! lexable-core-paths [ dup . flush path>literals ] map-zip "resource:ffi" vocabs-from -{ "cocoa.dialogs" "opengl.gl.extensions" "python.syntax" -"windows.com.syntax" "x11.syntax" -"cocoa.application" "opencl.syntax" "mongodb.tuple" "cuda.syntax" "core-foundation.strings" -"cocoa.windows" "cocoa.views" "cocoa.subclassing" -"cocoa.nibs" "cocoa.plists" "cocoa" "cocoa.messages" - "gobject-introspection" "cocoa.apple-script" } diff -[ dup . flush vocab>literals ] map-zip +{ "x11.syntax" "windows.com.syntax" "python.syntax" "opengl.gl.extensions" + "opencl.syntax" "mongodb.tuple" "cuda.syntax" "core-foundation.strings" + "cocoa.subclassing" "cocoa" "cocoa.apple-script" "gobject-introspection" } diff +[ dup . flush vocab>literals ] map-zip + "resource:language" vocabs-from { "constructors" "descriptive" "eval" "functors" "literals" @@ -24,19 +22,19 @@ "compiler.cfg.instructions.syntax" "cpu.x86.assembler.syntax" "io.encodings.euc" "peg.ebnf" "prettyprint.stylesheet" "slots.syntax" } diff -[ dup . flush vocab>literals ] map-zip +[ dup . flush vocab>literals ] map-zip "resource:frameworks" vocabs-from { "ui.theme.switching" "ui.backend.cocoa.views" "ui.backend.cocoa.tools" "ui.backend.gtk" "ui.backend.cocoa" "gpu.demos.raytrace" "gpu.demos.bunny" "gpu.shaders" "gpu.render" "game.worlds" "ui" "db.postgresql.errors" } diff -[ dup . flush vocab>literals ] map-zip +[ dup . flush vocab>literals ] map-zip "resource:demos" vocabs-from -{ "talks.vpri-talk" "talks.tc-lisp-talk" "talks.minneapolis-talk" "talks.google-tech-talk" +{ "talks.vpri-talk" "talks.tc-lisp-talk" "talks.minneapolis-talk" "talks.google-tech-talk" "talks.galois-talk" "talks.otug-talk" "smalltalk.selectors" "smalltalk.parser" - "smalltalk.library" "webkit-demo" "bunny.outlined" "project-euler.common" } diff -[ dup . flush vocab>literals ] map-zip + "smalltalk.library" "bunny.outlined" "project-euler.common" } diff +[ dup . flush vocab>literals ] map-zip in: syntax