combinators.tuple: rename make-tuple to 1make-tuple.

diff --git a/extra/combinators/tuple/tuple.factor b/extra/combinators/tuple/tuple.factor
index 15f12ca6388ff3c6079cc4cff02204c7236a7a67..24e1a408bd275bc4201c22132e60d65393370c33 100644 (file)
--- a/extra/combinators/tuple/tuple.factor
+++ b/extra/combinators/tuple/tuple.factor
@@ -19,7 +19,7 @@ MACRO:: nmake-tuple ( class assoc n -- quot )
     class <wrapper> :> \class
     { quots n ncleave \class boa } >quotation ;
 
-: make-tuple ( x class assoc -- tuple )
+: 1make-tuple ( x class assoc -- tuple )
     1 nmake-tuple ; inline
 
 : 2make-tuple ( x y class assoc -- tuple )

diff --git a/extra/gpu/demos/raytrace/raytrace.factor b/extra/gpu/demos/raytrace/raytrace.factor
index 30da0e92f4e755c965a5ab7b8b344aee32b6d71b..87a7ba3aeb9a832574309ec99ab26343888e66a4 100644 (file)
--- a/extra/gpu/demos/raytrace/raytrace.factor
+++ b/extra/gpu/demos/raytrace/raytrace.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2009 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays combinators.tuple game.loop game.worlds
-generalizations gpu gpu.render gpu.shaders gpu.util gpu.util.wasd
-kernel literals math math.libm math.matrices math.matrices.extras
-math.order math.vectors method-chains sequences ui ui.gadgets
-ui.gadgets.worlds ui.pixel-formats audio.engine audio.loader locals ;
+USING: accessors arrays audio.engine audio.loader game.loop
+game.worlds gpu gpu.render gpu.shaders gpu.util gpu.util.wasd
+kernel literals locals math math.libm math.matrices
+math.matrices.extras math.order math.vectors method-chains
+sequences ui.gadgets.worlds ui.pixel-formats ;
 IN: gpu.demos.raytrace
 
 GLSL-SHADER-FILE: raytrace-vertex-shader vertex-shader "raytrace.v.glsl"

diff --git a/extra/gpu/render/render.factor b/extra/gpu/render/render.factor
index e37f498b7d89ea1ca0715193c69854f53749719b..3bcb08bd0672f4668a63057997e17ac6e7030318 100644 (file)
--- a/extra/gpu/render/render.factor
+++ b/extra/gpu/render/render.factor
@@ -1,15 +1,13 @@
 ! Copyright (C) 2009 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien alien.c-types alien.data arrays
-assocs classes classes.mixin classes.parser classes.singleton classes.struct
-classes.tuple classes.tuple.private combinators combinators.tuple destructors fry
-generic generic.parser gpu gpu.buffers gpu.framebuffers
-gpu.framebuffers.private gpu.shaders gpu.shaders.private gpu.state
-gpu.textures gpu.textures.private math.floats.half images kernel
-lexer locals math math.order math.parser namespaces opengl
-opengl.gl parser quotations sequences slots sorting
-specialized-arrays strings ui.gadgets.worlds variants
-vocabs.parser words math.vectors.simd ;
+USING: accessors alien alien.c-types alien.data arrays assocs
+classes classes.parser classes.struct classes.tuple
+classes.tuple.private combinators combinators.tuple fry generic
+generic.parser gpu.buffers gpu.framebuffers
+gpu.framebuffers.private gpu.shaders gpu.shaders.private
+gpu.textures gpu.textures.private kernel lexer locals math
+math.parser math.vectors.simd opengl.gl parser quotations
+sequences slots sorting specialized-arrays strings variants words ;
 FROM: math => float ;
 QUALIFIED-WITH: alien.c-types c
 SPECIALIZED-ARRAYS: c:float c:int c:uchar c:ushort c:uint c:void* ;
@@ -594,7 +592,7 @@ TUPLE: render-set
     { transform-feedback-output transform-feedback-output initial: f read-only } ;
 
 : <render-set> ( x quot-assoc -- render-set )
-    render-set swap make-tuple ; inline
+    render-set swap 1make-tuple ; inline
 
 : 2<render-set> ( x y quot-assoc -- render-set )
     render-set swap 2make-tuple ; inline