From 74af9abf201e563017ea015fa5d39ffc6e08d374 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 15 Aug 2010 02:29:12 -0700 Subject: [PATCH] Update code for brave new world where alien.parser doesn't special-case void, and instead looks it up like any other word --- basis/cocoa/application/application.factor | 8 ++++---- extra/chipmunk/demo/demo.factor | 8 ++++---- extra/javascriptcore/ffi/hack/hack.factor | 4 ++-- extra/llvm/types/types.factor | 7 ++++--- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/basis/cocoa/application/application.factor b/basis/cocoa/application/application.factor index b00f39fa1d..9e984d5d00 100644 --- a/basis/cocoa/application/application.factor +++ b/basis/cocoa/application/application.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2006, 2010 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. -USING: alien alien.syntax io kernel namespaces core-foundation -core-foundation.strings cocoa.messages cocoa cocoa.classes -cocoa.runtime sequences init summary kernel.private -assocs ; +USING: alien alien.c-types alien.syntax io kernel namespaces +core-foundation core-foundation.strings cocoa.messages cocoa +cocoa.classes cocoa.runtime sequences init summary +kernel.private assocs ; IN: cocoa.application : ( str -- alien ) -> autorelease ; diff --git a/extra/chipmunk/demo/demo.factor b/extra/chipmunk/demo/demo.factor index 7d11b116fb..f27d40cc53 100644 --- a/extra/chipmunk/demo/demo.factor +++ b/extra/chipmunk/demo/demo.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2010 Erik Charlebois ! See http:// factorcode.org/license.txt for BSD license. -USING: accessors alien chipmunk.ffi classes.struct game.loop -game.worlds kernel literals locals math method-chains opengl.gl -random sequences specialized-arrays ui ui.gadgets.worlds -ui.pixel-formats ; +USING: accessors alien alien.c-types chipmunk.ffi classes.struct +game.loop game.worlds kernel literals locals math method-chains +opengl.gl random sequences specialized-arrays ui +ui.gadgets.worlds ui.pixel-formats ; SPECIALIZED-ARRAY: void* IN: chipmunk.demo diff --git a/extra/javascriptcore/ffi/hack/hack.factor b/extra/javascriptcore/ffi/hack/hack.factor index 1866a24e22..1656cb17f6 100644 --- a/extra/javascriptcore/ffi/hack/hack.factor +++ b/extra/javascriptcore/ffi/hack/hack.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2010 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien alien.accessors alien.syntax kernel kernel.private -math system ; +USING: alien alien.accessors alien.c-types alien.syntax kernel +kernel.private math system ; IN: javascriptcore.ffi.hack HOOK: set-callstack-bounds os ( -- ) diff --git a/extra/llvm/types/types.factor b/extra/llvm/types/types.factor index c312e7a173..25995c389b 100644 --- a/extra/llvm/types/types.factor +++ b/extra/llvm/types/types.factor @@ -1,8 +1,9 @@ ! Copyright (C) 2009 Matthew Willis. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays combinators kernel llvm.core locals -math.parser math multiline namespaces parser peg.ebnf sequences -sequences.deep specialized-arrays strings vocabs words ; +USING: accessors alien.c-types arrays combinators kernel +llvm.core locals math.parser math multiline namespaces parser +peg.ebnf sequences sequences.deep specialized-arrays strings +vocabs words ; SPECIALIZED-ARRAY: void* IN: llvm.types