Changeset 450 for branches/thune

Timestamp:

08/11/07 04:53:46 (16 months ago)

Author:

krobillard

Message:

Removed slice! datatype - series now have an end.
Added slice test.
ur_makeBinary() now takes pointer argument.
Fixed bug in _makeComponent().
Fixed compiler warnings. Minor optimization to if/.

Location:

branches/thune/thread_safe

Files:

• boot.c (modified) (1 diff)
• component.c (modified) (1 diff)
• doc/UserManual (modified) (5 diffs)
• eval.c (modified) (3 diffs)
• files.c (modified) (2 diffs)
• gc.c (modified) (2 diffs)
• gl/gx_atoms.h (modified) (1 diff)
• gl/gx_dt.c (modified) (2 diffs)
• make.c (modified) (4 diffs)
• math.c (modified) (1 diff)
• mkboot.t (modified) (1 diff)
• net.c (modified) (1 diff)
• parse.c (modified) (6 diffs)
• print.c (modified) (8 diffs)
• series.c (modified) (54 diffs)
• tests/working/bytecode.t (modified) (1 diff)
• tests/working/encode.t (modified) (1 diff)
• tests/working/slice.good (added)
• tests/working/slice.t (added)
• thread.c (modified) (1 diff)
• thune.c (modified) (4 diffs)
• tokenize.c (modified) (1 diff)
• trim_string.c (modified) (3 diffs)
• urlan.c (modified) (2 diffs)
• urlan.h (modified) (8 diffs)

branches/thune/thread_safe/boot.c

@@ -157 +157 @@
   "      ; fullpath file\n"
   "      next\n"
-  "      dup2 slice! rot.r make\n"
+  "      dup2 slice\n"
   "      rot.r nip\n"
   "    ]\n"

branches/thune/thread_safe/component.c

@@ -43 +43 @@
 
     blk = ur_blockSlice( ut, sigCell, &start, &end );
-    if( ! blk || ! it )
+    if( ! blk || ! start )
         return 0;
 

branches/thune/thread_safe/doc/UserManual

@@ -89 +89 @@
 set-select!  :obj/x :my-block/2
 lit-select!  'obj/x 'my-block/2
-slice!
 time!        10:02 -0:0:32.08
 context!
@@ -125 +124 @@
 
 
+Binary
+------
+
+A binary value references a series of bytes.
+
+::
+
+     #{0000ff01}
+     #{0000 ff01}
+     #{68656C6C6F}     ; "hello" as binary
+
+
 Strings
 -------
@@ -138 +149 @@
    {This string
    spans multiple lines.}
-
-
-Slice
------
-
-A range within a binary!, string!, or block! can be represented with a slice.
-
-::
-
-    "Hello world" :s
-    slice! s make .                  ; "Hello world"
-    slice! s next dup 4 skip make .  ; "ello"
-
-To move the start of the slice use *prev* & *next*, as with a series.
-To move the end of the slice use *slice.prev* & *slice.next*.
 
 
@@ -455 +451 @@
 next        (ser -- ser)            Increment start of series.
 skip        (ser n -- ser)          Increment start of series by **n**.
+slice_      (ser end -- slice)      Slice series.
+slice?      (ser end -- slice)      True if series is a slice.
 slice.prev  (slice -- slice)        Decrement end of slice.
 slice.next  (slice -- slice)        Increment end of slice.
@@ -631 +629 @@
 
 
+slice
+-----
+
+The slice word is used to control the slice range of a series value.
+
+::
+
+    "Hello world" :s
+    s 2,6 slice .          ; "ello"
+    s -2 slice .           ; ""Hello wor"
+
+
+To move the start of a series by one, use *prev* & *next*.
+To move the end of a series by one, use *slice.prev* & *slice.next*.
+
+
 change
 ------

branches/thune/thread_safe/eval.c

@@ -90 +90 @@
 static int ur_itLen( UThread* ut, UCell* cell )
 {
-    int len = ur_seriesLen( cell );
+    int len = ur_seriesEnd( cell );
     if( len > -1 )
         len -= cell->series.it;
@@ -704 +704 @@
         case UT_BINARY:
         case UT_STRING:
-        case UT_SLICE:
         {
             char *cpA1, *cpA2;
@@ -1213 +1212 @@
                 }
                 ur_type(val) = UT_BINARY;
-            }
-            else if( ur_is(val, UT_SLICE) && (ur_sliceDT(val) == UT_STRING) )
-            {
-                if( ur_encCharSize(val) == 1 )
-                    ur_sliceDT(val) = UT_BINARY;
             }
             else if( ur_is(val, UT_BITSET) )

