Diff
Not logged in

Differences From Artifact [fdb1b48d1f]:

To Artifact [19dbf09621]:


447
448
449
450
451
452
453
454
455
456

457
458



459
460

461
462

463
464















































465
466
467
468
469
470
471
472
473
474
475
476
477
478
479



480
481
482
483
484
485
486
487
488
489
490
491
447
448
449
450
451
452
453
454
455

456


457
458
459
460

461

462
463


464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515










516
517
518





519
520
521
522
523
524
525









-
+
-
-
+
+
+

-
+
-

+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-







 *	The return value is always TCL_OK.
 *
 * Side effects:
 *	A ByteArray object is stored as the internal rep of objPtr.
 *
 *----------------------------------------------------------------------
 */

static int
SetByteArrayFromAny(
MakeByteArray(
    Tcl_Interp *interp,		/* Not used. */
    Tcl_Obj *objPtr)		/* The object to convert to type ByteArray. */
    Tcl_Obj *objPtr,
    int earlyOut,
    ByteArray **byteArrayPtrPtr) 
{
    int length;
    int length, proper = 1;
    const char *src, *srcEnd;
    unsigned char *dst;
    const char *src = TclGetStringFromObj(objPtr, &length);
    ByteArray *byteArrayPtr;
    Tcl_UniChar ch;
    ByteArray *byteArrayPtr = ckalloc(BYTEARRAY_SIZE(length));
    const char *srcEnd = src + length;

    for (dst = byteArrayPtr->bytes; src < srcEnd; ) {
	Tcl_UniChar ch;

	src += Tcl_UtfToUniChar(src, &ch);
	if (ch > 255) {
	  proper = 0;
	  if (earlyOut) {
	    ckfree(byteArrayPtr);
	    *byteArrayPtrPtr = NULL;
	    return proper;
	  }
	}
	*dst++ = UCHAR(ch);
    }
    byteArrayPtr->used = dst - byteArrayPtr->bytes;
    byteArrayPtr->allocated = length;

    *byteArrayPtrPtr = byteArrayPtr;
    return proper;
}

Tcl_Obj *
TclNarrowToBytes(
    Tcl_Obj *objPtr)
{
    ByteArray *byteArrayPtr;

    if (0 == MakeByteArray(objPtr, 0, &byteArrayPtr)) {
	objPtr = Tcl_NewObj();
	TclInvalidateStringRep(objPtr);
    }
    TclFreeIntRep(objPtr);
    objPtr->typePtr = &properByteArrayType;
    SET_BYTEARRAY(objPtr, byteArrayPtr);
    Tcl_IncrRefCount(objPtr);
    return objPtr;
}

static int
SetByteArrayFromAny(
    Tcl_Interp *interp,		/* Not used. */
    Tcl_Obj *objPtr)		/* The object to convert to type ByteArray. */
{
    ByteArray *byteArrayPtr;

    if (objPtr->typePtr == &properByteArrayType) {
	return TCL_OK;
    }

    src = TclGetStringFromObj(objPtr, &length);
    srcEnd = src + length;

    byteArrayPtr = ckalloc(BYTEARRAY_SIZE(length));
    for (dst = byteArrayPtr->bytes; src < srcEnd; ) {
	src += Tcl_UtfToUniChar(src, &ch);
	if (ch > 255) {
	    ckfree(byteArrayPtr);
	    return TCL_ERROR;
	}
    if (0 == MakeByteArray(objPtr, 1, &byteArrayPtr)) {
	return TCL_ERROR;
    }
	*dst++ = UCHAR(ch);
    }

    byteArrayPtr->used = dst - byteArrayPtr->bytes;
    byteArrayPtr->allocated = length;

    TclFreeIntRep(objPtr);
    objPtr->typePtr = &properByteArrayType;
    SET_BYTEARRAY(objPtr, byteArrayPtr);
    return TCL_OK;
}