Changeset 483

Timestamp:

10/05/07 04:54:10 (12 months ago)

Author:

krobillard

Message:

select! evaluation now pushes all values other than function! & call!.
Added ur_decompress().
Now using GLV from the Outguard repository.
gl/project.r now builds thuneGL library.

Location:

trunk/thune

Files:

• files.c (modified) (2 diffs)
• gl/gx_atoms.h (modified) (2 diffs)
• gl/project.r (modified) (4 diffs)
• thune.c (modified) (1 diff)
• urlan.h (modified) (1 diff)

trunk/thune/files.c

@@ -696 +696 @@
 
 
+/**
+   Decompress data into intialized array.
+
+   \return  Non-zero if successful.
+*/
+int ur_decompress( const void* data, int len, UArray* arr )
+{
+#define BUF_LOW     32
+    bz_stream strm;
+    int ok;
+
+    strm.bzalloc = 0;
+    strm.bzfree  = 0;
+    strm.opaque  = 0;
+
+    ok = BZ2_bzDecompressInit( &strm, 0, 0 );
+    if( ok != BZ_OK )
+    {
+        //fprintf( stderr, "BZ2_bzDecompressInit failure (%d)", ok );
+        return 0;
+    }
+
+    strm.next_in  = (char*) data;
+    strm.avail_in = len;
+
+    ur_arrayReserve( arr, 1, (len < BUF_LOW) ? BUF_LOW : len );
+    strm.next_out  = arr->ptr.c;
+    strm.avail_out = arr->avail;
+
+    do
+    {
+        if( strm.avail_out < BUF_LOW )
+        {
+            ur_arrayReserve( arr, 1, arr->avail + (2 * BUF_LOW) );
+            strm.next_out  = arr->ptr.c + strm.total_out_lo32;
+            strm.avail_out = arr->avail - strm.total_out_lo32;
+        }
+
+        ok = BZ2_bzDecompress( &strm );
+        arr->used = strm.total_out_lo32;
+    }
+    while( ok == BZ_OK );
+
+    BZ2_bzDecompressEnd( &strm );
+
+    return (ok == BZ_STREAM_END) ? 1 : 0;
+}
+
+
 // (binary -- string)
 UR_CALL( uc_decompress )
 {
-#define BUF_LOW     32
-    int ok;
-    int len;
-    bz_stream strm;
     UIndex strN;
     UString* str;
@@ -708 +753 @@
     char* cpB;
 
-
     if( ! ur_binarySlice( ut, tos, &cpA, &cpB ) || (cpA == 0) )
         return;
 
-    strm.bzalloc = 0;
-    strm.bzfree  = 0;
-    strm.opaque  = 0;
-
-    ok = BZ2_bzDecompressInit( &strm, 0, 0 );
-    if( ok == BZ_OK )
-    {
-        len = cpB - cpA;
-        strm.next_in   = cpA;
-        strm.avail_in  = len;
-
-        strN = ur_makeBinary( (len < BUF_LOW) ? BUF_LOW : len, &str );
-        strm.next_out  = str->ptr.c;
-        strm.avail_out = str->avail;
-
-        while( ok == BZ_OK )
-        {
-            if( strm.avail_out < BUF_LOW )
-            {
-                ur_arrayReserve( str, 1, str->avail + (2 * BUF_LOW) );
-                strm.next_out  = str->ptr.c + strm.total_out_lo32;
-                strm.avail_out = str->avail - strm.total_out_lo32;
-            }
-
-            ok = BZ2_bzDecompress( &strm );
-            str->used = strm.total_out_lo32;
-        }
-
-        BZ2_bzDecompressEnd( &strm );
-
-        if( ok == BZ_STREAM_END )
-        {
-            ur_initType( tos, UT_STRING );
-            ur_setSeries( tos, strN, 0 );
-            return;
-        }
-        ur_throwErr( UR_ERR_INTERNAL, "decompress failure (%d)", ok );
-    }
-    ur_throwErr( UR_ERR_INTERNAL, "decompress init failure (%d)", ok );
+    strN = ur_makeBinary( 0, &str );
+
+    if( ur_decompress( cpA, cpB - cpA, str ) )
+    {
+        ur_initString( tos, strN, 0 );
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_INTERNAL, "decompress failure" );
+    }
 }
 #endif

trunk/thune/gl/gx_atoms.h

@@ -1 +1 @@
 // This file is automatically generated - do not edit.
 