branches/thune/thread_safe/files.c

@@ -661 +661 @@
     unsigned int blen;
 
-    if( ur_seriesMem( ut, tos, &cpA, &cpB ) )
+    if( ur_binaryMem( ut, tos, &cpA, &cpB ) )
     {
         if( cpA )
@@ -807 +807 @@
     res = UR_TOS;
 
-    if( ur_seriesMem( ut, res, &cpA, &cpB ) )
+    if( ur_binaryMem( ut, res, &cpA, &cpB ) )
     {
         switch( ur_atom(tos) )

branches/thune/thread_safe/gc.c

@@ -273 +273 @@
             case UT_VECTOR:
             case UT_BITSET:
-                SET_BIT_BIN_L( it->series.n )
-                break;
-
-            case UT_SLICE:
-                if( ur_sliceDT(it) == UT_BLOCK ||
-                    ur_sliceDT(it) == UT_PAREN )
-                    goto mark_block;
                 SET_BIT_BIN_L( it->series.n )
                 break;
@@ -309 +302 @@
             case UT_BLOCK:
             case UT_PAREN:
-mark_block:
                 idx = it->series.n;
                 if( ur_isLocal(idx) )

branches/thune/thread_safe/gl/gx_atoms.h

@@ -1 +1 @@
 // This file is automatically generated - do not edit.
 
-#define UR_ATOM_DRAW_LIST_OPCODES               319
-#define UR_ATOM_WIDTH           320
-#define UR_ATOM_HEIGHT          321
-#define UR_ATOM_AREA            322
-#define UR_ATOM_RECT            323
-#define UR_ATOM_RASTER          324
-#define UR_ATOM_TEXTURE         325
-#define UR_ATOM_ELEM            326
-#define UR_ATOM_CLOSE           178
-#define UR_ATOM_FOCUS           327
-#define UR_ATOM_RESIZE          328
-#define UR_ATOM_KEY_DOWN                329
-#define UR_ATOM_KEY_UP          330
-#define UR_ATOM_MOUSE_MOVE              331
-#define UR_ATOM_MOUSE_UP                332
-#define UR_ATOM_MOUSE_DOWN              333
-#define UR_ATOM_MOUSE_WHEEL             334
-#define UR_ATOM_AMBIENT         335
-#define UR_ATOM_DIFFUSE         336
-#define UR_ATOM_SPECULAR                337
-#define UR_ATOM_POS             338
-#define UR_ATOM_SHADER          339
-#define UR_ATOM_VERTEX          340
-#define UR_ATOM_FRAGMENT                341
-#define UR_ATOM_DEFAULT         342
-#define UR_ATOM_WAIT            343
-#define UR_ATOM_RGB             344
-#define UR_ATOM_RGBA            345
-#define UR_ATOM_DEPTH           346
-#define UR_ATOM_CLAMP           347
-#define UR_ATOM_REPEAT          348
-#define UR_ATOM_NEAREST         349
-#define UR_ATOM_LINEAR          350
-#define UR_ATOM_MIN             351
-#define UR_ATOM_MAG             352
-#define UR_ATOM_MIPMAP          353
-#define UR_ATOM_GRAY            354
-#define UR_ATOM_RGB             344
-#define UR_ATOM_RGBA            345
-#define UR_ATOM_ON              258
-#define UR_ATOM_OFF             260
-#define UR_ATOM_ADD             197
-#define UR_ATOM_BURN            355
-#define UR_ATOM_COLOR           356
-#define UR_ATOM_TRANS           357
-#define UR_ATOM_SPRITE          358
+#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_RGB             346
+#define UR_ATOM_RGBA            347
+#define UR_ATOM_DEPTH           348
+#define UR_ATOM_CLAMP           349
+#define UR_ATOM_REPEAT          350
+#define UR_ATOM_NEAREST         351
+#define UR_ATOM_LINEAR          352
+#define UR_ATOM_MIN             353
+#define UR_ATOM_MAG             354
+#define UR_ATOM_MIPMAP          355
+#define UR_ATOM_GRAY            356
+#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_BURN            357
+#define UR_ATOM_COLOR           358
+#define UR_ATOM_TRANS           359
+#define UR_ATOM_SPRITE          360

branches/thune/thread_safe/gl/gx_dt.c

@@ -653 +653 @@
                 {
                     case UT_STRING:
-                    case UT_SLICE:
                         if( cfg.fontFile )
                             cfg.glyphs = ur_cstring( ut, it );
@@ -773 +772 @@
 
                     case UT_STRING:
-                    case UT_SLICE:
                         if( cmd == UR_ATOM_VERTEX )
                             vprog = ur_cstring( ut, it );

branches/thune/thread_safe/make.c

@@ -163 +163 @@
     UIndex binN = 0;
 
-    if( ur_seriesMem( ut, cell, &cpA, &cpB ) )
+    if( ur_binaryMem( ut, cell, &cpA, &cpB ) )
     {
         int size;
@@ -1304 +1304 @@
 
 
+/*
 static void _setSliceRange( UCell* cell, UIndex a, UIndex b )
 {
     if( a < b )
     {
-        cell->slice.it  = a;
-        cell->slice.end = b;
+        cell->series.it  = a;
+        cell->series.end = b;
     }
     else
     {
-        cell->slice.it  = a;
-        cell->slice.end = b;
-    }
-}
+        cell->series.it  = a;
+        cell->series.end = b;
+    }
+}
+*/
 
 
@@ -1663 +1665 @@
             UIndex binN;
 
+#if 0
+#ifdef LANG_THUNE
+            if( argc == 2 )
+            {
+                UCell* pc = ur_s_prev(tos);
+
+                ur_initType(res, UT_STRING);
+                ur_sliceDT(res) = ur_type(tos);
+                res->series.n = tos->series.n;
+
+                if( ur_is(tos, UT_STRING) )
+                    ur_encoding(res) = ur_encoding(tos);
+                if( ur_isASeries(pc) )
+                {
+                    _setSliceRange( res, pc->series.it, tos->series.it );
+                }
+                else if( ur_is(pc, UT_COORD) )
+                {
+                    int a, b;
+
+                    a = pc->coord.elem[0];
+                    b = pc->coord.elem[1];
+                    if( a < 1 )
+                        a = 0;
+                    else
+                        --a;
+                    if( b < 1 )
+                    {
+                        UString* str = ur_bin(tos);
+                        b += ur_sliceEnd(tos, str);
+                    }
+                    else
+                        --b;
+
+                    _setSliceRange( res, a, b );
+                }
+            }
+            else
+#endif
+#endif
             if( ur_is(tos, UT_INT) )
             {
@@ -1773 +1815 @@
             res->err.messageStr = tos->series.n;
             res->err.traceBlk   = ur_makeBlock( 8 );
-            break;
-
-        case UT_SLICE:
-            if( ur_isASeries(tos) )
-            {
-                ur_initType(res, UT_SLICE);
-                ur_sliceDT(res) = ur_type(tos);
-                res->series.n = tos->series.n;
-
-                if( ur_is(tos, UT_STRING) )
-                    ur_encoding(res) = ur_encoding(tos);
-
-                if( argc == 2 )
-                {
-                    UCell* pc = ur_s_prev(tos);
-                    if( ur_isASeries(pc) )
-                    {
-                        _setSliceRange( res, pc->series.it, tos->series.it );
-                    }
-                    else if( ur_is(pc, UT_COORD) )
-                    {
-                        _setSliceRange( res, pc->coord.elem[0] - 1,
-                                             pc->coord.elem[1] - 1 );
-                    }
-                }
-                else
-                {
-                    res->slice.it  = tos->series.it;
-                    res->slice.end = -1;
-                }
-            }
             break;
 

branches/thune/thread_safe/math.c

@@ -655 +655 @@
     if( ur_isASeries( tos ) )
     {
-        int len = ur_seriesLen( tos );
+        int len = ur_seriesEnd( tos );
         if( len > 0 )
             tos->series.it += genrand_int32() % (len - tos->series.it);

branches/thune/thread_safe/mkboot.t

@@ -182 +182 @@
       ; fullpath file
       next
-      dup2 slice! rot.r make
+      dup2 slice
       rot.r nip
     ]

branches/thune/thread_safe/net.c

@@ -182 +182 @@
 static int _netOpen( UPortDevice* dev, UThread* ut, UCell* tos )
 {
-    int port;
     struct sockaddr_in addr;
+    int port = 0;
     UCell* spec = 0;
     UCell* res = ur_s_prev(tos);

branches/thune/thread_safe/parse.c

@@ -308 +308 @@
                 ++rit;
 
-                ur_initType( cell, UT_SLICE );
-                ur_sliceDT(cell) = UT_STRING;
-                ur_setSeries( cell, pe->input.n, pos );
-                cell->slice.end = pe->input.end;
+                ur_initType( cell, UT_STRING );
+                ur_setSlice( cell, pe->input.n, pos, pe->input.end );
             }
                 break;
@@ -321 +319 @@
                 ++rit;
 
-                if( ur_is(cell, UT_SLICE) && (cell->series.n == pe->input.n) )
-                    cell->slice.end = pos;
+                if( ur_is(cell, UT_STRING) && (cell->series.n == pe->input.n) )
+                    cell->series.end = pos;
             }
                 break;
@@ -812 +810 @@
                 ++rit;
 
-                ur_initType( cell, UT_SLICE );
-                ur_sliceDT(cell) = UT_BLOCK;
-                ur_setSeries( cell, pe->input.n, pos );
-                cell->slice.end = pe->input.end;
+                ur_initType( cell, UT_BLOCK );
+                ur_setSlice( cell, pe->input.n, pos, pe->input.end );
             }
                 break;
@@ -826 +822 @@
                 ++rit;
 
-                if( ur_is(cell, UT_SLICE) && (cell->series.n == pe->input.n) )
-                    cell->slice.end = pos;
+                if( ur_is(cell, UT_BLOCK) && (cell->series.n == pe->input.n) )
+                    cell->series.end = pos;
             }
                 break;
@@ -1065 +1061 @@
     if( ur_is(rules, UT_BLOCK) )
     {
-        if( ur_is(ser, UT_STRING) ||
-            (ur_is(ser, UT_SLICE) && (ur_sliceDT(ser) == UT_STRING)) )
+        if( ur_is(ser, UT_STRING) )
         {
             StringParser pe;
@@ -1112 +1107 @@
             return;
         }
-        else if( ur_is(ser, UT_BLOCK) ||
-                (ur_is(ser, UT_SLICE) && (ur_sliceDT(ser) == UT_BLOCK)) )
+        else if( ur_is(ser, UT_BLOCK) )
         {
             BlockParser pe;

branches/thune/thread_safe/print.c

@@ -55 +55 @@
 
 /*
-   c2 must be a string! or string slice!.
+   c2 must be a string!.
 */
 void ur_strCatCell( UThread* ut, UString* out, int encoding, const UCell* c2 )
@@ -66 +66 @@
     si = c2->series.it;
 
-    used = str2->used;
-    if( ur_is(c2, UT_SLICE) )
-    {
-        if( used > c2->slice.end )
-            used = c2->slice.end;
-    }
+    used = ur_sliceEnd( c2, str2 );
     used -= si;
 
@@ -263 +258 @@
 static void _binCellToStr( UThread* ut, UString* out, const UCell* val )
 {
-    UString* bin = ur_binPtr( val->series.n );
-    _binToStr( out, 
-               bin->ptr.b + val->series.it,
-               bin->ptr.b + bin->used );
+    UBinary* bin = ur_bin( val );
+    UIndex n = ur_sliceEnd( val, bin );
+    if( n < val->series.it )
+        n = val->series.it;
+    _binToStr( out, bin->ptr.b + val->series.it,
+                    bin->ptr.b + n );
 }
 
@@ -783 +780 @@
         case UT_BLOCK:
         {
+            UCell* vp;
+            UCell* end;
             UBlock* blk = ur_block( val );
-            UCell* vp  = blk->ptr.cells + val->series.it;
-            UCell* end = blk->ptr.cells + blk->used;
-
-            if( vp != end )
-            {
+            UIndex n = ur_sliceEnd( val, blk );
+
+            if( n > val->series.it )
+            {
+                vp  = blk->ptr.cells + val->series.it;
+                end = blk->ptr.cells + n;
                 while( 1 )
                 {
@@ -799 +799 @@
             }
         }
-            break;
-
-        case UT_SLICE:
-            switch( ur_sliceDT(val) )
-            {
-                case UT_STRING:
-                    ur_strCatCell( ut, out, UR_ENC_ASCII, val );
-                    break;
-            }
             break;
 
@@ -1012 +1003 @@
         {
             UString* str = ur_bin( val );
+            UIndex n = ur_sliceEnd( val, str );
+            if( n < val->series.it )
+                n = val->series.it;
             if( ur_encoding(val) == UR_ENC_UTF16 )
             {
                 _appendStringUtf16( out, str->ptr.u16 + val->series.it,
-                                         str->ptr.u16 + str->used );
+                                         str->ptr.u16 + n );
             }
             else
             {
                 _appendStringAscii( out, str->ptr.c + val->series.it,
-                                         str->ptr.c + str->used );
+                                         str->ptr.c + n );
             }
         }
@@ -1182 +1176 @@
         case UT_BLOCK: