Tcl Source Code: Check-in [ef4cc04bc1]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	merge core-8-6-branch
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| core-8-branch
Files:	files \| file ages \| folders
SHA3-256:	ef4cc04bc135f2cb6a5c257af2d54b00d2c664273d98cbb5a4fc3e0d5c2f82f3
User & Date:	jan.nijtmans 2017-11-09 12:50:43

Context

2017-11-10
08:49		merge core-8-6-branch check-in: 3d5a87d84a user: jan.nijtmans tags: core-8-branch
2017-11-09
16:07		merge core-8-branch check-in: 05952d6309 user: jan.nijtmans tags: tip-389
15:56		Merge core-8-branch. Backout the Tcl_EvalFile changes. check-in: 9e3aed8df3 user: jan.nijtmans tags: tip-485
14:59		Rebase back to 8.7 (core-8-branch), since that's what the TIP is meant for. (I see no reason to wait... check-in: ffdb1ca7f8 user: jan.nijtmans tags: no-wideint
14:38		Merge core-8-branch Add back UpdateStringOfEndOffset() and related test-cases. Implement bignum supp... check-in: 81f505cb4c user: jan.nijtmans tags: bug-aaa02c55b9
13:36		merge 8.7 check-in: cbada9ca30 user: dgp tags: tip-445
12:51		merge core-8-branch check-in: 49e104fa48 user: jan.nijtmans tags: trunk
12:50		merge core-8-6-branch check-in: ef4cc04bc1 user: jan.nijtmans tags: core-8-branch
12:48		Make "scan %c" and the internal function ExtendUnicodeRepWithString() work as expected for TCL_UTF_M... check-in: baceb17559 user: jan.nijtmans tags: core-8-6-branch
12:37		For alpha/beta versions of Tcl, stub-enabled extensions are only allowed to run on the EXACT the sam... check-in: 8cb6e13ad8 user: jan.nijtmans tags: core-8-branch

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tclScan.c.

	    break;
	}
	case 'c':
	    /*
	     * Scan a single Unicode character.
	     */

	    string += TclUtfToUniChar(string, &sch);








	    if (!(flags & SCAN_SUPPRESS)) {
		objPtr = Tcl_NewIntObj((int)sch);
		Tcl_IncrRefCount(objPtr);
		CLANG_ASSERT(objs);
		objs[objIndex++] = objPtr;
	    }
	    break;

	case 'i':







|
>
>
>
>
>
>
>
>

|

	    break;
	}
	case 'c':
	    /*
	     * Scan a single Unicode character.
	     */

	    offset = TclUtfToUniChar(string, &sch);
	    i = (int)sch;
#if TCL_UTF_MAX == 4
	    if (!offset) {
		offset = Tcl_UtfToUniChar(string, &sch);
		i = (((i<<10) & 0x0FFC00) + 0x10000) + (sch & 0x3FF);
	    }
#endif
	    string += offset;
	    if (!(flags & SCAN_SUPPRESS)) {
		objPtr = Tcl_NewIntObj(i);
		Tcl_IncrRefCount(objPtr);
		CLANG_ASSERT(objs);
		objs[objIndex++] = objPtr;
	    }
	    break;

	case 'i':

Changes to generic/tclStringObj.c.

	    Tcl_UniChar *to;

	    /*
	     * Create a non-empty, pure unicode value, so we can coax
	     * Tcl_SetObjLength into growing the unicode rep buffer.
	     */

	    ch = 0;
	    objPtr = Tcl_NewUnicodeObj(&ch, 1);
	    Tcl_SetObjLength(objPtr, stringPtr->numChars);
	    to = Tcl_GetUnicode(objPtr);
	    while (--src >= from) {
		*to++ = *src;
	    }
	} else {
................................................................................
    Tcl_Obj *objPtr,
    const char *bytes,
    int numBytes,
    int numAppendChars)
{
    String *stringPtr = GET_STRING(objPtr);
    int needed, numOrigChars = 0;
    Tcl_UniChar *dst;

    if (stringPtr->hasUnicode) {
	numOrigChars = stringPtr->numChars;
    }
    if (numAppendChars == -1) {
	TclNumUtfChars(numAppendChars, bytes, numBytes);
    }
................................................................................
    stringPtr->hasUnicode = 1;
    if (bytes) {
	stringPtr->numChars = needed;
    } else {
	numAppendChars = 0;
    }
    for (dst=stringPtr->unicode + numOrigChars; numAppendChars-- > 0; dst++) {
	bytes += TclUtfToUniChar(bytes, dst);

    }
    *dst = 0;
}
 
/*
 *----------------------------------------------------------------------
 *

	    Tcl_UniChar *to;

	    /*
	     * Create a non-empty, pure unicode value, so we can coax
	     * Tcl_SetObjLength into growing the unicode rep buffer.
	     */


	    objPtr = Tcl_NewUnicodeObj(&ch, 1);
	    Tcl_SetObjLength(objPtr, stringPtr->numChars);
	    to = Tcl_GetUnicode(objPtr);
	    while (--src >= from) {
		*to++ = *src;
	    }
	} else {
................................................................................
    Tcl_Obj *objPtr,
    const char *bytes,
    int numBytes,
    int numAppendChars)
{
    String *stringPtr = GET_STRING(objPtr);
    int needed, numOrigChars = 0;
    Tcl_UniChar *dst, unichar = 0;

    if (stringPtr->hasUnicode) {
	numOrigChars = stringPtr->numChars;
    }
    if (numAppendChars == -1) {
	TclNumUtfChars(numAppendChars, bytes, numBytes);
    }
................................................................................
    stringPtr->hasUnicode = 1;
    if (bytes) {
	stringPtr->numChars = needed;
    } else {
	numAppendChars = 0;
    }
    for (dst=stringPtr->unicode + numOrigChars; numAppendChars-- > 0; dst++) {
	bytes += TclUtfToUniChar(bytes, &unichar);
	*dst = unichar;
    }
    *dst = 0;
}
 
/*
 *----------------------------------------------------------------------
 *