fixes

diff --git a/contrib/gl/gl.factor b/contrib/gl/gl.factor
index f566ead62930bc14316d3080883a364f83b9a161..31dc28ab5612c42fcf7d2e32d3df04b82fcfb5de 100644 (file)
--- a/contrib/gl/gl.factor
+++ b/contrib/gl/gl.factor
@@ -6,30 +6,30 @@
 IN: gl 
 USING: alien gl-internals ;
 
-ALIAS: uint    GLenum
-ALIAS: uchar   GLboolean
-ALIAS: uchar*  GLboolean*
-ALIAS: uint    GLbitfield
-ALIAS: char    GLbyte
-ALIAS: short   GLshort
-ALIAS: short*  GLshort*
-ALIAS: int     GLint
-ALIAS: int*    GLint*
-ALIAS: int     GLsizei
-ALIAS: uchar   GLubyte
-ALIAS: uchar*  GLubyte*
-ALIAS: ushort  GLushort
-ALIAS: ushort* GLushort*
-ALIAS: uint    GLuint
-ALIAS: uint*   GLuint*
-ALIAS: float   GLfloat
-ALIAS: float*  GLfloat*
-ALIAS: float   GLclampf
-ALIAS: double  GLdouble
-ALIAS: double* GLdouble*
-ALIAS: double  GLclampd
-ALIAS: void*   GLvoid*
-ALIAS: void*   GLvoid**
+TYPEDEF: uint    GLenum
+TYPEDEF: uchar   GLboolean
+TYPEDEF: uchar*  GLboolean*
+TYPEDEF: uint    GLbitfield
+TYPEDEF: char    GLbyte
+TYPEDEF: short   GLshort
+TYPEDEF: short*  GLshort*
+TYPEDEF: int     GLint
+TYPEDEF: int*    GLint*
+TYPEDEF: int     GLsizei
+TYPEDEF: uchar   GLubyte
+TYPEDEF: uchar*  GLubyte*
+TYPEDEF: ushort  GLushort
+TYPEDEF: ushort* GLushort*
+TYPEDEF: uint    GLuint
+TYPEDEF: uint*   GLuint*
+TYPEDEF: float   GLfloat
+TYPEDEF: float*  GLfloat*
+TYPEDEF: float   GLclampf
+TYPEDEF: double  GLdouble
+TYPEDEF: double* GLdouble*
+TYPEDEF: double  GLclampd
+TYPEDEF: void*   GLvoid*
+TYPEDEF: void*   GLvoid**
 
 ! Constants
 

diff --git a/contrib/gl/glu.factor b/contrib/gl/glu.factor
index 658e4e0004e8ab0295a4a3a3a50edae26f9760d1..4dbc61dde61be435f0dbc70103da5cb443ecb3ab 100644 (file)
--- a/contrib/gl/glu.factor
+++ b/contrib/gl/glu.factor
@@ -4,11 +4,11 @@ IN: gl
 USING: alien gl-internals gl ;
 
 ! These are defined as structs in glu.h, but we only ever use pointers to them
-ALIAS: void* GLUnurbs*
-ALIAS: void* GLUquadric*
-ALIAS: void* GLUtesselator*
-ALIAS: char* GLubyte* ! is this right?
-ALIAS: void* GLUfuncptr ! will this work?
+TYPEDEF: void* GLUnurbs*
+TYPEDEF: void* GLUquadric*
+TYPEDEF: void* GLUtesselator*
+TYPEDEF: char* GLubyte* ! is this right?
+TYPEDEF: void* GLUfuncptr ! will this work?
 
 ! StringName
 : GLU_VERSION                        100800 ;

diff --git a/library/alien/malloc.factor b/library/alien/malloc.factor
index e475fd8997cbd78f77d3d10a193f87e7eeb827ed..b4223fdafc5a8b5857512229b7e8695530699877 100644 (file)
--- a/library/alien/malloc.factor
+++ b/library/alien/malloc.factor
@@ -5,7 +5,7 @@ USING: alien errors kernel ;
 
 LIBRARY: libc
 FUNCTION: ulong malloc ( ulong size ) ;
-FUNCTION: ulong free ( ulong ptr ) ;
+FUNCTION: void free ( ulong ptr ) ;
 FUNCTION: ulong realloc ( ulong ptr, ulong size ) ;
 FUNCTION: void memcpy ( ulong dst, ulong src, ulong size ) ;
 

diff --git a/library/bootstrap/boot-stage3.factor b/library/bootstrap/boot-stage3.factor
index 007b1ef7c716a2ce21739c8b02112cc1e19603cd..fd174afcba5d6d22c70d9d3bcfebdc4fc46f6816 100644 (file)
--- a/library/bootstrap/boot-stage3.factor
+++ b/library/bootstrap/boot-stage3.factor
@@ -102,9 +102,6 @@ compile? [
     
     unix? [
         "/library/unix/syscalls.factor"
-    ] pull-in
-
-    unix? [
         "/library/unix/io.factor"
         "/library/unix/sockets.factor"
         "/library/unix/files.factor"

diff --git a/library/compiler/simplifier.factor b/library/compiler/simplifier.factor
index 3dcaf5bbfcd7dcf933350cb1b0560e5d2116f9e9..f1885884ae79f40bf413b2a19f1bd802640b0605 100644 (file)
--- a/library/compiler/simplifier.factor
+++ b/library/compiler/simplifier.factor
@@ -18,19 +18,21 @@ GENERIC: next-logical ( linear vop -- linear )
 ! No delegation.
 M: tuple simplify-node drop f ;
 
-: (simplify-1) ( ? list -- ? )
-    dup [
-        [ car simplify-node swap , or ] keep cdr (simplify-1)
-    ] when ;
-
 : simplify-1 ( list -- list ? )
     #! Return a new linear IR.
-    [ (simplify-1) ] make-list swap ;
+     dup [
+         dup car simplify-node
+         [ uncons simplify-1 drop cons t ]
+         [ uncons simplify-1 >r cons r> ] ifte
+     ] [
+         f
+     ] ifte ;
 
 : simplify ( linear -- linear )
     #! Keep simplifying until simplify-1 returns f.
-    [ dup simplifying set  simplify-1 ] with-scope
-    [ simplify ] when ;
+    [
+        dup simplifying set  simplify-1
+    ] with-scope  [ simplify ] when ;
 
 : label-called? ( label -- ? )
     simplifying get [ calls-label? ] some-with? ;

diff --git a/library/unix/types.factor b/library/unix/types.factor
index 42de48dd37a8b678ee529f2ec6003a17877dcee7..e30e8b8fc74cf2c8abcad6f1176354f343585293 100644 (file)
--- a/library/unix/types.factor
+++ b/library/unix/types.factor
@@ -3,8 +3,8 @@
 IN: unix-internals
 USING: alien errors kernel math namespaces ;
 
-ALIAS: ulonglong off_t
-ALIAS: long ssize_t
-ALIAS: ulong size_t
-ALIAS: uint socklen_t
-ALIAS: uint in_addr_t
+TYPEDEF: ulonglong off_t
+TYPEDEF: long ssize_t
+TYPEDEF: ulong size_t
+TYPEDEF: uint socklen_t
+TYPEDEF: uint in_addr_t