-#define UR_ATOM_DRAW_LIST_OPCODES               321
-#define UR_ATOM_WIDTH           322
-#define UR_ATOM_HEIGHT          323
-#define UR_ATOM_AREA            324
-#define UR_ATOM_RECT            325
-#define UR_ATOM_RASTER          326
-#define UR_ATOM_TEXTURE         327
-#define UR_ATOM_ELEM            328
-#define UR_ATOM_CLOSE           180
-#define UR_ATOM_FOCUS           329
-#define UR_ATOM_RESIZE          330
-#define UR_ATOM_KEY_DOWN                331
-#define UR_ATOM_KEY_UP          332
-#define UR_ATOM_MOUSE_MOVE              333
-#define UR_ATOM_MOUSE_UP                334
-#define UR_ATOM_MOUSE_DOWN              335
-#define UR_ATOM_MOUSE_WHEEL             336
-#define UR_ATOM_AMBIENT         337
-#define UR_ATOM_DIFFUSE         338
-#define UR_ATOM_SPECULAR                339
-#define UR_ATOM_POS             340
-#define UR_ATOM_SHADER          341
-#define UR_ATOM_VERTEX          342
-#define UR_ATOM_FRAGMENT                343
-#define UR_ATOM_DEFAULT         344
-#define UR_ATOM_WAIT            345
+#define UR_ATOM_DRAW_LIST_OPCODES               322
+#define UR_ATOM_WIDTH           323
+#define UR_ATOM_HEIGHT          324
+#define UR_ATOM_AREA            325
+#define UR_ATOM_RECT            326
+#define UR_ATOM_RASTER          327
+#define UR_ATOM_TEXTURE         328
+#define UR_ATOM_ELEM            329
+#define UR_ATOM_CLOSE           181
+#define UR_ATOM_FOCUS           330
+#define UR_ATOM_RESIZE          331
+#define UR_ATOM_KEY_DOWN                332
+#define UR_ATOM_KEY_UP          333
+#define UR_ATOM_MOUSE_MOVE              334
+#define UR_ATOM_MOUSE_UP                335
+#define UR_ATOM_MOUSE_DOWN              336
+#define UR_ATOM_MOUSE_WHEEL             337
+#define UR_ATOM_AMBIENT         338
+#define UR_ATOM_DIFFUSE         339
+#define UR_ATOM_SPECULAR                340
+#define UR_ATOM_POS             341
+#define UR_ATOM_SHADER          342
+#define UR_ATOM_VERTEX          343
+#define UR_ATOM_FRAGMENT                344
+#define UR_ATOM_DEFAULT         345
+#define UR_ATOM_WAIT            135
 #define UR_ATOM_RGB             346
 #define UR_ATOM_RGBA            347
@@ -40 +40 @@
 #define UR_ATOM_RGB             346
 #define UR_ATOM_RGBA            347
-#define UR_ATOM_ON              260
-#define UR_ATOM_OFF             262
-#define UR_ATOM_ADD             199
+#define UR_ATOM_ON              261
+#define UR_ATOM_OFF             263
+#define UR_ATOM_ADD             200
 #define UR_ATOM_BURN            357
 #define UR_ATOM_COLOR           358

trunk/thune/gl/project.r

@@ -1 +1 @@
 REBOL []
 
-exe %gx [
+default [
     warn
     debug
-    ;release
+;   release
     objdir %obj
-    opengl
+]
 
+lib %thuneGL [
     include_from %.
     include_from %..
-    ;include_from %hit
-    ;include_from %../util
     libs_from %.. %thune0
-    cflags {-DLANG_THUNE -DTHUNE_GL}
+    cflags {-DLANG_THUNE}
     cflags {-DUR_CONFIG_DT_CODE}
     cflags {-DNO_AUDIO}
 
+    linux [
+        cflags {-DUSE_XF86VMODE}
+        include_from %../unix
+        include_from %glv/x11
+        sources [
+            %glv/x11/glv.c
+            %joystick.c
+        ]
+        include_from %/usr/include/freetype2
+    ]
     macx [
-        cflags {-DOR_BIG_ENDIAN}
-
         include_from %../unix
         include_from %glv/mac
         sources [%glv/mac/glv.c]
-
-        ;include_from %../../../osrc/zlib
-        ;libs_from %../../../osrc/zlib [%z]
-
-        ;include_from %/Users/karl/osrc/libpng-1.2.12
-        ;libs_from %/Users/karl/osrc/libpng-1.2.12 [%png]
 
         include_from %/usr/local/include/freetype2
@@ -37 +38 @@
         lflags {-framework AGL}
         lflags {-framework Carbon}
-
-        libs [%freetype %bz2 %png]
-        libs [%vorbis %vorbisfile]
-    ]
-    linux [
-        cflags {-DUSE_XF86VMODE}
-        include_from %../unix
-        include_from %glv/unix
-        sources [
-            %glv/unix/glv.c
-            %joystick.c
-        ]
-        libs_from %/usr/X11R6/lib64 [%X11 %Xxf86vm]
-        ;libs_from %/usr/X11R6/lib [%X11 %Xxf86vm]
-
-        include_from %/usr/include/freetype2
-
-        libs [%freetype %bz2 %png]
-        libs [%openal %alut %vorbis %vorbisfile]
     ]
     win32 [
@@ -80 +62 @@
 
     sources [
-        %../console.c
         %gx.c
         %gx_dt.c
@@ -101 +82 @@
     ]
 ]
+
+exe %gx [
+    opengl
+    cflags {-DLANG_THUNE -DTHUNE_GL}
+    libs_from %. %thuneGL
+    linux [
+        libs_from %/usr/X11R6/lib64 [%X11 %Xxf86vm]
+        ;libs_from %/usr/X11R6/lib [%X11 %Xxf86vm]
+        libs [%freetype %bz2 %png]
+        libs [%openal %alut %vorbis %vorbisfile]
+    ]
+    macx [
+        libs [%freetype %bz2 %png]
+        libs [%vorbis %vorbisfile]
+    ]
+    sources [
+        %../console.c
+    ]
+]

trunk/thune/thune.c

@@ -963 +963 @@
             }
             val = sval;
-            if( ur_is(sval, UT_SELECT) || ur_is(sval, UT_PAREN) )
-                goto push_val;
-        }
-            goto do_val;
+            if( ur_is(sval, UT_FUNCTION) || ur_is(sval, UT_CALL) )
+                goto do_val;
+        }
+            goto push_val;
 
         case UT_SETSELECT:

trunk/thune/urlan.h

@@ -573 +573 @@
 void ur_toStrNatural( UThread*, const UCell*, UString* out, int depth );
 void ur_strCat( UString*, const char* cp, int len );
+int  ur_decompress( const void* data, int len, UArray* );
 
 void ur_setDatatypeMask( UCell* cell, int type );