From 10e78dde3637ed0adca1972c76e7f283096cdcdc Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 17 Sep 2022 12:03:37 -0400 Subject: [PATCH] alien.c-types: not necessary to import `short` differently anymore --- basis/alien/c-types/c-types-tests.factor | 1 - basis/alien/libraries/finder/windows/windows.factor | 1 - basis/compiler/tests/intrinsics.factor | 1 - basis/opengl/gl/gl.factor | 1 - basis/windows/winsock/winsock.factor | 1 - basis/x11/xlib/xlib.factor | 1 - extra/alien/fortran/fortran-tests.factor | 10 +++++----- extra/audio/engine/test/test.factor | 1 - extra/libusb/libusb.factor | 1 - extra/macho/macho.factor | 1 - extra/synth/buffers/buffers.factor | 1 - 11 files changed, 5 insertions(+), 15 deletions(-) diff --git a/basis/alien/c-types/c-types-tests.factor b/basis/alien/c-types/c-types-tests.factor index 7abbfc4e93..b13faf45c7 100644 --- a/basis/alien/c-types/c-types-tests.factor +++ b/basis/alien/c-types/c-types-tests.factor @@ -1,7 +1,6 @@ USING: accessors alien.c-types alien.syntax classes classes.struct compiler.units eval io.encodings.ascii kernel math.constants tools.test ; -FROM: alien.c-types => short ; IN: alien.c-types.tests CONSTANT: xyz 123 diff --git a/basis/alien/libraries/finder/windows/windows.factor b/basis/alien/libraries/finder/windows/windows.factor index 4db441a0db..8272bd7737 100644 --- a/basis/alien/libraries/finder/windows/windows.factor +++ b/basis/alien/libraries/finder/windows/windows.factor @@ -6,7 +6,6 @@ alien.strings arrays combinators.short-circuit environment io.backend io.files io.files.info io.pathnames kernel sequences specialized-arrays splitting system system-info.windows windows.kernel32 ; -FROM: alien.c-types => ushort ; SPECIALIZED-ARRAY: ushort IN: alien.libraries.finder.windows diff --git a/basis/compiler/tests/intrinsics.factor b/basis/compiler/tests/intrinsics.factor index 52ccb4d275..54cb289e5b 100644 --- a/basis/compiler/tests/intrinsics.factor +++ b/basis/compiler/tests/intrinsics.factor @@ -6,7 +6,6 @@ sbufs strings.private slots.private alien math.order alien.accessors alien.c-types alien.data alien.syntax alien.strings namespaces libc io.encodings.ascii classes compiler.test ; FROM: math => float ; -FROM: alien.c-types => short ; QUALIFIED-WITH: alien.c-types c IN: compiler.tests.intrinsics diff --git a/basis/opengl/gl/gl.factor b/basis/opengl/gl/gl.factor index ca90bc3135..2d3ffd67e6 100644 --- a/basis/opengl/gl/gl.factor +++ b/basis/opengl/gl/gl.factor @@ -4,7 +4,6 @@ ! This file is based on the gl.h that comes with xorg-x11 6.8.2 USING: alien alien.c-types alien.libraries alien.syntax io.encodings.ascii kernel opengl.gl.extensions system ; -FROM: alien.c-types => short ; IN: opengl.gl TYPEDEF: uint GLenum diff --git a/basis/windows/winsock/winsock.factor b/basis/windows/winsock/winsock.factor index e548959c4f..f0503114e3 100644 --- a/basis/windows/winsock/winsock.factor +++ b/basis/windows/winsock/winsock.factor @@ -4,7 +4,6 @@ USING: accessors alien alien.c-types alien.data alien.syntax byte-arrays classes.struct grouping init kernel literals math math.parser sequences system vocabs.parser windows.com.syntax windows.errors windows.kernel32 windows.types ; -FROM: alien.c-types => short ; IN: windows.winsock << diff --git a/basis/x11/xlib/xlib.factor b/basis/x11/xlib/xlib.factor index 04e58521a9..f45babd6a6 100644 --- a/basis/x11/xlib/xlib.factor +++ b/basis/x11/xlib/xlib.factor @@ -14,7 +14,6 @@ ! https://www.x.org/releases/X11R7.6/doc/libX11/specs/libX11/libX11.html USING: accessors alien.c-types alien.data alien.syntax classes.struct io.encodings.ascii kernel literals math x11.X x11.syntax ; -FROM: alien.c-types => short ; IN: x11.xlib LIBRARY: xlib diff --git a/extra/alien/fortran/fortran-tests.factor b/extra/alien/fortran/fortran-tests.factor index c99a855933..0e1b38d678 100644 --- a/extra/alien/fortran/fortran-tests.factor +++ b/extra/alien/fortran/fortran-tests.factor @@ -1,9 +1,9 @@ ! (c) 2009 Joe Groff, see BSD license -USING: accessors alien alien.c-types alien.complex -alien.data alien.fortran alien.fortran.private alien.strings -classes.struct arrays assocs byte-arrays combinators fry -generalizations io.encodings.ascii kernel macros -macros.expander namespaces sequences shuffle tools.test vocabs.parser ; +USING: alien alien.c-types alien.complex alien.data +alien.fortran alien.fortran.private alien.strings +byte-arrays classes.struct combinators generalizations +io.encodings.ascii kernel namespaces sequences shuffle +tools.test vocabs.parser ; FROM: alien.syntax => pointer: ; QUALIFIED-WITH: alien.c-types c IN: alien.fortran.tests diff --git a/extra/audio/engine/test/test.factor b/extra/audio/engine/test/test.factor index 5cd6e5ddb2..2b81c5b3e2 100644 --- a/extra/audio/engine/test/test.factor +++ b/extra/audio/engine/test/test.factor @@ -3,7 +3,6 @@ USING: accessors timers audio.engine audio.loader calendar destructors io kernel math math.functions ranges specialized-arrays sequences random math.vectors ; -FROM: alien.c-types => short ; SPECIALIZED-ARRAY: short IN: audio.engine.test diff --git a/extra/libusb/libusb.factor b/extra/libusb/libusb.factor index 888e6c3b89..b2912cc795 100644 --- a/extra/libusb/libusb.factor +++ b/extra/libusb/libusb.factor @@ -4,7 +4,6 @@ USING: accessors alien alien.c-types alien.data alien.libraries alien.syntax classes.struct combinators endian kernel locals math sequences specialized-arrays system unix.time unix.types ; -FROM: alien.c-types => short ; IN: libusb << "libusb" { diff --git a/extra/macho/macho.factor b/extra/macho/macho.factor index 26a5036e17..1f0732b380 100644 --- a/extra/macho/macho.factor +++ b/extra/macho/macho.factor @@ -5,7 +5,6 @@ alien.syntax classes classes.struct combinators combinators.short-circuit io.encodings.ascii io.encodings.string kernel literals make math sequences specialized-arrays typed io.mmap formatting splitting endian ; -FROM: alien.c-types => short ; IN: macho ! FFI data diff --git a/extra/synth/buffers/buffers.factor b/extra/synth/buffers/buffers.factor index 7c08e14200..9ebf61be89 100644 --- a/extra/synth/buffers/buffers.factor +++ b/extra/synth/buffers/buffers.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien alien.c-types combinators kernel math openal sequences sequences.merged specialized-arrays ; -FROM: alien.c-types => short uchar ; SPECIALIZED-ARRAY: uchar SPECIALIZED-ARRAY: short IN: synth.buffers -- 2.34.1