Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Rebase the refactoring branch to novem. |
|---|---|
| Timelines: | family | ancestors | descendants | both | dgp-refactor |
| Files: | files | file ages | folders |
| SHA1: |
663194637e43d1268c57f365d98a507d |
| User & Date: | dgp 2014-09-29 13:37:15.860 |
Context
|
2014-09-30
| ||
| 19:37 | Convert loop to use a BP iterator. check-in: adc6634678 user: dgp tags: dgp-refactor | |
|
2014-09-29
| ||
| 13:37 | Rebase the refactoring branch to novem. check-in: 663194637e user: dgp tags: dgp-refactor | |
| 13:25 | merge trunk check-in: 95094291e7 user: dgp tags: dgp-refactor | |
|
2014-09-28
| ||
| 22:23 | merge trunk check-in: 9a9386911e user: dgp tags: novem | |
Changes
Changes to ChangeLog.2008.
| ︙ | ︙ | |||
1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 | * unix/tclUnixChan.c: Streamline async connect logic [Patch 1994512] 2008-08-05 Miguel Sofer <msofer@users.sf.net> * generic/tclExecute.c: Fix for [Bug 2038069] by dgp. * tests/execute.test: 2008-08-04 Miguel Sofer <msofer@users.sf.net> * tests/nre.test: Added tests for [if], [while] and [for]. A test for [foreach] has been added and marked as knownbug, awaiting for it to be NR-enabled. | > > > > > > > > > | 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 | * unix/tclUnixChan.c: Streamline async connect logic [Patch 1994512] 2008-08-05 Miguel Sofer <msofer@users.sf.net> * generic/tclExecute.c: Fix for [Bug 2038069] by dgp. * tests/execute.test: 2008-08-04 Don Porter <dgp@users.sourceforge.net>S [dgp-refactor branch] * generic/tclBasic.c: Move toplevel exception handling code into TclEvalScriptTokens where the right data is available to construct the stack trace, and out of callers which lacked that data. Fixes long failing basic-46.* tests. 2008-08-04 Miguel Sofer <msofer@users.sf.net> * tests/nre.test: Added tests for [if], [while] and [for]. A test for [foreach] has been added and marked as knownbug, awaiting for it to be NR-enabled. |
| ︙ | ︙ |
Changes to generic/tclAssembly.c.
| ︙ | ︙ | |||
941 942 943 944 945 946 947 |
*-----------------------------------------------------------------------------
*/
int
TclCompileAssembleCmd(
Tcl_Interp *interp, /* Used for error reporting. */
Tcl_Parse *parsePtr, /* Points to a parse structure for the command
| | | 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 |
*-----------------------------------------------------------------------------
*/
int
TclCompileAssembleCmd(
Tcl_Interp *interp, /* Used for error reporting. */
Tcl_Parse *parsePtr, /* Points to a parse structure for the command
* created by TclParseCommand. */
Command *cmdPtr, /* Points to defintion of command being
* compiled. */
CompileEnv *envPtr) /* Holds resulting instructions. */
{
Tcl_Token *tokenPtr; /* Token in the input script */
int numCommands = envPtr->numCommands;
|
| ︙ | ︙ | |||
976 977 978 979 980 981 982 |
if (TCL_ERROR == TclAssembleCode(envPtr, tokenPtr[1].start,
tokenPtr[1].size, TCL_EVAL_DIRECT)) {
Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
"\n (\"%.*s\" body, line %d)",
parsePtr->tokenPtr->size, parsePtr->tokenPtr->start,
Tcl_GetErrorLine(interp)));
| | | 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 |
if (TCL_ERROR == TclAssembleCode(envPtr, tokenPtr[1].start,
tokenPtr[1].size, TCL_EVAL_DIRECT)) {
Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
"\n (\"%.*s\" body, line %d)",
parsePtr->tokenPtr->size, parsePtr->tokenPtr->start,
Tcl_GetErrorLine(interp)));
TclDisposeFailedCompile(envPtr, numCommands);
envPtr->codeNext = envPtr->codeStart + offset;
envPtr->currStackDepth = depth;
TclCompileSyntaxError(interp, envPtr);
}
return TCL_OK;
}
|
| ︙ | ︙ | |||
1032 1033 1034 1035 1036 1037 1038 |
Tcl_Parse* parsePtr = assemEnvPtr->parsePtr;
do {
/*
* Parse out one command line from the assembly script.
*/
| | > | 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 |
Tcl_Parse* parsePtr = assemEnvPtr->parsePtr;
do {
/*
* Parse out one command line from the assembly script.
*/
status = TclParseCommand(interp, instPtr, bytesLeft,
PARSE_USE_INTERNAL_TOKENS, parsePtr);
/*
* Report errors in the parse.
*/
if (status != TCL_OK) {
if (flags & TCL_EVAL_DIRECT) {
|
| ︙ | ︙ |
Changes to generic/tclBasic.c.
| ︙ | ︙ | |||
4428 4429 4430 4431 4432 4433 4434 |
* errors. */
Tcl_Token *tokenPtr, /* Pointer to first in an array of tokens to
* evaluate and concatenate. */
int count) /* Number of tokens to consider at tokenPtr.
* Must be at least 1. */
{
return TclSubstTokens(interp, tokenPtr, count, /* numLeftPtr */ NULL, 1,
| | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 |
* errors. */
Tcl_Token *tokenPtr, /* Pointer to first in an array of tokens to
* evaluate and concatenate. */
int count) /* Number of tokens to consider at tokenPtr.
* Must be at least 1. */
{
return TclSubstTokens(interp, tokenPtr, count, /* numLeftPtr */ NULL, 1,
NULL, NULL, 0);
}
/*
*----------------------------------------------------------------------
*
* TclEvalScriptTokens --
*
*
* Results:
*
* Side effects:
*
* TIP #280 : Keep public API, internally extended API.
*----------------------------------------------------------------------
*/
int
TclEvalScriptTokens(
Tcl_Interp *interp,
Tcl_Token *tokenPtr,
int length,
int flags,
int line,
int* clNextOuter, /* Information about an outer context for */
const char* outerScript) /* continuation line data. This is set only in
* TclSubstTokens(), to properly handle
* [...]-nested commands. The 'outerScript'
* refers to the most-outer script containing
* the embedded command, which is refered to
* by 'script'. The 'clNextOuter' refers to
* the current entry in the table of
* continuation lines in this "master script",
* and the character offsets are relative to
* the 'outerScript' as well.
*
* If outerScript == script, then this call is
* for the outer-most script/command. See
* Tcl_EvalEx() and TclEvalObjEx() for places
* generating arguments for which this is true.
*/
{
int numCommands = tokenPtr->numComponents;
Tcl_Token *scriptTokenPtr = tokenPtr;
Interp *iPtr = (Interp *) interp;
int code = TCL_OK;
unsigned int objLength = 20;
int *expand, *expandStack, *lines, *lineSpace, *linesStack;
Tcl_Obj **objvSpace, **stackObjArray;
const char *cmdString = scriptTokenPtr->start;
int cmdSize = scriptTokenPtr->size;
CmdFrame *eeFramePtr; /* TIP #280 Structures for tracking of command
* locations. */
int allowExceptions = 1;
int *clNext = NULL; /* Pointer for the tracking of invisible
* continuation lines. Initialized only if the
* caller gave us a table of locations to
* track, via scriptCLLocPtr. It always refers
* to the table entry holding the location of
* the next invisible continuation line to
* look for, while parsing the script. */
if (iPtr->scriptCLLocPtr) {
if (clNextOuter) {
clNext = clNextOuter;
} else {
clNext = &iPtr->scriptCLLocPtr->loc[0];
}
}
if (iPtr->numLevels == 0) {
allowExceptions = iPtr->evalFlags & TCL_ALLOW_EXCEPTIONS;
}
if (length == 0) {
Tcl_Panic("EvalScriptTokens: can't eval zero tokens");
}
if (tokenPtr->type != TCL_TOKEN_SCRIPT) {
Tcl_Panic("EvalScriptTokens: invalid token array, expected script");
}
tokenPtr++; length--;
if (numCommands) {
TclAdvanceLines(&line, scriptTokenPtr->start, tokenPtr->start);
TclAdvanceContinuations(&line, &clNext, tokenPtr->start - outerScript);
}
if (length == 0) {
return TclInterpReady(interp);
}
/*
* TIP #280 Initialize tracking. Do not push on the frame stack yet.
*
* We open a new context, either for a sourced script, or 'eval'.
* For sourced files we always have a path object, even if nothing was
* specified in the interp itself. That makes code using it simpler as
* NULL checks can be left out. Sourced file without path in the
* 'scriptFile' is possible during Tcl initialization.
*/
eeFramePtr = TclStackAlloc(interp, sizeof(CmdFrame));
if (iPtr->evalFlags & TCL_EVAL_FILE) {
/*
* Set up for a sourced file.
*/
eeFramePtr->type = TCL_LOCATION_SOURCE;
if (iPtr->scriptFile) {
/*
* Normalization here, to have the correct pwd. Should have
* negligible impact on performance, as the norm should have been
* done already by the 'source' invoking us, and it caches the
* result.
*/
Tcl_Obj *norm = Tcl_FSGetNormalizedPath(interp, iPtr->scriptFile);
if (norm == NULL) {
/*
* Error message in the interp result.
*/
TclStackFree(interp, eeFramePtr);
return TCL_ERROR;
}
eeFramePtr->data.eval.path = norm;
} else {
TclNewLiteralStringObj(eeFramePtr->data.eval.path, "");
}
Tcl_IncrRefCount(eeFramePtr->data.eval.path);
} else {
/*
* Set up for plain eval.
*/
eeFramePtr->type = TCL_LOCATION_EVAL;
eeFramePtr->data.eval.path = NULL;
}
eeFramePtr->level = iPtr->cmdFramePtr ? iPtr->cmdFramePtr->level + 1 : 1;
eeFramePtr->framePtr = iPtr->framePtr;
eeFramePtr->nextPtr = iPtr->cmdFramePtr;
eeFramePtr->nline = 0;
eeFramePtr->line = NULL;
eeFramePtr->cmdObj = NULL;
iPtr->cmdFramePtr = eeFramePtr;
iPtr->evalFlags = 0;
objvSpace = stackObjArray =
TclStackAlloc(interp, objLength * sizeof(Tcl_Obj *));
expand = expandStack =
TclStackAlloc(interp, objLength * sizeof(int));
lineSpace = linesStack =
TclStackAlloc(interp, objLength * sizeof(int));
while (numCommands-- && (code == TCL_OK)) {
int objc, expandRequested = 0;
unsigned int objectsNeeded = 0;
unsigned int numWords = tokenPtr->numComponents;
Tcl_Obj **objv;
Tcl_Token *commandTokenPtr = tokenPtr;
/*
* TIP #280. Track lines within the words of the current command.
* We use a separate pointer into the table of continuation line
* locations to not lose our position for the per-command parsing.
*/
int wordLine = line;
const char *wordStart = commandTokenPtr->start;
int *wordCLNext = clNext;
if (length == 0) {
Tcl_Panic("EvalScriptTokens: overran token array");
}
if (tokenPtr->type != TCL_TOKEN_CMD) {
Tcl_Panic("EvalScriptTokens: invalid token array, expected cmd");
}
tokenPtr++; length--;
if (numWords == 0) continue;
if (numWords > objLength) {
if (expand != expandStack) {
ckfree(expand);
}
expand = ckalloc(numWords * sizeof(int));
if (objvSpace != stackObjArray) {
ckfree(objvSpace);
}
objvSpace = ckalloc(numWords * sizeof(Tcl_Obj *));
if (lineSpace != linesStack) {
ckfree(lineSpace);
}
lineSpace = ckalloc(numWords * sizeof(int));
objLength = numWords;
}
objv = objvSpace;
lines = lineSpace;
iPtr->cmdFramePtr = eeFramePtr->nextPtr;
for (objc = 0; objc < numWords;
objc++, length -= (tokenPtr->numComponents + 1),
tokenPtr += tokenPtr->numComponents+1) {
if (length == 0) {
Tcl_Panic("EvalScriptTokens: overran token array");
}
if (!(tokenPtr->type & (TCL_TOKEN_WORD
| TCL_TOKEN_SIMPLE_WORD | TCL_TOKEN_EXPAND_WORD))) {
Tcl_Panic("EvalScriptTokens: invalid token array, expected word: %d: %.*s", tokenPtr->type, tokenPtr->size, tokenPtr->start);
}
if (length < tokenPtr->numComponents + 1) {
Tcl_Panic("EvalScriptTokens: overran token array");
}
/*
* TIP #280. Track lines to current word. Save the information
* on a per-word basis, signaling dynamic words as needed.
* Make the information available to the recursively called
* evaluator as well, including the type of context (source
* vs. eval).
*/
TclAdvanceLines(&wordLine, wordStart, tokenPtr->start);
TclAdvanceContinuations (&wordLine, &wordCLNext,
tokenPtr->start - outerScript);
wordStart = tokenPtr->start;
lines[objc] = TclWordKnownAtCompileTime(tokenPtr, NULL)
? wordLine : -1;
if (eeFramePtr->type == TCL_LOCATION_SOURCE) {
iPtr->evalFlags |= TCL_EVAL_FILE;
}
code = TclSubstTokens(interp, tokenPtr+1, tokenPtr->numComponents,
NULL, wordLine, wordCLNext, outerScript, flags);
iPtr->evalFlags = 0;
if (code != TCL_OK) {
break;
}
objv[objc] = Tcl_GetObjResult(interp);
Tcl_IncrRefCount(objv[objc]);
if (tokenPtr->type == TCL_TOKEN_EXPAND_WORD) {
int numElements;
code = TclListObjLength(interp, objv[objc], &numElements);
if (code == TCL_ERROR) {
/*
* Attempt to expand a non-list
*/
Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
"\n (expanding word %d)", objc));
objc++;
break;
}
expandRequested = 1;
expand[objc] = 1;
objectsNeeded += (numElements ? numElements : 1);
} else {
expand[objc] = 0;
objectsNeeded++;
}
if (wordCLNext) {
TclContinuationsEnterDerived (objv[objc],
wordStart - outerScript, wordCLNext);
}
}
iPtr->cmdFramePtr = eeFramePtr;
if (code != TCL_OK) {
goto error;
}
if (expandRequested) {
/* Some word expansion was requested. Check for objv resize */
Tcl_Obj **copy = objvSpace;
int *lcopy = lineSpace;
int wordIdx = numWords;
int objIdx = objectsNeeded - 1;
int inPlaceCopy = 1;
if (objectsNeeded > objLength) {
inPlaceCopy = 0;
objv = objvSpace = ckalloc(objectsNeeded * sizeof(Tcl_Obj*));
lines = lineSpace = ckalloc(objectsNeeded * sizeof (int));
}
objc = 0;
while (wordIdx--) {
if (expand[wordIdx]) {
int numElements;
Tcl_Obj **elements, *temp = copy[wordIdx];
Tcl_ListObjGetElements(NULL, temp, &numElements,
&elements);
objc += numElements;
while (numElements--) {
lines[objIdx] = -1;
objv[objIdx--] = elements[numElements];
Tcl_IncrRefCount(elements[numElements]);
}
Tcl_DecrRefCount(temp);
} else {
lines[objIdx] = lcopy[wordIdx];
objv[objIdx--] = copy[wordIdx];
objc++;
}
}
objv += objIdx+1;
if (!inPlaceCopy && (copy != stackObjArray)) {
ckfree(copy);
ckfree(lcopy);
}
}
/*
* Execute the command and free the objects for its words.
*
* TIP #280: Remember the command itself for 'info frame'.
* Here is where we put our frame on the stack of frames too.
* _After_ the nested commands have been executed.
*/
eeFramePtr->cmd = commandTokenPtr->start;
eeFramePtr->len = commandTokenPtr->size;
eeFramePtr->nline = objc;
eeFramePtr->line = lines;
TclArgumentEnter(interp, objv, objc, eeFramePtr);
code = Tcl_EvalObjv(interp, objc, objv,
flags|TCL_EVAL_NOERR|TCL_EVAL_SOURCE_IN_FRAME);
TclArgumentRelease(interp, objv, objc);
eeFramePtr->line = NULL;
eeFramePtr->nline = 0;
if (eeFramePtr->cmdObj) {
Tcl_DecrRefCount(eeFramePtr->cmdObj);
eeFramePtr->cmdObj = NULL;
}
error:
while (--objc >= 0) {
Tcl_DecrRefCount(objv[objc]);
}
cmdString = commandTokenPtr->start;
cmdSize = commandTokenPtr->size;
/*
* TIP #280 Track Lines. Now we track how many lines were in the
* executed command.
*/
if (numCommands) {
TclAdvanceLines(&line, commandTokenPtr->start, tokenPtr->start);
}
}
if (length && (code == TCL_OK)) {
code = TclSubstTokens(interp, tokenPtr, length, NULL, line, clNext,
outerScript, flags);
}
if ((code == TCL_ERROR) && !(iPtr->flags & ERR_ALREADY_LOGGED)) {
Tcl_LogCommandInfo(interp, scriptTokenPtr->start, cmdString, cmdSize);
}
iPtr->flags &= ~ERR_ALREADY_LOGGED;
if (lineSpace != linesStack) {
ckfree(lineSpace);
}
TclStackFree(interp, linesStack);
if (expand != expandStack) {
ckfree(expand);
}
TclStackFree(interp, expandStack);
if (objvSpace != stackObjArray) {
ckfree(objvSpace);
}
TclStackFree(interp, stackObjArray);
if (iPtr->numLevels == 0) {
if (code == TCL_RETURN) {
code = TclUpdateReturnInfo(iPtr);
}
if ((code != TCL_OK) && (code != TCL_ERROR) && !allowExceptions) {
ProcessUnexpectedResult(interp, code);
code = TCL_ERROR;
Tcl_LogCommandInfo(interp, scriptTokenPtr->start,
cmdString, cmdSize);
}
}
/*
* TIP #280. Release the local CmdFrame, and its contents.
*/
iPtr->cmdFramePtr = iPtr->cmdFramePtr->nextPtr;
if (eeFramePtr->type == TCL_LOCATION_SOURCE) {
Tcl_DecrRefCount(eeFramePtr->data.eval.path);
}
TclStackFree(interp, eeFramePtr);
return code;
}
/*
*----------------------------------------------------------------------
*
* Tcl_EvalEx, TclEvalEx --
*
|
| ︙ | ︙ | |||
4474 4475 4476 4477 4478 4479 4480 |
int
TclEvalEx(
Tcl_Interp *interp, /* Interpreter in which to evaluate the
* script. Also used for error reporting. */
const char *script, /* First character of script to evaluate. */
int numBytes, /* Number of bytes in script. If < 0, the
* script consists of all bytes up to the
| | | | | > | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < | < < < < | < < < < < < < < < < < < | < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < | < < < < < < | < < < < < < < | < < < < < | < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < | < < < < | < < < < < | < < < < < < | < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < | 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 |
int
TclEvalEx(
Tcl_Interp *interp, /* Interpreter in which to evaluate the
* script. Also used for error reporting. */
const char *script, /* First character of script to evaluate. */
int numBytes, /* Number of bytes in script. If < 0, the
* script consists of all bytes up to the
* first null character. */
int flags, /* Collection of OR-ed bits that control
* the evaluation of the script. Only
* TCL_EVAL_GLOBAL is currently
* supported. */
int line, /* The line the script starts on. */
int* clNextOuter, /* Information about an outer context for */
const char* outerScript) /* continuation line data. This is set only in
* EvalTokensStandard(), to properly handle
* [...]-nested commands. The 'outerScript'
* refers to the most-outer script containing the
* embedded command, which is refered to by
* 'script'. The 'clNextOuter' refers to the
* current entry in the table of continuation
* lines in this "master script", and the
* character offsets are relative to the
* 'outerScript' as well.
*
* If outerScript == script, then this call is
* for the outer-most script/command. See
* Tcl_EvalEx() and TclEvalObjEx() for places
* generating arguments for which this is true.
*/
{
Tcl_Token *lastTokenPtr, *tokensPtr = TclParseScript(interp,
script, numBytes, /* flags */ 0, &lastTokenPtr, NULL);
int code = TclEvalScriptTokens(interp, tokensPtr,
1 + (int)(lastTokenPtr - tokensPtr), flags, line,
clNextOuter, outerScript);
ckfree(tokensPtr);
return code;
}
/*
*----------------------------------------------------------------------
*
* TclAdvanceLines --
|
| ︙ | ︙ | |||
5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 |
* evaluation of the script. Supported values
* are TCL_EVAL_GLOBAL and TCL_EVAL_DIRECT. */
const CmdFrame *invoker, /* Frame of the command doing the eval. */
int word) /* Index of the word which is in objPtr. */
{
Interp *iPtr = (Interp *) interp;
int result;
/*
* This function consists of three independent blocks for: direct
* evaluation of canonical lists, compilation and bytecode execution and
* finally direct evaluation. Precisely one of these blocks will be run.
*/
| > | 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 |
* evaluation of the script. Supported values
* are TCL_EVAL_GLOBAL and TCL_EVAL_DIRECT. */
const CmdFrame *invoker, /* Frame of the command doing the eval. */
int word) /* Index of the word which is in objPtr. */
{
Interp *iPtr = (Interp *) interp;
int result;
int allowExceptions = (iPtr->evalFlags & TCL_ALLOW_EXCEPTIONS);
/*
* This function consists of three independent blocks for: direct
* evaluation of canonical lists, compilation and bytecode execution and
* finally direct evaluation. Precisely one of these blocks will be run.
*/
|
| ︙ | ︙ | |||
5528 5529 5530 5531 5532 5533 5534 | /* * Let the compiler/engine subsystem do the evaluation. * * TIP #280 The invoker provides us with the context for the script. * We transfer this to the byte code compiler. */ | < | 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 |
/*
* Let the compiler/engine subsystem do the evaluation.
*
* TIP #280 The invoker provides us with the context for the script.
* We transfer this to the byte code compiler.
*/
ByteCode *codePtr;
CallFrame *savedVarFramePtr = NULL; /* Saves old copy of
* iPtr->varFramePtr in case
* TCL_EVAL_GLOBAL was set. */
if (TclInterpReady(interp) != TCL_OK) {
return TCL_ERROR;
|
| ︙ | ︙ | |||
5555 5556 5557 5558 5559 5560 5561 |
{
/*
* We're not supposed to use the compiler or byte-code
* interpreter. Let Tcl_EvalEx evaluate the command directly (and
* probably more slowly).
*/
| | < < > | | > > | > | 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 |
{
/*
* We're not supposed to use the compiler or byte-code
* interpreter. Let Tcl_EvalEx evaluate the command directly (and
* probably more slowly).
*/
Tcl_Token *lastTokenPtr, *tokensPtr;
/*
* Now we check if we have data about invisible continuation lines for
* the script, and make it available to the direct script parser and
* evaluator we are about to call, if so.
*
* It may be possible that the script Tcl_Obj* can be free'd while the
* evaluator is using it, leading to the release of the associated
* ContLineLoc structure as well. To ensure that the latter doesn't
* happen we set a lock on it. We release this lock later in this
* function, after the evaluator is done. The relevant "lineCLPtr"
* hashtable is managed in the file "tclObj.c".
*
* Another important action is to save (and later restore) the
* continuation line information of the caller, in case we are
* executing nested commands in the eval/direct path.
*/
ContLineLoc *saveCLLocPtr = iPtr->scriptCLLocPtr;
Tcl_Obj *copyPtr = TclTokensCopy(objPtr);
assert(invoker == NULL);
iPtr->scriptCLLocPtr = TclContinuationsGet(objPtr);
Tcl_IncrRefCount(objPtr);
tokensPtr = TclGetTokensFromObj(copyPtr, &lastTokenPtr);
result = TclEvalScriptTokens(interp, tokensPtr,
1 + (int)(lastTokenPtr - tokensPtr), flags, 1, NULL,
tokensPtr[0].start);
Tcl_DecrRefCount(objPtr);
Tcl_DecrRefCount(copyPtr);
iPtr->scriptCLLocPtr = saveCLLocPtr;
return result;
}
}
static int
|
| ︙ | ︙ | |||
6008 6009 6010 6011 6012 6013 6014 |
int objc, /* Count of arguments. */
Tcl_Obj *const objv[], /* Argument objects; objv[0] points to the
* name of the command to invoke. */
int flags) /* Combination of flags controlling the call:
* TCL_INVOKE_HIDDEN, TCL_INVOKE_NO_UNKNOWN,
* or TCL_INVOKE_NO_TRACEBACK. */
{
| | < < | 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 |
int objc, /* Count of arguments. */
Tcl_Obj *const objv[], /* Argument objects; objv[0] points to the
* name of the command to invoke. */
int flags) /* Combination of flags controlling the call:
* TCL_INVOKE_HIDDEN, TCL_INVOKE_NO_UNKNOWN,
* or TCL_INVOKE_NO_TRACEBACK. */
{
/* make whole thing a call to Tcl_EvalObjv */
if ((objc < 1) || (objv == NULL)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"illegal argument vector", -1));
return TCL_ERROR;
}
if ((flags & TCL_INVOKE_HIDDEN) == 0) {
Tcl_Panic("TclObjInvoke: called without TCL_INVOKE_HIDDEN");
|
| ︙ | ︙ |
Added generic/tclBrodnik.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 |
/*
* tclBrodnik.c --
*
* This file contains the implementation of a BrodnikArray.
*
* Contributions from Don Porter, NIST, 2013. (not subject to US copyright)
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#include "tclBrodnik.h"
#if defined(HAVE_INTRIN_H)
# include <intrin.h>
#ifdef _WIN64
# pragma intrinsic(_BitScanReverse64)
#else
# pragma intrinsic(_BitScanReverse)
#endif
#endif
/*
*----------------------------------------------------------------------
*
* TclMSB --
*
* Given a size_t non-zero value n, return the index of the most
* significant bit in n that is set. This is equivalent to returning
* trunc(log2(n)). It's also equivalent to the largest integer k
* such that 2^k <= n.
*
* This routine is adapted from Andrej Brodnik, "Computation of the
* Least Significant Set Bit", pp 7-10, Proceedings of the 2nd
* Electrotechnical and Computer Science Conference, Portoroz,
* Slovenia, 1993. The adaptations permit the computation to take
* place within size_t values without the need for double length
* buffers for calculation. They also fill in a number of details
* the paper omits or leaves unclear.
*
* Results:
* The index of the most significant set bit in n, a value between
* 0 and CHAR_BIT*sizeof(size_t) - 1, inclusive.
*
* Side effects:
* None.
*
*----------------------------------------------------------------------
*/
int
TclMSB(
size_t n)
{
const int M = CHAR_BIT * sizeof(size_t); /* Bits in a size_t */
/*
* TODO: This function corresponds to a processor instruction on
* many platforms. Add here the various platform and compiler
* specific incantations to invoke those assembly instructions.
*/
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4)))
return n ? M - 1 - __builtin_clzll(n) : 0;
#endif
#if defined(_MSC_VER) && _MSCVER >= 1300
unsigned long result;
#ifdef _WIN64
(void) _BitScanReverse64(&result, n)
#else
(void) _BitScanReverse(&result, n)
#endif
return result;
#endif
if (M == 64) {
/*
* For a byte, consider two masks, C1 = 10000000 selecting just
* the high bit, and C2 = 01111111 selecting all other bits.
* Then for any byte value n, the computation
* LEAD(n) = C1 & (n | (C2 + (n & C2)))
* will leave all bits but the high bit unset, and will have the
* high bit set iff n!=0. The whole thing is an 8-bit test
* for being non-zero. For an 8-byte size_t, each byte can have
* the test applied all at once, with combined masks.
*/
const size_t C1 = 0x8080808080808080;
const size_t C2 = 0x7F7F7F7F7F7F7F7F;
#define LEAD(n) (C1 & (n | (C2 + (n & C2))))
/*
* To shift a bit to a new place, multiplication by 2^k will do.
* To shift the top 7 bits produced by the LEAD test to the high
* 7 bits of the entire size_t, multiply by the right sum of
* powers of 2. In this case
* Q = 1 + 2^7 + 2^14 + 2^21 + 2^28 + 2^35 + 2^42
* Then shift those 7 bits down to the low 7 bits of the size_t.
* The key to making this work is that none of the shifted bits
* collide with each other in the top 7-bit destination.
* Note that we lose the bit that indicates whether the low byte
* is non-zero. That doesn't matter because we require the original
* value n to be non-zero, so if all other bytes signal to be zero,
* we know the low byte is non-zero, and if one of the other bytes
* signals non-zero, we just don't care what the low byte is.
*/
const size_t Q = 0x0000040810204081;
/*
* To place a copy of a 7-bit value in each of 7 bytes in
* a size_t, just multply by the right value. In this case
* P = 0x00 01 01 01 01 01 01 01
* We don't put a copy in the high byte since analysis of the
* remaining steps in the algorithm indicates we do not need it.
*/
const size_t P = 0x0001010101010101;
/*
* With 7 copies of the LEAD value, we can now apply 7 masks
* to it in a single step by an & against the right value.
* B = 00000000 01111111 01111110 01111100
* 01111000 01110000 01100000 01000000
* The higher the MSB of the copied value is, the more of the
* B-masked bytes stored in t will be non-zero.
*/
const size_t B = 0x007F7E7C78706040;
size_t t = B & P * (LEAD(n) * Q >> 57);
/*
* We want to get a count of the non-zero bytes stored in t.
* First use LEAD(t) to create a set of high bits signaling
* non-zero values as before. Call this value
* X = x6*2^55 +x5*2^47 +x4*2^39 +x3*2^31 +x2*2^23 +x1*2^15 +x0*2^7
* Then notice what multiplication by
* P = 2^48 + 2^40 + 2^32 + 2^24 + 2^16 + 2^8 + 1
* produces:
* P*X = x0*2^7 + (x0 + x1)*2^15 + ...
* ... + (x0 + x1 + x2 + x3 + x4 + x5 + x6) * 2^55 + ...
* ... + (x5 + x6)*2^95 + x6*2^103
* The high terms of this product are going to overflow the size_t
* and get lost, but we don't care about them. What we care is that
* the 2^55 term is exactly the sum we seek. We shift the product
* down by 55 bits and then mask away all but the bottom 3 bits
* (Max sum can be 7) we get exactly the count of non-zero B-masked
* bytes. By design of the mask, this count is the index of the
* MSB of the LEAD value. It indicates which byte of the original
* value contains the MSB of the original value.
*/
#define SUM(t) (0x7 & (int)(LEAD(t) * P >> 55));
/*
* Multiply by 8 to get the number of bits to shift to place
* that MSB-containing byte in the low byte.
*/
int k = 8 * SUM(t);
/*
* Shift the MSB byte to the low byte. Then shift one more bit.
* Since we know the MSB byte is non-zero we only need to compute
* the MSB of the top 7 bits. If all top 7 bits are zero, we know
* the bottom bit is the 1 and the correct index is 0. Compute the
* MSB of that value by the same steps we did before.
*/
t = B & P * (n >> k >> 1);
/*
* Add the index of the MSB of the byte to the index of the low
* bit of that byte computed before to get the final answer.
*/
return k + SUM(t);
/* Total operations: 33
* 10 bit-ands, 6 multiplies, 4 adds, 5 rightshifts,
* 3 assignments, 3 bit-ors, 2 typecasts.
*
* The whole task is one direct computation.
* No branches. No loops.
*
* 33 operations cannot beat one instruction, so assembly
* wins and should be used wherever possible, but this isn't bad.
*/
#undef SUM
} else if (M == 32) {
/* Same scheme as above, with adjustments to the 32-bit size */
const size_t C1 = 0xA0820820;
const size_t C2 = 0x5F7DF7DF;
const size_t C3 = 0xC0820820;
const size_t C4 = 0x20000000;
const size_t Q = 0x00010841;
const size_t P = 0x01041041;
const size_t B = 0x1F79C610;
#define SUM(t) (0x7 & (LEAD(t) * P >> 29));
size_t t = B & P * ((C3 & (LEAD(n) + C4)) * Q >> 27);
int k = 6 * SUM(t);
t = B & P * (n >> k >> 1);
return k + SUM(t);
/* Total operations: 33
* 11 bit-ands, 6 multiplies, 5 adds, 5 rightshifts,
* 3 assignments, 3 bit-ors.
*/
#undef SUM
#undef LEAD
} else {
/* Simple and slow fallback for cases we haven't done yet. */
int k = 0;
while (n >>= 1) {
k++;
}
return k;
}
}
/*
*----------------------------------------------------------------------
*
* TclBAConvertIndices --
*
* Given a size_t index into the sequence, convert into the
* corresponding index pair of the store[] of a BrodnikArray.
*
* store[] is an array of arrays, and as the total size grows
* larger, the size of the arrays store[i] grow in a way that
* each new array is of about size sqrt(N), yet the index conversion
* routine remains relatively simple to calculate.
*
* Results:
* The index pair is written to *hiPtr and *loPtr, which may not
* be NULL.
*
* Side effects:
* None.
*
*----------------------------------------------------------------------
*/
void
TclBAConvertIndices(
size_t index,
unsigned int *hiPtr,
unsigned int *loPtr)
{
size_t r = index + 1;
int k = TclMSB(r);
int shift = (k + 1) >> 1;
unsigned int lobits = (1 << shift) - 1;
unsigned int hibits = 1 << (k - shift);
*hiPtr = (lobits << 1) - ((k & 1) * hibits)
+ ((r >> shift) & (hibits - 1));
*loPtr = r & lobits;
}
/*
*----------------------------------------------------------------------
*
* TclBAInvertIndices --
*
* Given a size_t index pair hi, lo into the store[] of a BrodnikArray,
* compute and return the size_t index of the element found there.
*
* Results:
* The size_t index value.
*
* Side effects:
* None.
*----------------------------------------------------------------------
*/
size_t
TclBAInvertIndices(
unsigned int hi,
unsigned int lo)
{
size_t plus2 = hi + 2;
int n = TclMSB(plus2) - 1;
unsigned int bit = (((size_t)1)<<n);
int SB = 2*n + ((plus2 & bit)!=0);
size_t base = (((size_t)1)<<SB) - 1;
size_t increment = ((bit - 1) & plus2) << n;
return base + increment + lo;
}
|
Added generic/tclBrodnik.h.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 |
/*
* tclBrodnik.h --
*
* This file contains the implementation of a BrodnikArray.
*
* Contributions from Don Porter, NIST, 2013. (not subject to US copyright)
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#include "tclInt.h"
/*
* The routines that follow implement a BrodnikArray of T elements, where
* T is the type of the elements to be stored, which is the argument of
* the macro.
*
* The BrodnikArray data structure is adapted from Andrej Brodnik et al.,
* "Resizable Arrays in Optimal Time and Space", from the Proceedings of
* the 1999 Workshop on Algorithms and Data Structures, Lecture Notes
* in Computer Science (LNCS) vol. 1663, pp. 37-48.
*
* The BrodnikArray is an indexed sequence of values. The routines
* Append() and Detach() permit inserting and deleting an element at
* the end of the sequence, with allocated memory growing and shrinking
* as needed. The At(index) routine returns a (T *) pointing to the
* index'th element in the sequence. Indices are size_t values and
* array elements have indices starting with 0. Through the pointer
* elements may be read or (over)written. These routines provide
* stack-like access as well as random access to the elements stored
* in the array.
*
* The memory allocation management is such that for N elements stored
* in the array, the amount of memory allocated, but not used
* is O(sqrt(N)). This is more efficient than the traditional Tcl
* array growth algorithm that has O(N) memory waste. The longest
* contiguous span of allocated memory is also O(sqrt(N)) so longer
* sequences should be possible without failure due to lack of a
* long enough contiguous span of memory. The main drawback of the
* BrodnikArray is that it is a two-level storage structure, so two
* pointer derefences are required to get an element, when a plain
* array gets the job done in only one. The other potential trouble
* is the need for frequent reallocs as small arrays grow, though that's
* not hard to remedy if it's a problem in practice.
*/
#define TclBrodnikArrayDeclare(T,scope) \
\
typedef struct BrodnikArray_ ## T BA_ ## T; \
typedef struct BrodnikPointer_ ## T BP_ ## T; \
\
struct BrodnikPointer_ ## T { \
T * ptr; \
BA_ ## T * array; \
unsigned int hi; \
unsigned int lo; \
unsigned int dbsize; \
unsigned int count; \
}; \
\
struct BrodnikArray_ ## T { \
unsigned int hi; \
unsigned int lo; \
unsigned int dbsize; \
unsigned int count; \
unsigned int dbused; \
unsigned int dbavail; \
T ** store; \
}; \
\
scope BA_ ## T * BA_ ## T ## _Create(); \
scope void BA_ ## T ## _Destroy(BA_ ## T *a); \
scope size_t BA_ ## T ## _Size(BA_ ## T *a); \
scope void BA_ ## T ## _Copy(T *p, BA_ ## T *a); \
scope T * BA_ ## T ## _Append(BA_ ## T *a); \
scope T * BA_ ## T ## _Detach(BA_ ## T *a); \
scope T * BA_ ## T ## _Get(BA_ ## T *a, size_t index, \
BP_ ## T *p); \
scope T * BA_ ## T ## _At(BA_ ## T *a, size_t index); \
\
scope T * BA_ ## T ## _First(BA_ ## T *a, BP_ ## T *p); \
scope T * BP_ ## T ## _Next(BP_ ## T *p); \
scope T * BP_ ## T ## _Plus(BP_ ## T *p, size_t incr); \
scope T * BP_ ## T ## _Minus(BP_ ## T *p, size_t incr)
#define TclBrodnikArray(T) \
\
TclBrodnikArrayDeclare(T,static); \
TclBrodnikArrayDefine(T,static)
#define TclBrodnikArrayDefine(T,scope) \
scope BA_ ## T * \
BA_ ## T ## _Create() \
{ \
BA_ ## T *newPtr = ckalloc(sizeof(BA_ ## T)); \
\
newPtr->hi = 0; \
newPtr->lo = 0; \
newPtr->dbsize = 1; \
newPtr->count = 0; \
newPtr->dbused = 1; \
newPtr->dbavail = 1; \
newPtr->store = ckalloc(sizeof(T *)); \
newPtr->store[0] = ckalloc(sizeof(T)); \
return newPtr; \
} \
\
scope void \
BA_ ## T ## _Destroy( \
BA_ ## T *a) \
{ \
unsigned int i = a->dbused; \
\
while (i--) { \
ckfree(a->store[i]); \
} \
ckfree(a->store); \
ckfree(a); \
} \
\
scope size_t \
BA_ ## T ## _Size( \
BA_ ## T *a) \
{ \
if (a == NULL) { \
return 0; \
} \
return TclBAInvertIndices(a->hi, a->lo); \
} \
\
scope void \
BA_ ## T ## _Grow( \
BA_ ## T *a) \
{ \
if (a->dbused == a->dbavail) { \
a->dbavail *= 2; \
a->store = ckrealloc(a->store, a->dbavail*sizeof(T *)); \
} \
a->store[a->dbused] = ckalloc(a->dbsize * sizeof(T)); \
a->dbused++; \
} \
\
scope void \
BA_ ## T ## _Shrink( \
BA_ ## T *a) \
{ \
a->dbused--; \
ckfree(a->store[a->dbused]); \
if (a->dbavail / a->dbused >= 4) { \
a->dbavail /= 2; \
a->store = ckrealloc(a->store, a->dbavail*sizeof(T *)); \
} \
} \
\
scope void \
BA_ ## T ## _Copy( \
T *p, \
BA_ ## T *a) \
{ \
unsigned int i = 0, n = 1, m = 0; \
if (a->hi == 0) { \
return; \
} \
while (i < a->hi) { \
memcpy(p, a->store[i++], n * sizeof(T)); \
p += n; \
if (m == 0) { \
m = n; n *= 2; m += n; \
} \
m--; \
} \
if (a->lo) { \
memcpy(p, a->store[a->hi], a->lo * sizeof(T)); \
} \
} \
\
scope T * \
BA_ ## T ## _Append( \
BA_ ## T *a) \
{ \
T *elemPtr; \
if (a->hi == a->dbused) { \
BA_ ## T ## _Grow(a); \
} \
elemPtr = a->store[a->hi] + a->lo; \
a->lo++; \
if (a->lo == a->dbsize) { \
a->lo = 0; \
a->hi++; \
if (a->count == 0) { \
a->count = a->dbsize; \
a->dbsize *= 2; \
a->count += a->dbsize; \
} \
a->count--; \
} \
return elemPtr; \
} \
\
scope T * \
BA_ ## T ## _Detach( \
BA_ ## T *a) \
{ \
T *elemPtr; \
if (a->hi == 0) { \
return NULL; \
} \
if (a->lo) { \
a->lo--; \
} else { \
a->hi--; \
a->count++; \
if (a->count == 3 * (a->dbsize / 2)) { \
a->count = 0; \
a->dbsize /= 2; \
} \
a->lo = a->dbsize - 1; \
} \
elemPtr = a->store[a->hi] + a->lo; \
if (a->lo == 0 && (a->hi != a->dbused - 1)) { \
BA_ ## T ## _Shrink(a); \
} \
return elemPtr; \
} \
\
scope T * \
BA_ ## T ## _Get( \
BA_ ## T *a, \
size_t index, \
BP_ ## T *p) \
{ \
unsigned int hi, lo; \
\
TclBAConvertIndices(index, &hi, &lo); \
if (hi > a->hi || (hi == a->hi && lo >= a->lo)) { \
if (p) {p->ptr = NULL;} \
return NULL; \
} \
if (p) { \
size_t plus2 = hi + 2; \
int n = TclMSB(plus2) - 1; \
p->array = a; \
p->hi = hi; \
p->lo = lo; \
p->dbsize = 1 << (n + ((plus2 >> n) & 1)); \
p->count = 3 * p->dbsize - 3 - hi; \
p->ptr = a->store[hi] + lo; \
} \
return a->store[hi] + lo; \
} \
\
scope T * \
BA_ ## T ## _At( \
BA_ ## T *a, \
size_t index) \
{ \
return BA_ ## T ## _Get(a, index, NULL); \
} \
\
scope T * \
BA_ ## T ## _First( \
BA_ ## T *a, \
BP_ ## T *p) \
{ \
p->array = a; \
p->hi = 0; \
p->lo = 0; \
p->dbsize = 1; \
p->count = 0; \
p->ptr = (a->hi) ? a->store[0] : NULL; \
return p->ptr; \
} \
\
scope T * \
BP_ ## T ## _Next( \
BP_ ## T *p) \
{ \
if (p->ptr) { \
p->lo++; \
if (p->lo < p->dbsize) { \
p->ptr++; \
} else { \
p->lo = 0; \
p->hi++; \
p->ptr = p->array->store[p->hi]; \
if (p->count == 0) { \
p->count = p->dbsize; \
p->dbsize *= 2; \
p->count += p->dbsize; \
} \
p->count--; \
} \
if (p->hi > p->array->hi \
|| (p->hi == p->array->hi && p->lo >= p->array->lo)) { \
p->ptr = NULL; \
} \
} \
return p->ptr; \
} \
\
scope T * \
BP_ ## T ## _Plus( \
BP_ ## T *p, \
size_t incr) \
{ \
if (p->ptr) { \
size_t index = TclBAInvertIndices(p->hi, p->lo); \
index += incr; \
return BA_ ## T ## _Get(p->array, index, p); \
} \
return p->ptr; \
} \
\
scope T * \
BP_ ## T ## _Minus( \
BP_ ## T *p, \
size_t incr) \
{ \
if (p->ptr) { \
size_t index = TclBAInvertIndices(p->hi, p->lo); \
if (index < incr) { \
return p->ptr = NULL; \
} \
index -= incr; \
return BA_ ## T ## _Get(p->array, index, p); \
} \
return p->ptr; \
}
|
Changes to generic/tclCompCmdsGR.c.
| ︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 | * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tclInt.h" #include "tclCompile.h" #include <assert.h> /* * Prototypes for procedures defined later in this file: */ static void CompileReturnInternal(CompileEnv *envPtr, | > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tclInt.h" #include "tclCompile.h" #include "tclBrodnik.h" #include <assert.h> /* * Prototypes for procedures defined later in this file: */ static void CompileReturnInternal(CompileEnv *envPtr, |
| ︙ | ︙ | |||
174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 |
* Side effects:
* Instructions are added to envPtr to execute the "if" command at
* runtime.
*
*----------------------------------------------------------------------
*/
int
TclCompileIfCmd(
Tcl_Interp *interp, /* Used for error reporting. */
Tcl_Parse *parsePtr, /* Points to a parse structure for the command
* created by Tcl_ParseCommand. */
Command *cmdPtr, /* Points to defintion of command being
* compiled. */
CompileEnv *envPtr) /* Holds resulting instructions. */
{
| > > | | > < | | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 |
* Side effects:
* Instructions are added to envPtr to execute the "if" command at
* runtime.
*
*----------------------------------------------------------------------
*/
TclBrodnikArrayDefine(JumpFixup,MODULE_SCOPE);
int
TclCompileIfCmd(
Tcl_Interp *interp, /* Used for error reporting. */
Tcl_Parse *parsePtr, /* Points to a parse structure for the command
* created by Tcl_ParseCommand. */
Command *cmdPtr, /* Points to defintion of command being
* compiled. */
CompileEnv *envPtr) /* Holds resulting instructions. */
{
BA_JumpFixup *jumpFalseFixup;
/* Used to fix the ifFalse jump after each
* test when its target PC is determined. */
BA_JumpFixup *jumpEndFixup;
/* Used to fix the jump after each "then" body
* to the end of the "if" when that PC is
* determined. */
JumpFixup *falseFixupPtr = NULL, *endFixupPtr = NULL;
Tcl_Token *tokenPtr, *testTokenPtr;
int jumpFalseDist, numWords, wordIdx, numBytes, code;
const char *word;
int realCond = 1; /* Set to 0 for static conditions:
* "if 0 {..}" */
int boolVal; /* Value of static condition. */
int compileScripts = 1;
DefineLineInformation; /* TIP #280 */
|
| ︙ | ︙ | |||
216 217 218 219 220 221 222 |
for (wordIdx = 0; wordIdx < numWords; wordIdx++) {
if (tokenPtr->type != TCL_TOKEN_SIMPLE_WORD) {
return TCL_ERROR;
}
tokenPtr = TokenAfter(tokenPtr);
}
| | | | 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 |
for (wordIdx = 0; wordIdx < numWords; wordIdx++) {
if (tokenPtr->type != TCL_TOKEN_SIMPLE_WORD) {
return TCL_ERROR;
}
tokenPtr = TokenAfter(tokenPtr);
}
jumpFalseFixup = BA_JumpFixup_Create();
jumpEndFixup = BA_JumpFixup_Create();
code = TCL_OK;
/*
* Each iteration of this loop compiles one "if expr ?then? body" or
* "elseif expr ?then? body" clause.
*/
|
| ︙ | ︙ | |||
277 278 279 280 281 282 283 |
if (!boolVal) {
compileScripts = 0;
}
} else {
SetLineInformation(wordIdx);
Tcl_ResetResult(interp);
TclCompileExprWords(interp, testTokenPtr, 1, envPtr);
| < < < < | | < | 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 |
if (!boolVal) {
compileScripts = 0;
}
} else {
SetLineInformation(wordIdx);
Tcl_ResetResult(interp);
TclCompileExprWords(interp, testTokenPtr, 1, envPtr);
falseFixupPtr = BA_JumpFixup_Append(jumpFalseFixup);
TclEmitForwardJump(envPtr, TCL_FALSE_JUMP, falseFixupPtr);
}
code = TCL_OK;
}
/*
* Skip over the optional "then" before the then clause.
*/
|
| ︙ | ︙ | |||
320 321 322 323 324 325 326 |
*/
if (compileScripts) {
BODY(tokenPtr, wordIdx);
}
if (realCond) {
| < < < < | < < < < | < | < | | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 |
*/
if (compileScripts) {
BODY(tokenPtr, wordIdx);
}
if (realCond) {
endFixupPtr = BA_JumpFixup_Append(jumpEndFixup);
TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP, endFixupPtr);
/*
* Fix the target of the jumpFalse after the test. Generate a 4
* byte jump if the distance is > 120 bytes. This is conservative,
* and ensures that we won't have to replace this jump if we later
* also need to replace the proceeding jump to the end of the "if"
* with a 4 byte jump.
*/
TclAdjustStackDepth(-1, envPtr);
if (TclFixupForwardJumpToHere(envPtr, falseFixupPtr, 120)) {
/*
* Adjust the code offset for the proceeding jump to the end
* of the "if" command.
*/
endFixupPtr->codeOffset += 3;
}
} else if (boolVal) {
/*
* We were processing an "if 1 {...}"; stop compiling scripts.
*/
compileScripts = 0;
|
| ︙ | ︙ | |||
422 423 424 425 426 427 428 |
}
}
/*
* Fix the unconditional jumps to the end of the "if" command.
*/
| | > | > | < | > > > | | | 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 |
}
}
/*
* Fix the unconditional jumps to the end of the "if" command.
*/
endFixupPtr = BA_JumpFixup_Detach(jumpEndFixup);
falseFixupPtr = BA_JumpFixup_Detach(jumpFalseFixup);
while (endFixupPtr) {
if (TclFixupForwardJumpToHere(envPtr, endFixupPtr, 127)) {
/*
* Adjust the immediately preceeding "ifFalse" jump. We moved it's
* target (just after this jump) down three bytes.
*/
unsigned char *ifFalsePc = envPtr->codeStart
+ falseFixupPtr->codeOffset;
unsigned char opCode = *ifFalsePc;
if (opCode == INST_JUMP_FALSE1) {
jumpFalseDist = TclGetInt1AtPtr(ifFalsePc + 1);
jumpFalseDist += 3;
TclStoreInt1AtPtr(jumpFalseDist, (ifFalsePc + 1));
} else if (opCode == INST_JUMP_FALSE4) {
jumpFalseDist = TclGetInt4AtPtr(ifFalsePc + 1);
jumpFalseDist += 3;
TclStoreInt4AtPtr(jumpFalseDist, (ifFalsePc + 1));
} else {
Tcl_Panic("TclCompileIfCmd: unexpected opcode \"%d\" updating ifFalse jump", (int) opCode);
}
}
endFixupPtr = BA_JumpFixup_Detach(jumpEndFixup);
falseFixupPtr = BA_JumpFixup_Detach(jumpFalseFixup);
}
/*
* Free the jumpFixupArray array if malloc'ed storage was used.
*/
done:
BA_JumpFixup_Destroy(jumpFalseFixup);
BA_JumpFixup_Destroy(jumpEndFixup);
return code;
}
/*
*----------------------------------------------------------------------
*
* TclCompileIncrCmd --
|
| ︙ | ︙ |
Changes to generic/tclCompCmdsSZ.c.
| ︙ | ︙ | |||
1422 1423 1424 1425 1426 1427 1428 |
int flags,
int line,
CompileEnv *envPtr)
{
Tcl_Token *endTokenPtr, *tokenPtr;
int breakOffset = 0, count = 0, bline = line;
Tcl_Parse parse;
| < > | < < < | 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 |
int flags,
int line,
CompileEnv *envPtr)
{
Tcl_Token *endTokenPtr, *tokenPtr;
int breakOffset = 0, count = 0, bline = line;
Tcl_Parse parse;
parse.commandStart = NULL;
TclSubstParse(interp, bytes, numBytes, flags, &parse);
/*
* Tricky point! If the first token does not result in a *guaranteed* push
* of a Tcl_Obj on the stack, we must push an empty object. Otherwise it
* is possible to get to an INST_STR_CONCAT1 or INST_DONE without enough
* values on the stack, resulting in a crash. Thanks to Joe Mistachkin for
* identifying a script that could trigger this case.
|
| ︙ | ︙ | |||
1479 1480 1481 1482 1483 1484 1485 |
* always TCL_TOKEN_TEXT...
*/
if (tokenPtr->numComponents > 1) {
int i, foundCommand = 0;
for (i=2 ; i<=tokenPtr->numComponents ; i++) {
| | | 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 |
* always TCL_TOKEN_TEXT...
*/
if (tokenPtr->numComponents > 1) {
int i, foundCommand = 0;
for (i=2 ; i<=tokenPtr->numComponents ; i++) {
if (tokenPtr[i].type == TCL_TOKEN_SCRIPT_SUBST) {
foundCommand = 1;
break;
}
}
if (foundCommand) {
break;
}
|
| ︙ | ︙ | |||
1526 1527 1528 1529 1530 1531 1532 |
envPtr->line = bline;
catchRange = TclCreateExceptRange(CATCH_EXCEPTION_RANGE, envPtr);
OP4( BEGIN_CATCH4, catchRange);
ExceptionRangeStarts(envPtr, catchRange);
switch (tokenPtr->type) {
| | | > > > | 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 |
envPtr->line = bline;
catchRange = TclCreateExceptRange(CATCH_EXCEPTION_RANGE, envPtr);
OP4( BEGIN_CATCH4, catchRange);
ExceptionRangeStarts(envPtr, catchRange);
switch (tokenPtr->type) {
case TCL_TOKEN_SCRIPT_SUBST:
TclCompileTokens(interp, tokenPtr, tokenPtr->numComponents + 1,
envPtr);
count++;
break;
case TCL_TOKEN_VARIABLE:
TclCompileVarSubst(interp, tokenPtr, envPtr);
count++;
break;
case TCL_TOKEN_ERROR:
TclCompileTokens(interp, tokenPtr, 1, envPtr);
break;
default:
Tcl_Panic("unexpected token type in TclCompileSubstCmd: %d",
tokenPtr->type);
}
ExceptionRangeEnds(envPtr, catchRange);
|
| ︙ | ︙ | |||
1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 |
while (count > 255) {
OP1( STR_CONCAT1, 255);
count -= 254;
}
if (count > 1) {
OP1( STR_CONCAT1, count);
}
Tcl_FreeParse(&parse);
| > > > > > > > > > > > > < < < < < < | 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 |
while (count > 255) {
OP1( STR_CONCAT1, 255);
count -= 254;
}
if (count > 1) {
OP1( STR_CONCAT1, count);
}
if (endTokenPtr[-1].type == TCL_TOKEN_ERROR) {
/*
* Bytecode execution will only reach this point after a
* TCL_RETURN, TCL_CONTINUE, or other exception is raised.
* In those cases, we're at a +1 status in stack depth, so
* we POP before continuing with instructions to raise the
* syntax error message.
*/
OP( POP);
TclCompileTokens(interp, endTokenPtr - 1, 1, envPtr);
}
Tcl_FreeParse(&parse);
/* Final target of the multi-jump from all BREAKs */
if (breakOffset > 0) {
TclUpdateInstInt4AtPc(INST_JUMP4, CurrentOffset(envPtr) - breakOffset,
envPtr->codeStart + breakOffset);
}
}
|
| ︙ | ︙ |
Changes to generic/tclCompExpr.c.
| ︙ | ︙ | |||
475 476 477 478 479 480 481 |
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* a-m */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* n-z */
BRACED /* { */, 0 /* | or || */,
INVALID /* } */, BIT_NOT /* ~ */,
INVALID /* DEL */
};
| < < < < < < < < < < < < < < | 475 476 477 478 479 480 481 482 483 484 485 486 487 488 |
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* a-m */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* n-z */
BRACED /* { */, 0 /* | or || */,
INVALID /* } */, BIT_NOT /* ~ */,
INVALID /* DEL */
};
/*
* Declarations for local functions to this file:
*/
static void CompileExprTree(Tcl_Interp *interp, OpNode *nodes,
int index, Tcl_Obj *const **litObjvPtr,
Tcl_Obj *const *funcObjv, Tcl_Token *tokenPtr,
|
| ︙ | ︙ | |||
876 877 878 879 880 881 882 |
tokenPtr = parsePtr->tokenPtr + wordIndex;
tokenPtr->type = TCL_TOKEN_WORD;
tokenPtr->start = start;
parsePtr->numTokens++;
switch (lexeme) {
case QUOTED:
| | | > > | > > | > | 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 |
tokenPtr = parsePtr->tokenPtr + wordIndex;
tokenPtr->type = TCL_TOKEN_WORD;
tokenPtr->start = start;
parsePtr->numTokens++;
switch (lexeme) {
case QUOTED:
code = parseOnly ? Tcl_ParseQuotedString(NULL, start,
numBytes, parsePtr, 1, &end)
: TclParseQuotedString(NULL, start, numBytes, parsePtr,
PARSE_APPEND | PARSE_USE_INTERNAL_TOKENS, &end);
scanned = end - start;
break;
case BRACED:
code = Tcl_ParseBraces(NULL, start, numBytes,
parsePtr, 1, &end);
scanned = end - start;
break;
case VARIABLE:
code = parseOnly ? Tcl_ParseVarName(NULL, start, numBytes,
parsePtr, 1) : TclParseVarName(NULL, start, numBytes,
parsePtr, PARSE_APPEND | PARSE_USE_INTERNAL_TOKENS);
/*
* Handle the quirk that Tcl_ParseVarName reports a successful
* parse even when it gets only a "$" with no variable name.
*/
tokenPtr = parsePtr->tokenPtr + wordIndex + 1;
if (code == TCL_OK && tokenPtr->type != TCL_TOKEN_VARIABLE) {
TclNewLiteralStringObj(msg, "invalid character \"$\"");
errCode = "BADCHAR";
goto error;
}
scanned = tokenPtr->size;
break;
case SCRIPT:
if (parseOnly) {
Tcl_Parse *nestedPtr =
TclStackAlloc(interp, sizeof(Tcl_Parse));
tokenPtr = parsePtr->tokenPtr + parsePtr->numTokens;
tokenPtr->type = TCL_TOKEN_COMMAND;
tokenPtr->start = start;
tokenPtr->numComponents = 0;
|
| ︙ | ︙ | |||
948 949 950 951 952 953 954 | TclStackFree(interp, nestedPtr); end = start; start = tokenPtr->start; scanned = end - start; tokenPtr->size = scanned; parsePtr->numTokens++; break; | < > > > > | 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 |
TclStackFree(interp, nestedPtr);
end = start;
start = tokenPtr->start;
scanned = end - start;
tokenPtr->size = scanned;
parsePtr->numTokens++;
break;
}
code = TclParseScriptSubst(start, numBytes, parsePtr, 0);
scanned = parsePtr->term + 1 - start;
break;
}
if (code != TCL_OK) {
/*
* Here we handle all the syntax errors generated by the
* Tcl_Token generating parsing routines called in the switch
* just above. If the value of parsePtr->incomplete is 1, then
* the error was an unbalanced '[', '(', '{', or '"' and
|
| ︙ | ︙ | |||
2240 2241 2242 2243 2244 2245 2246 |
Tcl_Token *tokenPtr,
CompileEnv *envPtr,
int optimize)
{
OpNode *nodePtr = nodes + index;
OpNode *rootPtr = nodePtr;
int numWords = 0;
| | > < | 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 |
Tcl_Token *tokenPtr,
CompileEnv *envPtr,
int optimize)
{
OpNode *nodePtr = nodes + index;
OpNode *rootPtr = nodePtr;
int numWords = 0;
JumpFixup *jumpPtr = NULL;
BA_JumpFixup *stack = NULL;
int convert = 1;
while (1) {
int next;
if (nodePtr->mark == MARK_LEFT) {
next = nodePtr->left;
if (nodePtr->lexeme == QUESTION) {
convert = 1;
}
|
| ︙ | ︙ | |||
2284 2285 2286 2287 2288 2289 2290 | */ nodePtr->left = numWords; numWords = 2; /* Command plus one argument */ break; } case QUESTION: | | | > | | < < | | < | | | > | | | 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 |
*/
nodePtr->left = numWords;
numWords = 2; /* Command plus one argument */
break;
}
case QUESTION:
if (stack == NULL) {
stack = BA_JumpFixup_Create();
}
jumpPtr = BA_JumpFixup_Append(stack);
TclEmitForwardJump(envPtr, TCL_FALSE_JUMP, jumpPtr);
break;
case COLON:
jumpPtr = BA_JumpFixup_Append(stack);
TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP, jumpPtr);
TclAdjustStackDepth(-1, envPtr);
if (convert) {
jumpPtr->jumpType = TCL_TRUE_JUMP;
}
convert = 1;
break;
case AND:
case OR:
if (stack == NULL) {
stack = BA_JumpFixup_Create();
}
jumpPtr = BA_JumpFixup_Append(stack);
TclEmitForwardJump(envPtr, (nodePtr->lexeme == AND)
? TCL_FALSE_JUMP : TCL_TRUE_JUMP, jumpPtr);
break;
}
} else {
int pc1, pc2, target;
switch (nodePtr->lexeme) {
case START:
|
| ︙ | ︙ | |||
2351 2352 2353 2354 2355 2356 2357 2358 | /* * Each comma implies another function argument. */ numWords++; break; case COLON: CLANG_ASSERT(jumpPtr); | > | | | | < | < | | < < < < > | < < < > > > | 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 |
/*
* Each comma implies another function argument.
*/
numWords++;
break;
case COLON:
jumpPtr = BA_JumpFixup_Detach(stack);
CLANG_ASSERT(jumpPtr);
if (jumpPtr->jumpType == TCL_TRUE_JUMP) {
jumpPtr->jumpType = TCL_UNCONDITIONAL_JUMP;
convert = 1;
}
target = jumpPtr->codeOffset + 2;
if (TclFixupForwardJumpToHere(envPtr, jumpPtr, 127)) {
target += 3;
}
jumpPtr = BA_JumpFixup_Detach(stack);
TclFixupForwardJump(envPtr, jumpPtr,
target - jumpPtr->codeOffset, 127);
break;
case AND:
case OR:
jumpPtr = BA_JumpFixup_Detach(stack);
CLANG_ASSERT(jumpPtr);
pc1 = CurrentOffset(envPtr);
TclEmitInstInt1((nodePtr->lexeme == AND) ? INST_JUMP_FALSE1
: INST_JUMP_TRUE1, 0, envPtr);
TclEmitPush(TclRegisterNewLiteral(envPtr,
(nodePtr->lexeme == AND) ? "1" : "0", 1), envPtr);
pc2 = CurrentOffset(envPtr);
TclEmitInstInt1(INST_JUMP1, 0, envPtr);
TclAdjustStackDepth(-1, envPtr);
TclStoreInt1AtPtr(CurrentOffset(envPtr) - pc1,
envPtr->codeStart + pc1 + 1);
if (TclFixupForwardJumpToHere(envPtr, jumpPtr, 127)) {
pc2 += 3;
}
TclEmitPush(TclRegisterNewLiteral(envPtr,
(nodePtr->lexeme == AND) ? "0" : "1", 1), envPtr);
TclStoreInt1AtPtr(CurrentOffset(envPtr) - pc2,
envPtr->codeStart + pc2 + 1);
convert = 0;
break;
default:
TclEmitOpcode(instruction[nodePtr->lexeme], envPtr);
convert = 0;
break;
}
if (nodePtr == rootPtr) {
/* We're done */
if (stack) {
BA_JumpFixup_Destroy(stack);
}
return;
}
nodePtr = nodes + nodePtr->p.parent;
continue;
}
nodePtr->mark++;
|
| ︙ | ︙ |
Changes to generic/tclCompile.c.
| ︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tclInt.h" #include "tclCompile.h" #include <assert.h> /* * Table of all AuxData types. */ static Tcl_HashTable auxDataTypeTable; static int auxDataTypeTableInitialized; /* 0 means not yet initialized. */ | > > > > > > > > > > > > > > > > > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 |
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#include "tclInt.h"
#include "tclCompile.h"
#include <assert.h>
#include "tclBrodnik.h"
/*
* Structure used to map between instruction pc and source locations. It
* defines for each compiled Tcl command its code's starting offset and its
* source's starting offset and length. Note that the code offset increases
* monotonically: that is, the table is sorted in code offset order. The
* source offset is not monotonic.
*/
typedef struct CmdLocation {
int codeOffset; /* Offset of first byte of command code. */
int numCodeBytes; /* Number of bytes for command's code. */
int srcOffset; /* Offset of first char of the command. */
int numSrcBytes; /* Number of command source chars. */
} CmdLocation;
TclBrodnikArray(CmdLocation);
TclBrodnikArrayDefine(AuxData,MODULE_SCOPE);
/*
* Table of all AuxData types.
*/
static Tcl_HashTable auxDataTypeTable;
static int auxDataTypeTableInitialized; /* 0 means not yet initialized. */
|
| ︙ | ︙ | |||
666 667 668 669 670 671 672 673 674 675 676 677 678 |
{NULL, 0, 0, 0, {OPERAND_NONE}}
};
/*
* Prototypes for procedures defined later in this file:
*/
static ByteCode * CompileSubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
int flags);
static void DupByteCodeInternalRep(Tcl_Obj *srcPtr,
Tcl_Obj *copyPtr);
static unsigned char * EncodeCmdLocMap(CompileEnv *envPtr,
ByteCode *codePtr, unsigned char *startPtr);
| > > > < < | | | 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 |
{NULL, 0, 0, 0, {OPERAND_NONE}}
};
/*
* Prototypes for procedures defined later in this file:
*/
static void CompileScriptTokens(Tcl_Interp *interp,
Tcl_Token *tokens, Tcl_Token *lastTokenPtr,
CompileEnv *envPtr);
static ByteCode * CompileSubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
int flags);
static void DupByteCodeInternalRep(Tcl_Obj *srcPtr,
Tcl_Obj *copyPtr);
static unsigned char * EncodeCmdLocMap(CompileEnv *envPtr,
ByteCode *codePtr, unsigned char *startPtr);
static CmdLocation * EnterCmdStartData(CompileEnv *envPtr,
int srcOffset, int codeOffset);
static void FreeByteCodeInternalRep(Tcl_Obj *objPtr);
static void FreeSubstCodeInternalRep(Tcl_Obj *objPtr);
static int GetCmdLocEncodingSize(CompileEnv *envPtr);
static int IsCompactibleCompileEnv(Tcl_Interp *interp,
CompileEnv *envPtr);
#ifdef TCL_COMPILE_STATS
static void RecordByteCodeStats(ByteCode *codePtr);
|
| ︙ | ︙ | |||
1006 1007 1008 1009 1010 1011 1012 |
void
TclCleanupByteCode(
register ByteCode *codePtr) /* Points to the ByteCode to free. */
{
Tcl_Interp *interp = (Tcl_Interp *) *codePtr->interpHandle;
Interp *iPtr = (Interp *) interp;
int numLitObjects = codePtr->numLitObjects;
| < | | | 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 |
void
TclCleanupByteCode(
register ByteCode *codePtr) /* Points to the ByteCode to free. */
{
Tcl_Interp *interp = (Tcl_Interp *) *codePtr->interpHandle;
Interp *iPtr = (Interp *) interp;
int numLitObjects = codePtr->numLitObjects;
register Tcl_Obj **objArrayPtr, *objPtr;
AuxData *auxDataPtr;
int i;
#ifdef TCL_COMPILE_STATS
if (interp != NULL) {
ByteCodeStats *statsPtr;
Tcl_Time destroyTime;
int lifetimeSec, lifetimeMicroSec, log2;
statsPtr = &iPtr->stats;
statsPtr->numByteCodesFreed++;
statsPtr->currentSrcBytes -= (double) codePtr->numSrcBytes;
statsPtr->currentByteCodeBytes -= (double) codePtr->structureSize;
statsPtr->currentInstBytes -= (double) codePtr->numCodeBytes;
statsPtr->currentLitBytes -= (double)
codePtr->numLitObjects * sizeof(Tcl_Obj *);
statsPtr->currentExceptBytes -= (double)
codePtr->numExceptRanges * sizeof(ExceptionRange);
statsPtr->currentAuxBytes -= (double)
BA_AuxData_Size(codePtr->auxData) * sizeof(AuxData);
statsPtr->currentCmdMapBytes -= (double) codePtr->numCmdLocBytes;
Tcl_GetTime(&destroyTime);
lifetimeSec = destroyTime.sec - codePtr->createTime.sec;
if (lifetimeSec > 2000) { /* avoid overflow */
lifetimeSec = 2000;
}
|
| ︙ | ︙ | |||
1051 1052 1053 1054 1055 1056 1057 |
statsPtr->lifetimeCount[log2]++;
}
#endif /* TCL_COMPILE_STATS */
/*
* A single heap object holds the ByteCode structure and its code, object,
* command location, and auxiliary data arrays. This means we only need to
| | | 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 |
statsPtr->lifetimeCount[log2]++;
}
#endif /* TCL_COMPILE_STATS */
/*
* A single heap object holds the ByteCode structure and its code, object,
* command location, and auxiliary data arrays. This means we only need to
* 1) decrement the ref counts of the literal values in its literal array,
* 2) call the free procs for the auxiliary data items, 3) free the
* localCache if it is unused, and finally 4) free the ByteCode
* structure's heap object.
*
* The case for TCL_BYTECODE_PRECOMPILED (precompiled ByteCodes, like
* those generated from tbcload) is special, as they doesn't make use of
* the global literal table. They instead maintain private references to
|
| ︙ | ︙ | |||
1087 1088 1089 1090 1091 1092 1093 |
} else {
objArrayPtr = codePtr->objArrayPtr;
while (numLitObjects--) {
/* TclReleaseLiteral calls Tcl_DecrRefCount() for us */
TclReleaseLiteral(interp, *objArrayPtr++);
}
}
| > > | > | > | > > > | | | | > > | 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 |
} else {
objArrayPtr = codePtr->objArrayPtr;
while (numLitObjects--) {
/* TclReleaseLiteral calls Tcl_DecrRefCount() for us */
TclReleaseLiteral(interp, *objArrayPtr++);
}
}
if (codePtr->flags & TCL_BYTECODE_FREE_LITERALS) {
ckfree(codePtr->objArrayPtr);
}
if (codePtr->auxData) {
BA_AuxData *adArray = codePtr->auxData;
codePtr->auxData = NULL;
auxDataPtr = BA_AuxData_Detach(adArray);
while (auxDataPtr) {
if (auxDataPtr->type->freeProc != NULL) {
auxDataPtr->type->freeProc(auxDataPtr->clientData);
}
auxDataPtr = BA_AuxData_Detach(adArray);
}
BA_AuxData_Destroy(adArray);
}
/*
* TIP #280. Release the location data associated with this byte code
* structure, if any. NOTE: The interp we belong to may be gone already,
* and the data with it.
*
|
| ︙ | ︙ | |||
1430 1431 1432 1433 1434 1435 1436 |
envPtr->procPtr = iPtr->compiledProcPtr;
iPtr->compiledProcPtr = NULL;
envPtr->numCommands = 0;
envPtr->exceptDepth = 0;
envPtr->maxExceptDepth = 0;
envPtr->maxStackDepth = 0;
envPtr->currStackDepth = 0;
| | | < < | 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 |
envPtr->procPtr = iPtr->compiledProcPtr;
iPtr->compiledProcPtr = NULL;
envPtr->numCommands = 0;
envPtr->exceptDepth = 0;
envPtr->maxExceptDepth = 0;
envPtr->maxStackDepth = 0;
envPtr->currStackDepth = 0;
Tcl_InitHashTable(&envPtr->litMap, TCL_ONE_WORD_KEYS);
envPtr->codeStart = envPtr->staticCodeSpace;
envPtr->codeNext = envPtr->codeStart;
envPtr->codeEnd = envPtr->codeStart + COMPILEENV_INIT_CODE_BYTES;
envPtr->mallocedCodeArray = 0;
envPtr->literalArrayPtr = envPtr->staticLiteralSpace;
envPtr->literalArrayNext = 0;
envPtr->literalArrayEnd = COMPILEENV_INIT_NUM_OBJECTS;
envPtr->mallocedLiteralArray = 0;
envPtr->exceptArrayPtr = envPtr->staticExceptArraySpace;
envPtr->exceptAuxArrayPtr = envPtr->staticExAuxArraySpace;
envPtr->exceptArrayNext = 0;
envPtr->exceptArrayEnd = COMPILEENV_INIT_EXCEPT_RANGES;
envPtr->mallocedExceptArray = 0;
envPtr->cmdMap = BA_CmdLocation_Create();
envPtr->atCmdStart = 1;
envPtr->expandCount = 0;
/*
* TIP #280: Set up the extended command location information, based on
* the context invoking the byte code compiler. This structure is used to
* keep the per-word line information for all compiled commands.
|
| ︙ | ︙ | |||
1585 1586 1587 1588 1589 1590 1591 |
* Initialize the data about invisible continuation lines as empty, i.e.
* not used. The caller (TclSetByteCodeFromAny) will set this up, if such
* data is available.
*/
envPtr->clNext = NULL;
| < | < < | 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 |
* Initialize the data about invisible continuation lines as empty, i.e.
* not used. The caller (TclSetByteCodeFromAny) will set this up, if such
* data is available.
*/
envPtr->clNext = NULL;
envPtr->auxData = NULL;
}
/*
*----------------------------------------------------------------------
*
* TclFreeCompileEnv --
*
|
| ︙ | ︙ | |||
1617 1618 1619 1620 1621 1622 1623 |
*----------------------------------------------------------------------
*/
void
TclFreeCompileEnv(
register CompileEnv *envPtr)/* Points to the CompileEnv structure. */
{
| < | < < | < | < | > > > > > > | | | | > > | < | < < < < | 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 |
*----------------------------------------------------------------------
*/
void
TclFreeCompileEnv(
register CompileEnv *envPtr)/* Points to the CompileEnv structure. */
{
Tcl_DeleteHashTable(&envPtr->litMap);
if (envPtr->iPtr) {
/*
* We never converted to Bytecode, so free the things we would
* have transferred to it.
*/
int i;
Tcl_Obj **litPtr = envPtr->literalArrayPtr;
for (i = 0; i < envPtr->literalArrayNext; i++) {
TclReleaseLiteral((Tcl_Interp *)envPtr->iPtr, *litPtr++);
}
#ifdef TCL_COMPILE_DEBUG
TclVerifyGlobalLiteralTable(envPtr->iPtr);
#endif /*TCL_COMPILE_DEBUG*/
if (envPtr->auxData) {
BA_AuxData *adArray = envPtr->auxData;
AuxData *auxDataPtr;
envPtr->auxData = NULL;
auxDataPtr = BA_AuxData_Detach(adArray);
while (auxDataPtr) {
if (auxDataPtr->type->freeProc != NULL) {
auxDataPtr->type->freeProc(auxDataPtr->clientData);
}
auxDataPtr = BA_AuxData_Detach(adArray);
}
BA_AuxData_Destroy(adArray);
}
}
if (envPtr->mallocedCodeArray) {
ckfree(envPtr->codeStart);
}
if (envPtr->mallocedLiteralArray && envPtr->iPtr) {
ckfree(envPtr->literalArrayPtr);
}
if (envPtr->mallocedExceptArray) {
ckfree(envPtr->exceptArrayPtr);
ckfree(envPtr->exceptAuxArrayPtr);
}
BA_CmdLocation_Destroy(envPtr->cmdMap);
if (envPtr->extCmdMapPtr) {
ReleaseCmdWordData(envPtr->extCmdMapPtr);
envPtr->extCmdMapPtr = NULL;
}
}
/*
|
| ︙ | ︙ | |||
1799 1800 1801 1802 1803 1804 1805 |
if (cmdPtr) {
TclSetCmdNameObj(interp, TclFetchLiteral(envPtr, cmdLitIdx), cmdPtr);
}
TclEmitPush(cmdLitIdx, envPtr);
}
| | | 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 |
if (cmdPtr) {
TclSetCmdNameObj(interp, TclFetchLiteral(envPtr, cmdLitIdx), cmdPtr);
}
TclEmitPush(cmdLitIdx, envPtr);
}
Tcl_Token *
TclCompileInvocation(
Tcl_Interp *interp,
Tcl_Token *tokenPtr,
Tcl_Obj *cmdObj,
int numWords,
CompileEnv *envPtr)
{
|
| ︙ | ︙ | |||
1841 1842 1843 1844 1845 1846 1847 |
if (wordIdx <= 255) {
TclEmitInvoke(envPtr, INST_INVOKE_STK1, wordIdx);
} else {
TclEmitInvoke(envPtr, INST_INVOKE_STK4, wordIdx);
}
TclCheckStackDepth(depth+1, envPtr);
| | > | > | < > | | 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 |
if (wordIdx <= 255) {
TclEmitInvoke(envPtr, INST_INVOKE_STK1, wordIdx);
} else {
TclEmitInvoke(envPtr, INST_INVOKE_STK4, wordIdx);
}
TclCheckStackDepth(depth+1, envPtr);
return tokenPtr;
}
static Tcl_Token *
CompileExpanded(
Tcl_Interp *interp,
Tcl_Token *tokenPtr,
Tcl_Obj *cmdObj,
int numWords,
CompileEnv *envPtr)
{
int wordIdx = 0;
int depth = TclGetStackDepth(envPtr);
DefineLineInformation;
StartExpanding(envPtr);
if (cmdObj) {
CompileCmdLiteral(interp, cmdObj, envPtr);
wordIdx = 1;
tokenPtr = TokenAfter(tokenPtr);
}
|
| ︙ | ︙ | |||
1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 |
*
* Note that the estimates are not correct while the command is being
* prepared and run, INST_EXPAND_STKTOP is not stack-neutral in general.
*/
TclEmitInvoke(envPtr, INST_INVOKE_EXPANDED, wordIdx);
TclCheckStackDepth(depth+1, envPtr);
}
static int
CompileCmdCompileProc(
Tcl_Interp *interp,
| > > | > > | > > > > | 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 |
*
* Note that the estimates are not correct while the command is being
* prepared and run, INST_EXPAND_STKTOP is not stack-neutral in general.
*/
TclEmitInvoke(envPtr, INST_INVOKE_EXPANDED, wordIdx);
TclCheckStackDepth(depth+1, envPtr);
return tokenPtr;
}
static int
CompileCmdCompileProc(
Tcl_Interp *interp,
Tcl_Token *tokenPtr,
Command *cmdPtr,
CompileEnv *envPtr)
{
int unwind = 0, incrOffset = -1;
Tcl_Parse parse;
int depth = TclGetStackDepth(envPtr);
DefineLineInformation;
parse.commandStart = tokenPtr->start;
parse.commandSize = tokenPtr->size;
parse.numWords = tokenPtr->numComponents;
parse.tokenPtr = tokenPtr + 1;
/*
* Emit of the INST_START_CMD instruction is controlled by the value of
* envPtr->atCmdStart:
*
* atCmdStart == 2 : We are not using the INST_START_CMD instruction.
* atCmdStart == 1 : INST_START_CMD was the last instruction emitted.
|
| ︙ | ︙ | |||
1944 1945 1946 1947 1948 1949 1950 |
}
break;
case 2:
/* Nothing to do */
;
}
| | | 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 |
}
break;
case 2:
/* Nothing to do */
;
}
if (TCL_OK == TclAttemptCompileProc(interp, &parse, 1, cmdPtr, envPtr)) {
if (incrOffset >= 0) {
/*
* We successfully compiled a command. Increment the number of
* commands that start at the currently active INST_START_CMD.
*/
unsigned char *incrPtr = envPtr->codeStart + incrOffset;
|
| ︙ | ︙ | |||
1981 1982 1983 1984 1985 1986 1987 |
}
/*
* Reset the index of next command. Toss out any from failed nested
* partial compiles.
*/
| | > > > > > > > > > > > | | | > > | > > > > > < | > | | | < | < | | | | | | | > > > > < | | > > > | > > | > | > > > > > > | > > > > | > > | > > > > > > > > > > > > > > > | > > > | > | < > | < < > | < | > > > | | > | | | < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | > | | | < | | | > > | | 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 |
}
/*
* Reset the index of next command. Toss out any from failed nested
* partial compiles.
*/
TclDisposeFailedCompile(envPtr, mapPtr->nuloc);
return TCL_ERROR;
}
void
TclDisposeFailedCompile(
CompileEnv *envPtr,
int numCommands)
{
while (envPtr->numCommands > numCommands) {
(void) BA_CmdLocation_Detach(envPtr->cmdMap);
envPtr->numCommands--;
}
}
static Tcl_Token *
CompileCommandTokens(
Tcl_Interp *interp,
Tcl_Token *commandTokenPtr,
CompileEnv *envPtr,
CmdLocation **cmdLocPtrPtr)
{
Interp *iPtr = (Interp *) interp;
Tcl_Token *tokenPtr = commandTokenPtr;
int numWords = tokenPtr->numComponents;
const char *commandStart = tokenPtr->start;
int commandSize = tokenPtr->size;
ExtCmdLoc *eclPtr = envPtr->extCmdMapPtr;
Tcl_Obj *cmdObj = Tcl_NewObj();
Command *cmdPtr = NULL;
CmdLocation *cmdLocPtr = NULL;
int code = TCL_ERROR;
int cmdKnown, expand = -1;
int *wlines, wlineat;
int cmdLine = envPtr->line;
int *clNext = envPtr->clNext;
int startCodeOffset = envPtr->codeNext - envPtr->codeStart;
int depth = TclGetStackDepth(envPtr);
assert (numWords > 0);
/* Pre-Compile */
tokenPtr++;
envPtr->numCommands++;
cmdLocPtr = EnterCmdStartData(envPtr, commandStart - envPtr->source,
startCodeOffset);
/*
* TIP #280. Scan the words and compute the extended location information.
* The map first contain full per-word line information for use by the
* compiler. This is later replaced by a reduced form which signals
* non-literal words, stored in 'wlines'.
*/
EnterCmdWordData(eclPtr, commandStart - envPtr->source,
tokenPtr, commandStart, commandSize, numWords, cmdLine,
clNext, &wlines, envPtr);
wlineat = eclPtr->nuloc - 1;
envPtr->line = eclPtr->loc[wlineat].line[0];
envPtr->clNext = eclPtr->loc[wlineat].next[0];
/* Do we know the command word? */
Tcl_IncrRefCount(cmdObj);
cmdKnown = TclWordKnownAtCompileTime(tokenPtr, cmdObj);
/* Is this a command we should (try to) compile with a compileProc ? */
if (cmdKnown && !(iPtr->flags & DONT_COMPILE_CMDS_INLINE)) {
cmdPtr = (Command *) Tcl_GetCommandFromObj(interp, cmdObj);
if (cmdPtr) {
/*
* Found a command. Test the ways we can be told not to attempt
* to compile it.
*/
if ((cmdPtr->compileProc == NULL)
|| (cmdPtr->nsPtr->flags & NS_SUPPRESS_COMPILATION)
|| (cmdPtr->flags & CMD_HAS_EXEC_TRACES)) {
cmdPtr = NULL;
}
}
if (cmdPtr && !(cmdPtr->flags & CMD_COMPILES_EXPANDED)) {
expand = ExpandRequested(tokenPtr, numWords);
if (expand) {
/* We need to expand, but compileProc cannot. */
cmdPtr = NULL;
}
}
}
/* If cmdPtr != NULL, we will try to call cmdPtr->compileProc */
if (cmdPtr) {
code = CompileCmdCompileProc(interp, commandTokenPtr, cmdPtr, envPtr);
}
if (code == TCL_ERROR) {
if (expand < 0) {
expand = ExpandRequested(tokenPtr, numWords);
}
if (expand) {
tokenPtr = CompileExpanded(interp, tokenPtr,
cmdKnown ? cmdObj : NULL, numWords, envPtr);
} else {
tokenPtr = TclCompileInvocation(interp, tokenPtr,
cmdKnown ? cmdObj : NULL, numWords, envPtr);
}
} else {
while (numWords--) {
tokenPtr = TokenAfter(tokenPtr);
}
}
Tcl_DecrRefCount(cmdObj);
TclEmitOpcode(INST_POP, envPtr);
cmdLocPtr->numSrcBytes = commandSize;
cmdLocPtr->numCodeBytes = (envPtr->codeNext-envPtr->codeStart)
- startCodeOffset;
/*
* TIP #280: Free full form of per-word line data and insert the reduced
* form now
*/
envPtr->line = cmdLine;
envPtr->clNext = clNext;
ckfree(eclPtr->loc[wlineat].line);
ckfree(eclPtr->loc[wlineat].next);
eclPtr->loc[wlineat].line = wlines;
eclPtr->loc[wlineat].next = NULL;
*cmdLocPtrPtr = cmdLocPtr;
TclCheckStackDepth(depth, envPtr);
return tokenPtr;
}
void
TclCompileScript(
Tcl_Interp *interp, /* Used for error and status reporting. Also
* serves as context for finding and compiling
* commands. May not be NULL. */
const char *script, /* The source script to compile. */
int numBytes, /* Number of bytes in script. If < 0, the
* script consists of all bytes up to the
* first null character. */
CompileEnv *envPtr) /* Holds resulting instructions. */
{
Tcl_Token *lastTokenPtr;
Tcl_Token *tokens;
if (envPtr->iPtr == NULL) {
Tcl_Panic("TclCompileScript() called on uninitialized CompileEnv");
}
tokens = TclParseScript(interp, script, numBytes, /* flags */ 0,
&lastTokenPtr, NULL);
CompileScriptTokens(interp, tokens, lastTokenPtr, envPtr);
ckfree(tokens);
}
static void
CompileScriptTokens(interp, tokens, lastTokenPtr, envPtr)
Tcl_Interp *interp; /* Used for error and status reporting.
* Also serves as context for finding and
* compiling commands. May not be NULL. */
Tcl_Token *tokens;
Tcl_Token *lastTokenPtr;
CompileEnv *envPtr; /* Holds resulting instructions. */
{
Tcl_Token *tokenPtr;
int numCommands = tokens[0].numComponents;
int depth = TclGetStackDepth(envPtr);
CmdLocation *cmdLocPtr = NULL; /* Pointer into envPtr->cmdMap for
* the last command this routine
* compiles into bytecode; If we
* exit still value NULL, there
* was no bytecode generated. */
if (lastTokenPtr < tokens) {
Tcl_Panic("CompileScriptTokens: parse produced no tokens");
}
if (tokens[0].type != TCL_TOKEN_SCRIPT) {
Tcl_Panic("CompileScriptTokens: invalid token array, expected script");
}
if (envPtr->iPtr == NULL) {
Tcl_Panic("TclCompileScript() called on uninitialized CompileEnv");
}
tokenPtr = &(tokens[1]);
if (numCommands) {
TclAdvanceLines(&envPtr->line, tokens[0].start, tokenPtr->start);
TclAdvanceContinuations(&envPtr->line, &envPtr->clNext,
tokenPtr->start - envPtr->source);
}
while (numCommands--) {
int numWords = tokenPtr->numComponents;
const char * commandStart = tokenPtr->start;
if (tokenPtr > lastTokenPtr) {
Tcl_Panic("CompileScriptTokens: overran token array");
}
if (tokenPtr->type != TCL_TOKEN_CMD) {
Tcl_Panic("CompileScriptTokens: invalid token array, expected cmd: %d: %.*s", tokenPtr->type, tokenPtr->size, tokenPtr->start);
}
/* TODO: comment here justifying. */
if (numWords == 0) {
tokenPtr++;
continue;
}
#ifdef TCL_COMPILE_DEBUG
/*
* If tracing, print a line for each top level command compiled.
*/
if ((tclTraceCompile >= 1) && (envPtr->procPtr == NULL)) {
fprintf(stdout, " Compiling: ");
TclPrintSource(stdout, commandStart, TclMin(tokenPtr->size, 55));
fprintf(stdout, "\n");
}
#endif
tokenPtr = CompileCommandTokens(interp, tokenPtr, envPtr, &cmdLocPtr);
/*
* TIP #280: Track lines in the just compiled command.
*/
if (numCommands) {
TclAdvanceLines(&envPtr->line, commandStart, tokenPtr->start);
TclAdvanceContinuations(&envPtr->line, &envPtr->clNext,
tokenPtr->start - envPtr->source);
}
}
if (tokenPtr <= lastTokenPtr) {
TclCompileTokens(interp, tokenPtr, lastTokenPtr-tokenPtr+1, envPtr);
} else if (cmdLocPtr == NULL) {
/*
* Compiling the script yielded no bytecode. The script must be all
* whitespace, comments, and empty commands. Such scripts are defined
* to successfully produce the empty string result, so we emit the
* simple bytecode that makes that happen.
*/
PushStringLiteral(envPtr, "");
} else {
/*
* We compiled at least one command to bytecode. The routine
* CompileCommandTokens() follows the bytecode of each compiled
* command with an INST_POP, so that stack balance is maintained when
* several commands are in sequence. (The result of each command is
* thrown away before moving on to the next command). For the last
* command compiled, we need to undo that INST_POP so that the result
* of the last command becomes the result of the script. The code
* here removes that trailing INST_POP.
*/
cmdLocPtr->numCodeBytes--;
envPtr->codeNext--;
envPtr->currStackDepth++;
}
TclCheckStackDepth(depth+1, envPtr);
}
/*
|
| ︙ | ︙ | |||
2419 2420 2421 2422 2423 2424 2425 | clPosition[numCL] = clPos; numCL ++; } adjust++; } break; | < < < < < < < < < < < < < < < < < < < < < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 |
clPosition[numCL] = clPos;
numCL ++;
}
adjust++;
}
break;
case TCL_TOKEN_VARIABLE:
/*
* Push any accumulated chars appearing before the $<var>.
*/
if (Tcl_DStringLength(&textBuffer) > 0) {
int literal;
literal = TclRegisterDStringLiteral(envPtr, &textBuffer);
TclEmitPush(literal, envPtr);
numObjsToConcat++;
Tcl_DStringFree(&textBuffer);
}
TclCompileVarSubst(interp, tokenPtr, envPtr);
numObjsToConcat++;
count -= tokenPtr->numComponents;
tokenPtr += tokenPtr->numComponents;
break;
case TCL_TOKEN_SCRIPT_SUBST:
/*
* Push any accumulated chars appearing before the command.
*/
if (Tcl_DStringLength(&textBuffer) > 0) {
int literal = TclRegisterDStringLiteral(envPtr, &textBuffer);
TclEmitPush(literal, envPtr);
numObjsToConcat++;
Tcl_DStringFree(&textBuffer);
}
if (count <= tokenPtr->numComponents) {
Tcl_Panic("token components overflow token array");
}
envPtr->line += adjust;
CompileScriptTokens(interp, tokenPtr+1,
tokenPtr + (tokenPtr->numComponents), envPtr);
envPtr->line -= adjust;
numObjsToConcat++;
count -= tokenPtr->numComponents;
tokenPtr += tokenPtr->numComponents;
break;
case TCL_TOKEN_ERROR:
/* Compile bytecodes to report the parse error at runtime. */
TclSubstTokens(interp, tokenPtr, 1, NULL, 1, NULL, NULL, 0);
Tcl_LogCommandInfo(interp, envPtr->source,
tokenPtr->start, tokenPtr->size);
TclCompileSyntaxError(interp, envPtr);
goto done;
default:
Tcl_Panic("Unexpected token type in TclCompileTokens: %d; %.*s",
tokenPtr->type, tokenPtr->size, tokenPtr->start);
}
}
|
| ︙ | ︙ | |||
2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 |
/*
* If the tokens yielded no instructions, push an empty string.
*/
if (envPtr->codeNext == entryCodeNext) {
PushStringLiteral(envPtr, "");
}
Tcl_DStringFree(&textBuffer);
/*
* Release the temp table we used to collect the locations of continuation
* lines, if any.
*/
| > | 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 |
/*
* If the tokens yielded no instructions, push an empty string.
*/
if (envPtr->codeNext == entryCodeNext) {
PushStringLiteral(envPtr, "");
}
done:
Tcl_DStringFree(&textBuffer);
/*
* Release the temp table we used to collect the locations of continuation
* lines, if any.
*/
|
| ︙ | ︙ | |||
2715 2716 2717 2718 2719 2720 2721 |
* and whose string rep contains the source
* code. */
register CompileEnv *envPtr)/* Points to the CompileEnv structure from
* which to create a ByteCode structure. */
{
register ByteCode *codePtr;
size_t codeBytes, objArrayBytes, exceptArrayBytes, cmdLocBytes;
| | | > > | < < | 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 |
* and whose string rep contains the source
* code. */
register CompileEnv *envPtr)/* Points to the CompileEnv structure from
* which to create a ByteCode structure. */
{
register ByteCode *codePtr;
size_t codeBytes, objArrayBytes, exceptArrayBytes, cmdLocBytes;
size_t structureSize;
register unsigned char *p;
#ifdef TCL_COMPILE_DEBUG
unsigned char *nextPtr;
#endif
int numLitObjects = envPtr->literalArrayNext;
Namespace *namespacePtr;
int isNew;
Interp *iPtr;
Tcl_HashEntry *hePtr = NULL;
if (envPtr->iPtr == NULL) {
Tcl_Panic("TclInitByteCodeObj() called on uninitialized CompileEnv");
}
iPtr = envPtr->iPtr;
codeBytes = envPtr->codeNext - envPtr->codeStart;
objArrayBytes = envPtr->mallocedLiteralArray ? 0 :
envPtr->literalArrayNext * sizeof(Tcl_Obj *);
exceptArrayBytes = envPtr->exceptArrayNext * sizeof(ExceptionRange);
cmdLocBytes = GetCmdLocEncodingSize(envPtr);
/*
* Compute the total number of bytes needed for this bytecode.
*/
structureSize = sizeof(ByteCode);
structureSize += TCL_ALIGN(codeBytes); /* align object array */
structureSize += TCL_ALIGN(objArrayBytes); /* align exc range arr */
structureSize += TCL_ALIGN(exceptArrayBytes); /* align AuxData array */
structureSize += cmdLocBytes;
if (envPtr->iPtr->varFramePtr != NULL) {
namespacePtr = envPtr->iPtr->varFramePtr->nsPtr;
} else {
namespacePtr = envPtr->iPtr->globalNsPtr;
}
|
| ︙ | ︙ | |||
2774 2775 2776 2777 2778 2779 2780 |
codePtr->procPtr = envPtr->procPtr;
codePtr->numCommands = envPtr->numCommands;
codePtr->numSrcBytes = envPtr->numSrcBytes;
codePtr->numCodeBytes = codeBytes;
codePtr->numLitObjects = numLitObjects;
codePtr->numExceptRanges = envPtr->exceptArrayNext;
| < < < < < > | | | | | | | | | | | | > | | | | | > > > > > | | > > | | < < | | | < < | | < < | 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 |
codePtr->procPtr = envPtr->procPtr;
codePtr->numCommands = envPtr->numCommands;
codePtr->numSrcBytes = envPtr->numSrcBytes;
codePtr->numCodeBytes = codeBytes;
codePtr->numLitObjects = numLitObjects;
codePtr->numExceptRanges = envPtr->exceptArrayNext;
codePtr->numCmdLocBytes = cmdLocBytes;
codePtr->maxExceptDepth = envPtr->maxExceptDepth;
codePtr->maxStackDepth = envPtr->maxStackDepth;
p += sizeof(ByteCode);
codePtr->codeStart = p;
memcpy(p, envPtr->codeStart, (size_t) codeBytes);
p += TCL_ALIGN(codeBytes); /* align object array */
hePtr = Tcl_FindHashEntry(&envPtr->litMap, objPtr);
if (hePtr) {
/*
* Prevent circular reference where the bytecode intrep of
* a value contains a literal which is that same value.
* If this is allowed to happen, refcount decrements may not
* reach zero, and memory may leak. Bugs 467523, 3357771
*
* NOTE: [Bugs 3392070, 3389764] We make a copy based completely
* on the string value, and do not call Tcl_DuplicateObj() so we
* can be sure we do not have any lingering cycles hiding in
* the intrep.
*/
int numBytes, i = PTR2INT(Tcl_GetHashValue(hePtr));
const char *bytes = Tcl_GetStringFromObj(objPtr, &numBytes);
envPtr->literalArrayPtr[i] = Tcl_NewStringObj(bytes, numBytes);
Tcl_IncrRefCount(envPtr->literalArrayPtr[i]);
TclReleaseLiteral((Tcl_Interp *)iPtr, objPtr);
}
if (envPtr->mallocedLiteralArray) {
codePtr->objArrayPtr = envPtr->literalArrayPtr;
codePtr->flags |= TCL_BYTECODE_FREE_LITERALS;
} else {
codePtr->objArrayPtr = (Tcl_Obj **) p;
memcpy(p, envPtr->literalArrayPtr, (size_t) objArrayBytes);
p += TCL_ALIGN(objArrayBytes); /* align exception range array */
}
if (exceptArrayBytes > 0) {
codePtr->exceptArrayPtr = (ExceptionRange *) p;
memcpy(p, envPtr->exceptArrayPtr, (size_t) exceptArrayBytes);
} else {
codePtr->exceptArrayPtr = NULL;
}
p += exceptArrayBytes;
codePtr->auxData = envPtr->auxData;
envPtr->auxData = NULL;
#ifndef TCL_COMPILE_DEBUG
EncodeCmdLocMap(envPtr, codePtr, (unsigned char *) p);
#else
nextPtr = EncodeCmdLocMap(envPtr, codePtr, (unsigned char *) p);
if (((size_t)(nextPtr - p)) != cmdLocBytes) {
Tcl_Panic("TclInitByteCodeObj: encoded cmd location bytes %lu != expected size %lu", (unsigned long)(nextPtr - p), (unsigned long)cmdLocBytes);
}
|
| ︙ | ︙ | |||
3073 3074 3075 3076 3077 3078 3079 | * Inserts source and code location information into the compilation * environment envPtr for the command at index cmdIndex. The compilation * environment's CmdLocation array is grown if necessary. * *---------------------------------------------------------------------- */ | | < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < | 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 |
* Inserts source and code location information into the compilation
* environment envPtr for the command at index cmdIndex. The compilation
* environment's CmdLocation array is grown if necessary.
*
*----------------------------------------------------------------------
*/
static CmdLocation *
EnterCmdStartData(
CompileEnv *envPtr, /* Points to the compilation environment
* structure in which to enter command
* location information. */
int srcOffset, /* Offset of first char of the command. */
int codeOffset) /* Offset of first byte of command code. */
{
CmdLocation *cmdLocPtr = BA_CmdLocation_Append(envPtr->cmdMap);
cmdLocPtr->codeOffset = codeOffset;
cmdLocPtr->srcOffset = srcOffset;
cmdLocPtr->numSrcBytes = -1;
cmdLocPtr->numCodeBytes = -1;
return cmdLocPtr;
}
/*
*----------------------------------------------------------------------
* TIP #280
*
* EnterCmdWordData --
|
| ︙ | ︙ | |||
3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 |
auxPtr->numContinueTargets = 0;
}
}
/*
*----------------------------------------------------------------------
*
* TclCreateAuxData --
*
* Procedure that allocates and initializes a new AuxData structure in a
* CompileEnv's array of compilation auxiliary data records. These
* AuxData records hold information created during compilation by
* CompileProcs and used by instructions during execution.
*
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 |
auxPtr->numContinueTargets = 0;
}
}
/*
*----------------------------------------------------------------------
*
* TclFetchAuxData --
*
* Fetch back from the CompileEnv an item of AuxData stored at
* index.
*
* Results:
* The ClientData previously stored by TclCreatAuxData().
*
* Side effects:
* None.
*
*----------------------------------------------------------------------
*/
ClientData
TclFetchAuxData(
CompileEnv *envPtr, /* CompileEnv from which to fetch */
int index) /* Index of AuxData to fetch */
{
if (envPtr->auxData == NULL) {
return NULL;
}
return BA_AuxData_At(envPtr->auxData, index)->clientData;
}
/*
*----------------------------------------------------------------------
*
* TclCreateAuxData --
*
* Procedure that allocates and initializes a new AuxData structure in a
* CompileEnv's array of compilation auxiliary data records. These
* AuxData records hold information created during compilation by
* CompileProcs and used by instructions during execution.
*
|
| ︙ | ︙ | |||
3653 3654 3655 3656 3657 3658 3659 |
ClientData clientData, /* The compilation auxiliary data to store in
* the new aux data record. */
const AuxDataType *typePtr, /* Pointer to the type to attach to this
* AuxData */
register CompileEnv *envPtr)/* Points to the CompileEnv for which a new
* aux data structure is to be allocated. */
{
| < < | | < < < < < < < < < < < < | < < < < < < | < < < < < < < | < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 |
ClientData clientData, /* The compilation auxiliary data to store in
* the new aux data record. */
const AuxDataType *typePtr, /* Pointer to the type to attach to this
* AuxData */
register CompileEnv *envPtr)/* Points to the CompileEnv for which a new
* aux data structure is to be allocated. */
{
AuxData *auxDataPtr; /* Points to the new AuxData structure */
if (envPtr->auxData == NULL) {
envPtr->auxData = BA_AuxData_Create();
}
auxDataPtr = BA_AuxData_Append(envPtr->auxData);
auxDataPtr->clientData = clientData;
auxDataPtr->type = typePtr;
return (int) (BA_AuxData_Size(envPtr->auxData) - 1);
}
/*
*----------------------------------------------------------------------
*
* TclEmitForwardJump --
*
|
| ︙ | ︙ | |||
3898 3899 3900 3901 3902 3903 3904 |
JumpFixup *jumpFixupPtr, /* Points to the JumpFixup structure that
* describes the forward jump. */
int jumpDist, /* Jump distance to set in jump instr. */
int distThreshold) /* Maximum distance before the two byte jump
* is grown to five bytes. */
{
unsigned char *jumpPc, *p;
| | > > | 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 |
JumpFixup *jumpFixupPtr, /* Points to the JumpFixup structure that
* describes the forward jump. */
int jumpDist, /* Jump distance to set in jump instr. */
int distThreshold) /* Maximum distance before the two byte jump
* is grown to five bytes. */
{
unsigned char *jumpPc, *p;
int firstRange, lastRange, k;
unsigned numBytes;
CmdLocation *cmdLocPtr = NULL;
BP_CmdLocation ptr;
if (jumpDist <= distThreshold) {
jumpPc = envPtr->codeStart + jumpFixupPtr->codeOffset;
switch (jumpFixupPtr->jumpType) {
case TCL_UNCONDITIONAL_JUMP:
TclUpdateInstInt1AtPc(INST_JUMP1, jumpDist, jumpPc);
break;
|
| ︙ | ︙ | |||
3951 3952 3953 3954 3955 3956 3957 |
}
/*
* Adjust the code offsets for any commands and any ExceptionRange records
* between the jump and the current code address.
*/
| > | < | < | < | 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 |
}
/*
* Adjust the code offsets for any commands and any ExceptionRange records
* between the jump and the current code address.
*/
for (cmdLocPtr = BA_CmdLocation_Get(envPtr->cmdMap,
jumpFixupPtr->cmdIndex, &ptr); cmdLocPtr;
cmdLocPtr = BP_CmdLocation_Next(&ptr)) {
cmdLocPtr->codeOffset += 3;
}
firstRange = jumpFixupPtr->exceptIndex;
lastRange = envPtr->exceptArrayNext - 1;
for (k = firstRange; k <= lastRange; k++) {
ExceptionRange *rangePtr = &envPtr->exceptArrayPtr[k];
|
| ︙ | ︙ | |||
4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 |
}
Tcl_MutexUnlock(&tableMutex);
}
/*
*----------------------------------------------------------------------
*
* GetCmdLocEncodingSize --
*
* Computes the total number of bytes needed to encode the command
* location information for some compiled code.
*
* Results:
* The byte count needed to encode the compiled location information.
*
* Side effects:
* None.
*
*----------------------------------------------------------------------
*/
static int
GetCmdLocEncodingSize(
CompileEnv *envPtr) /* Points to compilation environment structure
* containing the CmdLocation structure to
* encode. */
{
| > > > > > > > > > > > > > > > > > > > > > > > > < < | > > > | > | | | | | | | 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 |
}
Tcl_MutexUnlock(&tableMutex);
}
/*
*----------------------------------------------------------------------
*
* TclCmdStartAddress --
*
* Results:
* None.
*
* Side effects:
* Deletes all entries in the hash table of AuxData types.
*
*----------------------------------------------------------------------
*/
void *
TclCmdStartAddress(
CompileEnv *envPtr,
int i)
{
BA_CmdLocation *map = envPtr->cmdMap;
return envPtr->codeStart + BA_CmdLocation_At(map, i)->codeOffset;
}
/*
*----------------------------------------------------------------------
*
* GetCmdLocEncodingSize --
*
* Computes the total number of bytes needed to encode the command
* location information for some compiled code.
*
* Results:
* The byte count needed to encode the compiled location information.
*
* Side effects:
* None.
*
*----------------------------------------------------------------------
*/
static int
GetCmdLocEncodingSize(
CompileEnv *envPtr) /* Points to compilation environment structure
* containing the CmdLocation structure to
* encode. */
{
int codeDelta, codeLen, srcDelta, srcLen;
int codeDeltaNext, codeLengthNext, srcDeltaNext, srcLengthNext;
/* The offsets in their respective byte
* sequences where the next encoded offset or
* length should go. */
int prevCodeOffset, prevSrcOffset;
BA_CmdLocation *map = envPtr->cmdMap;
CmdLocation *cmdLocPtr;
BP_CmdLocation ptr;
codeDeltaNext = codeLengthNext = srcDeltaNext = srcLengthNext = 0;
prevCodeOffset = prevSrcOffset = 0;
for (cmdLocPtr = BA_CmdLocation_First(map, &ptr); cmdLocPtr;
cmdLocPtr = BP_CmdLocation_Next(&ptr)) {
codeDelta = cmdLocPtr->codeOffset - prevCodeOffset;
if (codeDelta < 0) {
Tcl_Panic("GetCmdLocEncodingSize: bad code offset");
} else if (codeDelta <= 127) {
codeDeltaNext++;
} else {
codeDeltaNext += 5; /* 1 byte for 0xFF, 4 for positive delta */
}
prevCodeOffset = cmdLocPtr->codeOffset;
codeLen = cmdLocPtr->numCodeBytes;
if (codeLen < 0) {
Tcl_Panic("GetCmdLocEncodingSize: bad code length");
} else if (codeLen <= 127) {
codeLengthNext++;
} else {
codeLengthNext += 5;/* 1 byte for 0xFF, 4 for length */
}
srcDelta = cmdLocPtr->srcOffset - prevSrcOffset;
if ((-127 <= srcDelta) && (srcDelta <= 127) && (srcDelta != -1)) {
srcDeltaNext++;
} else {
srcDeltaNext += 5; /* 1 byte for 0xFF, 4 for delta */
}
prevSrcOffset = cmdLocPtr->srcOffset;
srcLen = cmdLocPtr->numSrcBytes;
if (srcLen < 0) {
Tcl_Panic("GetCmdLocEncodingSize: bad source length");
} else if (srcLen <= 127) {
srcLengthNext++;
} else {
srcLengthNext += 5; /* 1 byte for 0xFF, 4 for length */
}
|
| ︙ | ︙ | |||
4483 4484 4485 4486 4487 4488 4489 |
* encode. */
ByteCode *codePtr, /* ByteCode in which to encode envPtr's
* command location information. */
unsigned char *startPtr) /* Points to the first byte in codePtr's
* memory block where the location information
* is to be stored. */
{
| < < > > | | > | | | > | | > | | | > | | 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 |
* encode. */
ByteCode *codePtr, /* ByteCode in which to encode envPtr's
* command location information. */
unsigned char *startPtr) /* Points to the first byte in codePtr's
* memory block where the location information
* is to be stored. */
{
register unsigned char *p = startPtr;
int codeDelta, codeLen, srcDelta, srcLen, prevOffset;
BA_CmdLocation *map = envPtr->cmdMap;
BP_CmdLocation ptr;
CmdLocation *cmdLocPtr;
/*
* Encode the code offset for each command as a sequence of deltas.
*/
codePtr->codeDeltaStart = p;
prevOffset = 0;
for (cmdLocPtr = BA_CmdLocation_First(map, &ptr); cmdLocPtr;
cmdLocPtr = BP_CmdLocation_Next(&ptr)) {
codeDelta = cmdLocPtr->codeOffset - prevOffset;
if (codeDelta < 0) {
Tcl_Panic("EncodeCmdLocMap: bad code offset");
} else if (codeDelta <= 127) {
TclStoreInt1AtPtr(codeDelta, p);
p++;
} else {
TclStoreInt1AtPtr(0xFF, p);
p++;
TclStoreInt4AtPtr(codeDelta, p);
p += 4;
}
prevOffset = cmdLocPtr->codeOffset;
}
/*
* Encode the code length for each command.
*/
codePtr->codeLengthStart = p;
for (cmdLocPtr = BA_CmdLocation_First(map, &ptr); cmdLocPtr;
cmdLocPtr = BP_CmdLocation_Next(&ptr)) {
codeLen = cmdLocPtr->numCodeBytes;
if (codeLen < 0) {
Tcl_Panic("EncodeCmdLocMap: bad code length");
} else if (codeLen <= 127) {
TclStoreInt1AtPtr(codeLen, p);
p++;
} else {
TclStoreInt1AtPtr(0xFF, p);
p++;
TclStoreInt4AtPtr(codeLen, p);
p += 4;
}
}
/*
* Encode the source offset for each command as a sequence of deltas.
*/
codePtr->srcDeltaStart = p;
prevOffset = 0;
for (cmdLocPtr = BA_CmdLocation_First(map, &ptr); cmdLocPtr;
cmdLocPtr = BP_CmdLocation_Next(&ptr)) {
srcDelta = cmdLocPtr->srcOffset - prevOffset;
if ((-127 <= srcDelta) && (srcDelta <= 127) && (srcDelta != -1)) {
TclStoreInt1AtPtr(srcDelta, p);
p++;
} else {
TclStoreInt1AtPtr(0xFF, p);
p++;
TclStoreInt4AtPtr(srcDelta, p);
p += 4;
}
prevOffset = cmdLocPtr->srcOffset;
}
/*
* Encode the source length for each command.
*/
codePtr->srcLengthStart = p;
for (cmdLocPtr = BA_CmdLocation_First(map, &ptr); cmdLocPtr;
cmdLocPtr = BP_CmdLocation_Next(&ptr)) {
srcLen = cmdLocPtr->numSrcBytes;
if (srcLen < 0) {
Tcl_Panic("EncodeCmdLocMap: bad source length");
} else if (srcLen <= 127) {
TclStoreInt1AtPtr(srcLen, p);
p++;
} else {
TclStoreInt1AtPtr(0xFF, p);
|
| ︙ | ︙ | |||
4624 4625 4626 4627 4628 4629 4630 |
statsPtr->currentInstBytes += (double) codePtr->numCodeBytes;
statsPtr->currentLitBytes += (double)
codePtr->numLitObjects * sizeof(Tcl_Obj *);
statsPtr->currentExceptBytes += (double)
codePtr->numExceptRanges * sizeof(ExceptionRange);
statsPtr->currentAuxBytes += (double)
| | | 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 |
statsPtr->currentInstBytes += (double) codePtr->numCodeBytes;
statsPtr->currentLitBytes += (double)
codePtr->numLitObjects * sizeof(Tcl_Obj *);
statsPtr->currentExceptBytes += (double)
codePtr->numExceptRanges * sizeof(ExceptionRange);
statsPtr->currentAuxBytes += (double)
BA_AuxData_Size(codePtr->auxData) * sizeof(AuxData);
statsPtr->currentCmdMapBytes += (double) codePtr->numCmdLocBytes;
}
#endif /* TCL_COMPILE_STATS */
/*
* Local Variables:
* mode: c
* c-basic-offset: 4
* fill-column: 78
* tab-width: 8
* End:
*/
|
Changes to generic/tclCompile.h.
| ︙ | ︙ | |||
150 151 152 153 154 155 156 |
* update. Note that resizing a jump (via
* TclFixupForwardJump) can cause the contents
* of this array to be updated. When
* numContinueTargets==0, this is NULL. */
int allocContinueTargets; /* The size of the continueTargets array. */
} ExceptionAux;
| < < < < < < < < < < < < < < < | 150 151 152 153 154 155 156 157 158 159 160 161 162 163 |
* update. Note that resizing a jump (via
* TclFixupForwardJump) can cause the contents
* of this array to be updated. When
* numContinueTargets==0, this is NULL. */
int allocContinueTargets; /* The size of the continueTargets array. */
} ExceptionAux;
/*
* TIP #280
* Structure to record additional location information for byte code. This
* information is internal and not saved. i.e. tbcload'ed code will not have
* this information. It records the lines for all words of all commands found
* in the byte code. The association with a ByteCode structure BC is done
* through the 'lineBCPtr' HashTable in Interp, keyed by the address of BC.
|
| ︙ | ︙ | |||
265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
typedef struct AuxData {
const AuxDataType *type; /* Pointer to the AuxData type associated with
* this ClientData. */
ClientData clientData; /* The compilation data itself. */
} AuxData;
/*
* Structure defining the compilation environment. After compilation, fields
* describing bytecode instructions are copied out into the more compact
* ByteCode structure defined below.
*/
#define COMPILEENV_INIT_CODE_BYTES 250
#define COMPILEENV_INIT_NUM_OBJECTS 60
#define COMPILEENV_INIT_EXCEPT_RANGES 5
| > > > > < < | 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 |
typedef struct AuxData {
const AuxDataType *type; /* Pointer to the AuxData type associated with
* this ClientData. */
ClientData clientData; /* The compilation data itself. */
} AuxData;
/* Forward declarations for fields below */
struct BrodnikArray_CmdLocation;
TclBrodnikArrayDeclare(AuxData,MODULE_SCOPE);
/*
* Structure defining the compilation environment. After compilation, fields
* describing bytecode instructions are copied out into the more compact
* ByteCode structure defined below.
*/
#define COMPILEENV_INIT_CODE_BYTES 250
#define COMPILEENV_INIT_NUM_OBJECTS 60
#define COMPILEENV_INIT_EXCEPT_RANGES 5
typedef struct CompileEnv {
Interp *iPtr; /* Interpreter containing the code being
* compiled. Commands and their compile procs
* are specific to an interpreter so the code
* emitted will depend on the interpreter. */
const char *source; /* The source string being compiled by
|
| ︙ | ︙ | |||
301 302 303 304 305 306 307 |
* if not in any range currently. */
int maxExceptDepth; /* Max nesting level of exception ranges; -1
* if no ranges have been compiled. */
int maxStackDepth; /* Maximum number of stack elements needed to
* execute the code. Set by compilation
* procedures before returning. */
int currStackDepth; /* Current stack depth. */
| | | < | < | | | > < < < | < < < < < < < | | < < < < | 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 |
* if not in any range currently. */
int maxExceptDepth; /* Max nesting level of exception ranges; -1
* if no ranges have been compiled. */
int maxStackDepth; /* Maximum number of stack elements needed to
* execute the code. Set by compilation
* procedures before returning. */
int currStackDepth; /* Current stack depth. */
Tcl_HashTable litMap; /* Map from literal value to int index where
* that value is stored in literalArrayPtr.
* Used to prevent dup value refs. */
unsigned char *codeStart; /* Points to the first byte of the code. */
unsigned char *codeNext; /* Points to next code array byte to use. */
unsigned char *codeEnd; /* Points just after the last allocated code
* array byte. */
int mallocedCodeArray; /* Set 1 if code array was expanded and
* codeStart points into the heap.*/
Tcl_Obj **literalArrayPtr;
/* Points of array of literal values. */
int literalArrayNext; /* Index of next free object array entry. */
int literalArrayEnd; /* Index just after last obj array entry. */
int mallocedLiteralArray; /* 1 if object array was expanded and objArray
* points into the heap, else 0. */
ExceptionRange *exceptArrayPtr;
/* Points to start of the ExceptionRange
* array. */
int exceptArrayNext; /* Next free ExceptionRange array index.
* exceptArrayNext is the number of ranges and
* (exceptArrayNext-1) is the index of the
* current range's array entry. */
int exceptArrayEnd; /* Index after the last ExceptionRange array
* entry. */
int mallocedExceptArray; /* 1 if ExceptionRange array was expanded and
* exceptArrayPtr points in heap, else 0. */
ExceptionAux *exceptAuxArrayPtr;
/* Array of information used to restore the
* state when processing BREAK/CONTINUE
* exceptions. Must be the same size as the
* exceptArrayPtr. */
struct BrodnikArray_CmdLocation *cmdMap;
/* Points to array of CmdLocation.
* numCommands is the index of the next entry
* to use; (numCommands-1) is the entry index
* for the last command. */
BA_AuxData *auxData; /* Points to array of AuxData */
unsigned char staticCodeSpace[COMPILEENV_INIT_CODE_BYTES];
/* Initial storage for code. */
Tcl_Obj *staticLiteralSpace[COMPILEENV_INIT_NUM_OBJECTS];
/* Initial storage of literal value array. */
ExceptionRange staticExceptArraySpace[COMPILEENV_INIT_EXCEPT_RANGES];
/* Initial ExceptionRange array storage. */
ExceptionAux staticExAuxArraySpace[COMPILEENV_INIT_EXCEPT_RANGES];
/* Initial static except auxiliary info array
* storage. */
/* TIP #280 */
ExtCmdLoc *extCmdMapPtr; /* Extended command location information for
* 'info frame'. */
int line; /* First line of the script, based on the
* invoking context, then the line of the
* command currently compiled. */
int atCmdStart; /* Flag to say whether an INST_START_CMD
|
| ︙ | ︙ | |||
407 408 409 410 411 412 413 414 415 416 417 418 419 420 |
* applied yet: this is indicated by the TCL_BYTECODE_RESOLVE_VARS flag.
*/
#define TCL_BYTECODE_RESOLVE_VARS 0x0002
#define TCL_BYTECODE_RECOMPILE 0x0004
typedef struct ByteCode {
TclHandle interpHandle; /* Handle for interpreter containing the
* compiled code. Commands and their compile
* procs are specific to an interpreter so the
* code emitted will depend on the
* interpreter. */
int compileEpoch; /* Value of iPtr->compileEpoch when this
| > > | 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 |
* applied yet: this is indicated by the TCL_BYTECODE_RESOLVE_VARS flag.
*/
#define TCL_BYTECODE_RESOLVE_VARS 0x0002
#define TCL_BYTECODE_RECOMPILE 0x0004
#define TCL_BYTECODE_FREE_LITERALS 0x0008
typedef struct ByteCode {
TclHandle interpHandle; /* Handle for interpreter containing the
* compiled code. Commands and their compile
* procs are specific to an interpreter so the
* code emitted will depend on the
* interpreter. */
int compileEpoch; /* Value of iPtr->compileEpoch when this
|
| ︙ | ︙ | |||
450 451 452 453 454 455 456 |
* literal Tcl objects or storage referenced
* by AuxData entries. */
int numCommands; /* Number of commands compiled. */
int numSrcBytes; /* Number of source bytes compiled. */
int numCodeBytes; /* Number of code bytes. */
int numLitObjects; /* Number of objects in literal array. */
int numExceptRanges; /* Number of ExceptionRange array elems. */
| < | < < | 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 |
* literal Tcl objects or storage referenced
* by AuxData entries. */
int numCommands; /* Number of commands compiled. */
int numSrcBytes; /* Number of source bytes compiled. */
int numCodeBytes; /* Number of code bytes. */
int numLitObjects; /* Number of objects in literal array. */
int numExceptRanges; /* Number of ExceptionRange array elems. */
int numCmdLocBytes; /* Number of bytes needed for encoded command
* location information. */
int maxExceptDepth; /* Maximum nesting level of ExceptionRanges;
* -1 if no ranges were compiled. */
int maxStackDepth; /* Maximum number of stack elements needed to
* execute the code. */
unsigned char *codeStart; /* Points to the first byte of the code. This
* is just after the final ByteCode member
* cmdMapPtr. */
Tcl_Obj **objArrayPtr; /* Points to the start of the literal object
* array. This is just after the last code
* byte. */
ExceptionRange *exceptArrayPtr;
/* Points to the start of the ExceptionRange
* array. This is just after the last object
* in the object array. */
BA_AuxData *auxData; /* Array of auxiliary data. */
unsigned char *codeDeltaStart;
/* Points to the first of a sequence of bytes
* that encode the change in the starting
* offset of each command's code. If -127 <=
* delta <= 127, it is encoded as 1 byte,
* otherwise 0xFF (128) appears and the delta
* is encoded by the next 4 bytes. Code deltas
|
| ︙ | ︙ | |||
938 939 940 941 942 943 944 |
int exceptIndex; /* Index of the first range entry in the
* ExceptionRange array after the current one.
* This field is used to adjust the code
* offsets in subsequent ExceptionRange
* records when a jump is grown from 2 bytes
* to 5 bytes. */
} JumpFixup;
| | < < < < < < < < < < < | 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 |
int exceptIndex; /* Index of the first range entry in the
* ExceptionRange array after the current one.
* This field is used to adjust the code
* offsets in subsequent ExceptionRange
* records when a jump is grown from 2 bytes
* to 5 bytes. */
} JumpFixup;
TclBrodnikArrayDeclare(JumpFixup,MODULE_SCOPE);
/*
* The structure describing one variable list of a foreach command. Note that
* only foreach commands inside procedure bodies are compiled inline so a
* ForeachVarList structure always describes local variables. Furthermore,
* only scalar variables are supported for inline-compiled foreach loops.
*/
|
| ︙ | ︙ | |||
995 996 997 998 999 1000 1001 | * LAST FIELD IN THE STRUCTURE! */ } ForeachInfo; MODULE_SCOPE const AuxDataType tclForeachInfoType; MODULE_SCOPE const AuxDataType tclNewForeachInfoType; #define FOREACHINFO(envPtr, index) \ | | | | | 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 |
* LAST FIELD IN THE STRUCTURE! */
} ForeachInfo;
MODULE_SCOPE const AuxDataType tclForeachInfoType;
MODULE_SCOPE const AuxDataType tclNewForeachInfoType;
#define FOREACHINFO(envPtr, index) \
((ForeachInfo*)(TclFetchAuxData(envPtr, TclGetUInt4AtPtr(index))))
/*
* Structure used to hold information about a switch command that is needed
* during program execution. These structures are stored in CompileEnv and
* ByteCode structures as auxiliary data.
*/
typedef struct JumptableInfo {
Tcl_HashTable hashTable; /* Hash that maps strings to signed ints (PC
* offsets). */
} JumptableInfo;
MODULE_SCOPE const AuxDataType tclJumptableInfoType;
#define JUMPTABLEINFO(envPtr, index) \
((JumptableInfo*)(TclFetchAuxData(envPtr, TclGetUInt4AtPtr(index))))
/*
* Structure used to hold information about a [dict update] command that is
* needed during program execution. These structures are stored in CompileEnv
* and ByteCode structures as auxiliary data.
*/
typedef struct {
int length; /* Size of array */
int varIndices[1]; /* Array of variable indices to manage when
* processing the start and end of a [dict
* update]. There is really more than one
* entry, and the structure is allocated to
* take account of this. MUST BE LAST FIELD IN
* STRUCTURE. */
} DictUpdateInfo;
MODULE_SCOPE const AuxDataType tclDictUpdateInfoType;
#define DICTUPDATEINFO(envPtr, index) \
((DictUpdateInfo*)(TclFetchAuxData(envPtr, TclGetUInt4AtPtr(index))))
/*
* ClientData type used by the math operator commands.
*/
typedef struct {
const char *op; /* Do not call it 'operator': C++ reserved */
|
| ︙ | ︙ | |||
1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 | MODULE_SCOPE int TclAttemptCompileProc(Tcl_Interp *interp, Tcl_Parse *parsePtr, int depth, Command *cmdPtr, CompileEnv *envPtr); MODULE_SCOPE void TclCleanupByteCode(ByteCode *codePtr); MODULE_SCOPE void TclCleanupStackForBreakContinue(CompileEnv *envPtr, ExceptionAux *auxPtr); MODULE_SCOPE void TclCompileCmdWord(Tcl_Interp *interp, Tcl_Token *tokenPtr, int count, CompileEnv *envPtr); MODULE_SCOPE void TclCompileExpr(Tcl_Interp *interp, const char *script, int numBytes, CompileEnv *envPtr, int optimize); MODULE_SCOPE void TclCompileExprWords(Tcl_Interp *interp, Tcl_Token *tokenPtr, int numWords, CompileEnv *envPtr); | > | | < < < > < > < < | 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 | MODULE_SCOPE int TclAttemptCompileProc(Tcl_Interp *interp, Tcl_Parse *parsePtr, int depth, Command *cmdPtr, CompileEnv *envPtr); MODULE_SCOPE void TclCleanupByteCode(ByteCode *codePtr); MODULE_SCOPE void TclCleanupStackForBreakContinue(CompileEnv *envPtr, ExceptionAux *auxPtr); MODULE_SCOPE void * TclCmdStartAddress(CompileEnv *envPtr, int i); MODULE_SCOPE void TclCompileCmdWord(Tcl_Interp *interp, Tcl_Token *tokenPtr, int count, CompileEnv *envPtr); MODULE_SCOPE void TclCompileExpr(Tcl_Interp *interp, const char *script, int numBytes, CompileEnv *envPtr, int optimize); MODULE_SCOPE void TclCompileExprWords(Tcl_Interp *interp, Tcl_Token *tokenPtr, int numWords, CompileEnv *envPtr); MODULE_SCOPE Tcl_Token *TclCompileInvocation(Tcl_Interp *interp, Tcl_Token *tokenPtr, Tcl_Obj *cmdObj, int numWords, CompileEnv *envPtr); MODULE_SCOPE void TclCompileScript(Tcl_Interp *interp, const char *script, int numBytes, CompileEnv *envPtr); MODULE_SCOPE void TclCompileSyntaxError(Tcl_Interp *interp, CompileEnv *envPtr); MODULE_SCOPE void TclCompileTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr, int count, CompileEnv *envPtr); MODULE_SCOPE void TclCompileVarSubst(Tcl_Interp *interp, Tcl_Token *tokenPtr, CompileEnv *envPtr); MODULE_SCOPE int TclCreateAuxData(ClientData clientData, const AuxDataType *typePtr, CompileEnv *envPtr); MODULE_SCOPE int TclCreateExceptRange(ExceptionRangeType type, CompileEnv *envPtr); MODULE_SCOPE ExecEnv * TclCreateExecEnv(Tcl_Interp *interp, int size); MODULE_SCOPE Tcl_Obj * TclCreateLiteral(Interp *iPtr, char *bytes, int length); MODULE_SCOPE void TclDeleteExecEnv(ExecEnv *eePtr); MODULE_SCOPE void TclDeleteLiteralTable(Tcl_Interp *interp, LiteralTable *tablePtr); MODULE_SCOPE void TclDisposeFailedCompile(CompileEnv *envPtr, int num); MODULE_SCOPE void TclEmitForwardJump(CompileEnv *envPtr, TclJumpType jumpType, JumpFixup *jumpFixupPtr); MODULE_SCOPE void TclEmitInvoke(CompileEnv *envPtr, int opcode, ...); MODULE_SCOPE ExceptionRange * TclGetExceptionRangeForPc(unsigned char *pc, int catchOnly, ByteCode *codePtr); MODULE_SCOPE int TclNRExecuteByteCode(Tcl_Interp *interp, ByteCode *codePtr); MODULE_SCOPE ClientData TclFetchAuxData(CompileEnv *envPtr, int index); MODULE_SCOPE Tcl_Obj * TclFetchLiteral(CompileEnv *envPtr, unsigned int index); MODULE_SCOPE void TclFinalizeAuxDataTypeTable(void); MODULE_SCOPE int TclFindCompiledLocal(const char *name, int nameChars, int create, CompileEnv *envPtr); MODULE_SCOPE int TclFixupForwardJump(CompileEnv *envPtr, JumpFixup *jumpFixupPtr, int jumpDist, int distThreshold); MODULE_SCOPE void TclFreeCompileEnv(CompileEnv *envPtr); MODULE_SCOPE void TclInitAuxDataTypeTable(void); MODULE_SCOPE void TclInitByteCodeObj(Tcl_Obj *objPtr, CompileEnv *envPtr); MODULE_SCOPE void TclInitCompileEnv(Tcl_Interp *interp, CompileEnv *envPtr, const char *string, int numBytes, const CmdFrame *invoker, int word); MODULE_SCOPE void TclInitLiteralTable(LiteralTable *tablePtr); MODULE_SCOPE ExceptionRange *TclGetInnermostExceptionRange(CompileEnv *envPtr, int returnCode, ExceptionAux **auxPtrPtr); MODULE_SCOPE void TclAddLoopBreakFixup(CompileEnv *envPtr, ExceptionAux *auxPtr); MODULE_SCOPE void TclAddLoopContinueFixup(CompileEnv *envPtr, ExceptionAux *auxPtr); |
| ︙ | ︙ | |||
1202 1203 1204 1205 1206 1207 1208 | /* *---------------------------------------------------------------- * Macros and flag values used by Tcl bytecode compilation and execution * modules inside the Tcl core but not used outside. *---------------------------------------------------------------- */ | < < < < < < < < < | 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 | /* *---------------------------------------------------------------- * Macros and flag values used by Tcl bytecode compilation and execution * modules inside the Tcl core but not used outside. *---------------------------------------------------------------- */ #define LITERAL_ON_HEAP 0x01 #define LITERAL_CMD_NAME 0x02 /* * Form of TclRegisterLiteral with flags == 0. In that case, it is safe to * cast away constness, and it is cleanest to do that here, all in one place. * |
| ︙ | ︙ |
Changes to generic/tclDisassemble.c.
| ︙ | ︙ | |||
219 220 221 222 223 224 225 |
iPtr->compileEpoch);
Tcl_AppendToObj(bufferObj, " Source ", -1);
PrintSourceToObj(bufferObj, codePtr->source,
TclMin(codePtr->numSrcBytes, 55));
Tcl_AppendPrintfToObj(bufferObj,
"\n Cmds %d, src %d, inst %d, litObjs %u, aux %d, stkDepth %u, code/src %.2f\n",
numCmds, codePtr->numSrcBytes, codePtr->numCodeBytes,
| | | | 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 |
iPtr->compileEpoch);
Tcl_AppendToObj(bufferObj, " Source ", -1);
PrintSourceToObj(bufferObj, codePtr->source,
TclMin(codePtr->numSrcBytes, 55));
Tcl_AppendPrintfToObj(bufferObj,
"\n Cmds %d, src %d, inst %d, litObjs %u, aux %d, stkDepth %u, code/src %.2f\n",
numCmds, codePtr->numSrcBytes, codePtr->numCodeBytes,
codePtr->numLitObjects, (int) BA_AuxData_Size(codePtr->auxData),
codePtr->maxStackDepth,
#ifdef TCL_COMPILE_STATS
codePtr->numSrcBytes?
codePtr->structureSize/(float)codePtr->numSrcBytes :
#endif
0.0);
#ifdef TCL_COMPILE_STATS
Tcl_AppendPrintfToObj(bufferObj,
" Code %lu = header %lu+inst %d+litObj %lu+exc %lu+aux %lu+cmdMap %d\n",
(unsigned long) codePtr->structureSize,
(unsigned long) (sizeof(ByteCode) - sizeof(size_t) - sizeof(Tcl_Time)),
codePtr->numCodeBytes,
(unsigned long) (codePtr->numLitObjects * sizeof(Tcl_Obj *)),
(unsigned long) (codePtr->numExceptRanges*sizeof(ExceptionRange)),
(unsigned long) (BA_AuxData_Size(codePtr->auxData) * sizeof(AuxData)),
codePtr->numCmdLocBytes);
#endif /* TCL_COMPILE_STATS */
/*
* If the ByteCode is the compiled body of a Tcl procedure, print
* information about that procedure. Note that we don't know the
* procedure's name since ByteCode's can be shared among procedures.
|
| ︙ | ︙ | |||
531 532 533 534 535 536 537 | opnd = TclGetUInt4AtPtr(pc+numBytes); numBytes += 4; suffixObj = codePtr->objArrayPtr[opnd]; Tcl_AppendPrintfToObj(bufferObj, "%u ", (unsigned) opnd); break; case OPERAND_AUX4: opnd = TclGetUInt4AtPtr(pc+numBytes); numBytes += 4; Tcl_AppendPrintfToObj(bufferObj, "%u ", (unsigned) opnd); | | | 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 |
opnd = TclGetUInt4AtPtr(pc+numBytes); numBytes += 4;
suffixObj = codePtr->objArrayPtr[opnd];
Tcl_AppendPrintfToObj(bufferObj, "%u ", (unsigned) opnd);
break;
case OPERAND_AUX4:
opnd = TclGetUInt4AtPtr(pc+numBytes); numBytes += 4;
Tcl_AppendPrintfToObj(bufferObj, "%u ", (unsigned) opnd);
auxPtr = BA_AuxData_At(codePtr->auxData,opnd);
break;
case OPERAND_IDX4:
opnd = TclGetInt4AtPtr(pc+numBytes); numBytes += 4;
if (opnd >= -1) {
Tcl_AppendPrintfToObj(bufferObj, "%d ", opnd);
} else if (opnd == -2) {
Tcl_AppendPrintfToObj(bufferObj, "end ");
|
| ︙ | ︙ | |||
1033 1034 1035 1036 1037 1038 1039 1040 |
pc += instDesc->numBytes;
}
/*
* Get the auxiliary data from the bytecode.
*/
aux = Tcl_NewObj();
| > | | | 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 |
pc += instDesc->numBytes;
}
/*
* Get the auxiliary data from the bytecode.
*/
/* TODO: convert to loop over an iterating BP */
aux = Tcl_NewObj();
for (i=0 ; i<BA_AuxData_Size(codePtr->auxData) ; i++) {
AuxData *auxData = BA_AuxData_At(codePtr->auxData,i);
Tcl_Obj *auxDesc = Tcl_NewStringObj(auxData->type->name, -1);
if (auxData->type->disassembleProc) {
Tcl_Obj *desc = Tcl_NewObj();
Tcl_DictObjPut(NULL, desc, Tcl_NewStringObj("name", -1), auxDesc);
auxDesc = desc;
|
| ︙ | ︙ |
Changes to generic/tclEnsemble.c.
| ︙ | ︙ | |||
2474 2475 2476 2477 2478 2479 2480 |
hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
Tcl_SetHashValue(hPtr, valueObj);
Tcl_IncrRefCount(valueObj);
Tcl_DictObjNext(&dictSearch, &keyObj, &valueObj, &done);
}
} else {
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < | 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 |
hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
Tcl_SetHashValue(hPtr, valueObj);
Tcl_IncrRefCount(valueObj);
Tcl_DictObjNext(&dictSearch, &keyObj, &valueObj, &done);
}
} else {
TclFillTableWithExports(ensemblePtr->nsPtr, hash);
}
if (hash->numEntries == 0) {
ensemblePtr->subcommandArrayPtr = NULL;
return;
}
|
| ︙ | ︙ | |||
3247 3248 3249 3250 3251 3252 3253 |
* compiled. */
CompileEnv *envPtr) /* Holds resulting instructions. */
{
Tcl_Obj *objPtr = Tcl_NewObj();
Tcl_IncrRefCount(objPtr);
Tcl_GetCommandFullName(interp, (Tcl_Command) cmdPtr, objPtr);
| | | 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 |
* compiled. */
CompileEnv *envPtr) /* Holds resulting instructions. */
{
Tcl_Obj *objPtr = Tcl_NewObj();
Tcl_IncrRefCount(objPtr);
Tcl_GetCommandFullName(interp, (Tcl_Command) cmdPtr, objPtr);
(void) TclCompileInvocation(interp, parsePtr->tokenPtr, objPtr,
parsePtr->numWords, envPtr);
Tcl_DecrRefCount(objPtr);
return TCL_OK;
}
int
TclCompileBasic0ArgCmd(
|
| ︙ | ︙ |
Changes to generic/tclEnv.c.
| ︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 |
* Copyright (c) 1994-1998 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#include "tclInt.h"
TCL_DECLARE_MUTEX(envMutex) /* To serialize access to environ. */
static struct {
| > > > > | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 |
* Copyright (c) 1994-1998 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#include "tclInt.h"
#include "tclBrodnik.h"
typedef char * pchar;
TclBrodnikArray(pchar);
TCL_DECLARE_MUTEX(envMutex) /* To serialize access to environ. */
static struct {
BA_pchar *cachePtr; /* Cache of the env strings we alloc'd */
#ifndef USE_PUTENV
char **ourEnviron; /* Cache of the array that we allocate. We
* need to track this in case another
* subsystem swaps around the environ array
* like we do. */
int ourEnvironSize; /* Non-zero means that the environ array was
* malloced and has this many total entries
|
| ︙ | ︙ | |||
650 651 652 653 654 655 656 |
*/
static void
ReplaceString(
const char *oldStr, /* Old environment string. */
char *newStr) /* New environment string. */
{
| < | < < < < | < | < < < | > > > | | < | | < | | > > > | | | | < | | < > | < < < < > | < | | > | | < < < | 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 |
*/
static void
ReplaceString(
const char *oldStr, /* Old environment string. */
char *newStr) /* New environment string. */
{
if (env.cachePtr == NULL) {
env.cachePtr = BA_pchar_Create();
}
if (oldStr) {
BP_pchar ptr;
pchar *p = BA_pchar_First(env.cachePtr, &ptr);
while (p) {
if (*p == oldStr) {
pchar *lastPtr;
ckfree(*p);
if (newStr) {
*p = newStr;
return;
}
lastPtr = BA_pchar_Detach(env.cachePtr);
if (p != lastPtr) {
*p = *lastPtr;
}
return;
}
p = BP_pchar_Next(&ptr);
}
}
if (newStr) {
pchar *newPtr = BA_pchar_Append(env.cachePtr);
*newPtr = newStr;
}
}
/*
*----------------------------------------------------------------------
*
* TclFinalizeEnvironment --
|
| ︙ | ︙ | |||
726 727 728 729 730 731 732 |
* For now we just deallocate the cache array and none of the environment
* strings. This may leak more memory that strictly necessary, since some
* of the strings may no longer be in the environment. However,
* determining which ones are ok to delete is n-squared, and is pretty
* unlikely, so we don't bother.
*/
| | | | < > > > > > | < | 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 |
* For now we just deallocate the cache array and none of the environment
* strings. This may leak more memory that strictly necessary, since some
* of the strings may no longer be in the environment. However,
* determining which ones are ok to delete is n-squared, and is pretty
* unlikely, so we don't bother.
*/
if (env.cachePtr) {
BA_pchar_Destroy(env.cachePtr);
env.cachePtr = NULL;
}
#ifndef USE_PUTENV
if (env.ourEnviron && (env.ourEnviron != environ)) {
ckfree(env.ourEnviron);
}
env.ourEnviron = NULL;
env.ourEnvironSize = 0;
#endif
}
#if defined(__CYGWIN__)
/*
* When using cygwin, when an environment variable changes, we need to synch
* with both the cygwin environment (in case the application C code calls
|
| ︙ | ︙ |
Changes to generic/tclExecute.c.
| ︙ | ︙ | |||
4442 4443 4444 4445 4446 4447 4448 | /* * Jump to location looked up in a hashtable; fall through to next * instr if lookup fails. */ opnd = TclGetInt4AtPtr(pc+1); | | | 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 |
/*
* Jump to location looked up in a hashtable; fall through to next
* instr if lookup fails.
*/
opnd = TclGetInt4AtPtr(pc+1);
jtPtr = BA_AuxData_At(codePtr->auxData, opnd)->clientData;
TRACE(("%d \"%.20s\" => ", opnd, O2S(OBJ_AT_TOS)));
hPtr = Tcl_FindHashEntry(&jtPtr->hashTable, TclGetString(OBJ_AT_TOS));
if (hPtr != NULL) {
int jumpOffset = PTR2INT(Tcl_GetHashValue(hPtr));
TRACE_APPEND(("found in table, new pc %u\n",
(unsigned)(pc - codePtr->codeStart + jumpOffset)));
|
| ︙ | ︙ | |||
6752 6753 6754 6755 6756 6757 6758 |
case INST_FOREACH_START4: /* DEPRECATED */
/*
* Initialize the temporary local var that holds the count of the
* number of iterations of the loop body to -1.
*/
opnd = TclGetUInt4AtPtr(pc+1);
| | | 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 |
case INST_FOREACH_START4: /* DEPRECATED */
/*
* Initialize the temporary local var that holds the count of the
* number of iterations of the loop body to -1.
*/
opnd = TclGetUInt4AtPtr(pc+1);
infoPtr = BA_AuxData_At(codePtr->auxData, opnd)->clientData;
iterTmpIndex = infoPtr->loopCtTemp;
iterVarPtr = LOCAL(iterTmpIndex);
oldValuePtr = iterVarPtr->value.objPtr;
if (oldValuePtr == NULL) {
TclNewLongObj(iterVarPtr->value.objPtr, -1);
Tcl_IncrRefCount(iterVarPtr->value.objPtr);
|
| ︙ | ︙ | |||
6786 6787 6788 6789 6790 6791 6792 |
/*
* "Step" a foreach loop (i.e., begin its next iteration) by assigning
* the next value list element to each loop var.
*/
opnd = TclGetUInt4AtPtr(pc+1);
TRACE(("%u => ", opnd));
| | | 6786 6787 6788 6789 6790 6791 6792 6793 6794 6795 6796 6797 6798 6799 6800 |
/*
* "Step" a foreach loop (i.e., begin its next iteration) by assigning
* the next value list element to each loop var.
*/
opnd = TclGetUInt4AtPtr(pc+1);
TRACE(("%u => ", opnd));
infoPtr = BA_AuxData_At(codePtr->auxData, opnd)->clientData;
numLists = infoPtr->numLists;
/*
* Increment the temp holding the loop iteration number.
*/
iterVarPtr = LOCAL(infoPtr->loopCtTemp);
|
| ︙ | ︙ | |||
6915 6916 6917 6918 6919 6920 6921 |
case INST_FOREACH_START:
/*
* Initialize the data for the looping construct, pushing the
* corresponding Tcl_Objs to the stack.
*/
opnd = TclGetUInt4AtPtr(pc+1);
| | | 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 |
case INST_FOREACH_START:
/*
* Initialize the data for the looping construct, pushing the
* corresponding Tcl_Objs to the stack.
*/
opnd = TclGetUInt4AtPtr(pc+1);
infoPtr = BA_AuxData_At(codePtr->auxData, opnd)->clientData;
numLists = infoPtr->numLists;
TRACE(("%u => ", opnd));
/*
* Compute the number of iterations that will be run: iterMax
*/
|
| ︙ | ︙ | |||
7557 7558 7559 7560 7561 7562 7563 |
JUMP_PEEPHOLE_F(done, 5, 0);
case INST_DICT_UPDATE_START:
opnd = TclGetUInt4AtPtr(pc+1);
opnd2 = TclGetUInt4AtPtr(pc+5);
TRACE(("%u => ", opnd));
varPtr = LOCAL(opnd);
| | | 7557 7558 7559 7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 |
JUMP_PEEPHOLE_F(done, 5, 0);
case INST_DICT_UPDATE_START:
opnd = TclGetUInt4AtPtr(pc+1);
opnd2 = TclGetUInt4AtPtr(pc+5);
TRACE(("%u => ", opnd));
varPtr = LOCAL(opnd);
duiPtr = BA_AuxData_At(codePtr->auxData, opnd2)->clientData;
while (TclIsVarLink(varPtr)) {
varPtr = varPtr->value.linkPtr;
}
if (TclIsVarDirectReadable(varPtr)) {
dictPtr = varPtr->value.objPtr;
} else {
DECACHE_STACK_INFO();
|
| ︙ | ︙ | |||
7613 7614 7615 7616 7617 7618 7619 |
NEXT_INST_F(9, 0, 0);
case INST_DICT_UPDATE_END:
opnd = TclGetUInt4AtPtr(pc+1);
opnd2 = TclGetUInt4AtPtr(pc+5);
TRACE(("%u => ", opnd));
varPtr = LOCAL(opnd);
| | | 7613 7614 7615 7616 7617 7618 7619 7620 7621 7622 7623 7624 7625 7626 7627 |
NEXT_INST_F(9, 0, 0);
case INST_DICT_UPDATE_END:
opnd = TclGetUInt4AtPtr(pc+1);
opnd2 = TclGetUInt4AtPtr(pc+5);
TRACE(("%u => ", opnd));
varPtr = LOCAL(opnd);
duiPtr = BA_AuxData_At(codePtr->auxData, opnd2)->clientData;
while (TclIsVarLink(varPtr)) {
varPtr = varPtr->value.linkPtr;
}
if (TclIsVarDirectReadable(varPtr)) {
dictPtr = varPtr->value.objPtr;
} else {
DECACHE_STACK_INFO();
|
| ︙ | ︙ | |||
9540 9541 9542 9543 9544 9545 9546 9547 9548 9549 9550 9551 9552 9553 9554 9555 9556 9557 |
static void
PrintByteCodeInfo(
register ByteCode *codePtr) /* The bytecode whose summary is printed to
* stdout. */
{
Proc *procPtr = codePtr->procPtr;
Interp *iPtr = (Interp *) *codePtr->interpHandle;
fprintf(stdout, "\nExecuting ByteCode 0x%p, refCt %u, epoch %u, interp 0x%p (epoch %u)\n",
codePtr, codePtr->refCount, codePtr->compileEpoch, iPtr,
iPtr->compileEpoch);
fprintf(stdout, " Source: ");
TclPrintSource(stdout, codePtr->source, 60);
fprintf(stdout, "\n Cmds %d, src %d, inst %u, litObjs %u, aux %d, stkDepth %u, code/src %.2f\n",
codePtr->numCommands, codePtr->numSrcBytes,
codePtr->numCodeBytes, codePtr->numLitObjects,
| > | | | 9540 9541 9542 9543 9544 9545 9546 9547 9548 9549 9550 9551 9552 9553 9554 9555 9556 9557 9558 9559 9560 9561 9562 9563 9564 9565 9566 9567 9568 9569 9570 9571 9572 9573 9574 9575 9576 9577 9578 9579 9580 |
static void
PrintByteCodeInfo(
register ByteCode *codePtr) /* The bytecode whose summary is printed to
* stdout. */
{
Proc *procPtr = codePtr->procPtr;
Interp *iPtr = (Interp *) *codePtr->interpHandle;
int numAuxDataItems = codePtr->auxData?BA_AuxData_Size(codePtr->auxData):0;
fprintf(stdout, "\nExecuting ByteCode 0x%p, refCt %u, epoch %u, interp 0x%p (epoch %u)\n",
codePtr, codePtr->refCount, codePtr->compileEpoch, iPtr,
iPtr->compileEpoch);
fprintf(stdout, " Source: ");
TclPrintSource(stdout, codePtr->source, 60);
fprintf(stdout, "\n Cmds %d, src %d, inst %u, litObjs %u, aux %d, stkDepth %u, code/src %.2f\n",
codePtr->numCommands, codePtr->numSrcBytes,
codePtr->numCodeBytes, codePtr->numLitObjects,
numAuxDataItems, codePtr->maxStackDepth,
#ifdef TCL_COMPILE_STATS
codePtr->numSrcBytes?
((float)codePtr->structureSize)/codePtr->numSrcBytes :
#endif
0.0);
#ifdef TCL_COMPILE_STATS
fprintf(stdout, " Code %lu = header %lu+inst %d+litObj %lu+exc %lu+aux %lu+cmdMap %d\n",
(unsigned long) codePtr->structureSize,
(unsigned long) (sizeof(ByteCode)-sizeof(size_t)-sizeof(Tcl_Time)),
codePtr->numCodeBytes,
(unsigned long) (codePtr->numLitObjects * sizeof(Tcl_Obj *)),
(unsigned long) (codePtr->numExceptRanges*sizeof(ExceptionRange)),
(unsigned long) (numAuxDataItems * sizeof(AuxData)),
codePtr->numCmdLocBytes);
#endif /* TCL_COMPILE_STATS */
if (procPtr != NULL) {
fprintf(stdout,
" Proc 0x%p, refCt %d, args %d, compiled locals %d\n",
procPtr, procPtr->refCount, procPtr->numArgs,
procPtr->numCompiledLocals);
|
| ︙ | ︙ | |||
10114 10115 10116 10117 10118 10119 10120 |
*/
int
TclLog2(
register int value) /* The integer for which to compute the log
* base 2. */
{
| | < | < < < | | 10115 10116 10117 10118 10119 10120 10121 10122 10123 10124 10125 10126 10127 10128 10129 10130 10131 10132 |
*/
int
TclLog2(
register int value) /* The integer for which to compute the log
* base 2. */
{
if (value == 0) {
return 0;
}
return TclMSB(value);
}
/*
*----------------------------------------------------------------------
*
* EvalStatsCmd --
*
|
| ︙ | ︙ |
Changes to generic/tclIOUtil.c.
| ︙ | ︙ | |||
1699 1700 1701 1702 1703 1704 1705 |
Tcl_FSEvalFileEx(
Tcl_Interp *interp, /* Interpreter in which to process file. */
Tcl_Obj *pathPtr, /* Path of file to process. Tilde-substitution
* will be performed on this name. */
const char *encodingName) /* If non-NULL, then use this encoding for the
* file. NULL means use the system encoding. */
{
| | | 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 |
Tcl_FSEvalFileEx(
Tcl_Interp *interp, /* Interpreter in which to process file. */
Tcl_Obj *pathPtr, /* Path of file to process. Tilde-substitution
* will be performed on this name. */
const char *encodingName) /* If non-NULL, then use this encoding for the
* file. NULL means use the system encoding. */
{
int result = TCL_ERROR;
Tcl_StatBuf statBuf;
Tcl_Obj *oldScriptFile;
Interp *iPtr;
const char *string;
Tcl_Channel chan;
Tcl_Obj *objPtr;
|
| ︙ | ︙ | |||
1785 1786 1787 1788 1789 1790 1791 |
goto end;
}
iPtr = (Interp *) interp;
oldScriptFile = iPtr->scriptFile;
iPtr->scriptFile = pathPtr;
Tcl_IncrRefCount(iPtr->scriptFile);
| < | > | 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 |
goto end;
}
iPtr = (Interp *) interp;
oldScriptFile = iPtr->scriptFile;
iPtr->scriptFile = pathPtr;
Tcl_IncrRefCount(iPtr->scriptFile);
/*
* TIP #280 Force the evaluator to open a frame for a sourced file.
*/
iPtr->evalFlags |= TCL_EVAL_FILE;
result = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_DIRECT);
/*
* Now we have to be careful; the script may have changed the
* iPtr->scriptFile value, so we must reset it without assuming it still
* points to 'pathPtr'.
*/
if (iPtr->scriptFile != NULL) {
Tcl_DecrRefCount(iPtr->scriptFile);
}
iPtr->scriptFile = oldScriptFile;
if (result == TCL_RETURN) {
result = TclUpdateReturnInfo(iPtr);
} else if (result == TCL_ERROR) {
/*
* Record information telling where the error occurred.
*/
int length;
const char *pathString = Tcl_GetStringFromObj(pathPtr, &length);
int limit = 150;
int overflow = (length > limit);
Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
"\n (file \"%.*s%s\" line %d)",
(overflow ? limit : length), pathString,
|
| ︙ | ︙ |
Changes to generic/tclInt.h.
| ︙ | ︙ | |||
30 31 32 33 34 35 36 37 38 39 40 41 42 43 | * here, so that system-dependent personalizations for the include files only * have to be made in once place. This results in a few extra includes, but * greater modularity. The order of the three groups of #includes is * important. For example, stdio.h is needed by tcl.h. */ #include "tclPort.h" #include <stdio.h> #include <ctype.h> #ifdef NO_STDLIB_H # include "../compat/stdlib.h" #else | > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | * here, so that system-dependent personalizations for the include files only * have to be made in once place. This results in a few extra includes, but * greater modularity. The order of the three groups of #includes is * important. For example, stdio.h is needed by tcl.h. */ #include "tclPort.h" #include "tclBrodnik.h" #include <stdio.h> #include <ctype.h> #ifdef NO_STDLIB_H # include "../compat/stdlib.h" #else |
| ︙ | ︙ | |||
255 256 257 258 259 260 261 |
* Command structures that point (via an
* ImportedCmdRef structure) to the Command
* structure in the source namespace's command
* table. */
TclVarHashTable varTable; /* Contains all the (global) variables
* currently in this namespace. Indexed by
* strings; values have type (Var *). */
| < | | | | < < < < < < | 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 |
* Command structures that point (via an
* ImportedCmdRef structure) to the Command
* structure in the source namespace's command
* table. */
TclVarHashTable varTable; /* Contains all the (global) variables
* currently in this namespace. Indexed by
* strings; values have type (Var *). */
Tcl_Obj *exportPatternList;
/* Set of "string match" style patterns that
* specify which commands are exported.
* No namespace qualifiers are allowed. */
int cmdRefEpoch; /* Incremented if a newly added command
* shadows a command for which this namespace
* has already cached a Command* pointer; this
* causes all its cached Command* pointers to
* be invalidated. */
int resolverEpoch; /* Incremented whenever (a) the name
* resolution rules change for this namespace
|
| ︙ | ︙ | |||
2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 | * Data structures related to procedures *---------------------------------------------------------------- */ typedef Tcl_CmdProc *TclCmdProcType; typedef Tcl_ObjCmdProc *TclObjCmdProcType; /* *---------------------------------------------------------------- * Data structures for process-global values. *---------------------------------------------------------------- */ typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, int *lengthPtr, | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 | * Data structures related to procedures *---------------------------------------------------------------- */ typedef Tcl_CmdProc *TclCmdProcType; typedef Tcl_ObjCmdProc *TclObjCmdProcType; /* *---------------------------------------------------------------- * Internal definitions related to parsing, substitution, evaluation *---------------------------------------------------------------- */ /* * New internal Tcl_Token types. * * TCL_TOKEN_SCRIPT - Leading Tcl_Token type for an entire script. * The numComponents field stores the number of * commands in the script. * TCL_TOKEN_SCRIPT_SUBST - So-called "command substituion" in Tcl is * really "script substitution" and this internal * Tcl_Token type indicates it. Unlike * the TCL_TOKEN_COMMAND type, which also denotes * "command substitution", the numComponents field * is *not* always 0, so we can store the results * of nested parsing, and avoid reparsing the * same string again and again. The numComponents * field stores the number of following Tcl_Tokens * that are parsed from the nested script. The * numComponents value is always at least 1, for * the TCL_TOKEN_SCRIPT token that follows. * TCL_TOKEN_CMD - Leading Tcl_Token type for a parsed Tcl command. * There will be one of these tokens for each * command in a script. The numComponents field * stores the number of words in the command. * TCL_TOKEN_ERROR - This Tcl_Token type is used to represent a * parse error. It may appear following all * the commands that follow a TCL_TOKEN_SCRIPT * token. The TCL_TOKEN_ERROR token represents * the remainder of the original string that * could not be parsed into commands. */ #define TCL_TOKEN_SCRIPT 512 #define TCL_TOKEN_SCRIPT_SUBST 1024 #define TCL_TOKEN_CMD 2048 #define TCL_TOKEN_ERROR 4096 /* *---------------------------------------------------------------- * Data structures for process-global values. *---------------------------------------------------------------- */ typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, int *lengthPtr, |
| ︙ | ︙ | |||
2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 | * the value of an empty string representation for an object. This value is * shared by all new objects allocated by Tcl_NewObj. */ MODULE_SCOPE char * tclEmptyStringRep; MODULE_SCOPE char tclEmptyString; /* *---------------------------------------------------------------- * Procedures shared among Tcl modules but not used by the outside world, * introduced by/for NRE. *---------------------------------------------------------------- */ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 | * the value of an empty string representation for an object. This value is * shared by all new objects allocated by Tcl_NewObj. */ MODULE_SCOPE char * tclEmptyStringRep; MODULE_SCOPE char tclEmptyString; /* * Flags used to control details of parsing. * The first three are #define'd in tcl.h, so that may be set by callers * of Tcl_SubstObj(). See the docs for what they do. * * #define TCL_SUBST_COMMANDS 001 * #define TCL_SUBST_VARIABLES 002 * #define TCL_SUBST_BACKSLASHES 004 * * tcl.h also #define's their combination for brevity: * * #define TCL_SUBST_ALL 007 * * The other flag values that control parsing are: * * PARSE_NESTED - Passed to ParseCommand to indicate that the * close bracket character should be treated as * a command terminator, as well as newlines, * semi-colons, and end of string. * * PARSE_APPEND - Passed throughout the Parse routines to * indicate that parsing should append to the * Tcl_Parse structure passed in (by reference). * If this flag is not set, some routines will * re-initialize the Tcl_Parse structure. * * PARSE_USE_INTERNAL_TOKENS - Passed throughout the Parse routines to * indicate the parse is being done for Tcl's * internal use, so it is acceptable to use * Tcl_Token types that are known only internally. */ #define PARSE_NESTED 010 #define PARSE_APPEND 020 #define PARSE_USE_INTERNAL_TOKENS 040 /* *---------------------------------------------------------------- * Procedures shared among Tcl modules but not used by the outside world, * introduced by/for NRE. *---------------------------------------------------------------- */ |
| ︙ | ︙ | |||
2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 | void *codePtr, CmdFrame *cfPtr, int cmd, int pc); MODULE_SCOPE void TclArgumentBCRelease(Tcl_Interp *interp, CmdFrame *cfPtr); MODULE_SCOPE void TclArgumentGet(Tcl_Interp *interp, Tcl_Obj *obj, CmdFrame **cfPtrPtr, int *wordPtr); MODULE_SCOPE int TclArraySet(Tcl_Interp *interp, Tcl_Obj *arrayNameObj, Tcl_Obj *arrayElemObj); MODULE_SCOPE double TclBignumToDouble(const mp_int *bignum); MODULE_SCOPE int TclByteArrayMatch(const unsigned char *string, int strLen, const unsigned char *pattern, int ptnLen, int flags); MODULE_SCOPE double TclCeil(const mp_int *a); MODULE_SCOPE void TclChannelPreserve(Tcl_Channel chan); MODULE_SCOPE void TclChannelRelease(Tcl_Channel chan); | > > > | 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 | void *codePtr, CmdFrame *cfPtr, int cmd, int pc); MODULE_SCOPE void TclArgumentBCRelease(Tcl_Interp *interp, CmdFrame *cfPtr); MODULE_SCOPE void TclArgumentGet(Tcl_Interp *interp, Tcl_Obj *obj, CmdFrame **cfPtrPtr, int *wordPtr); MODULE_SCOPE int TclArraySet(Tcl_Interp *interp, Tcl_Obj *arrayNameObj, Tcl_Obj *arrayElemObj); MODULE_SCOPE void TclBAConvertIndices(size_t index, unsigned int *hiPtr, unsigned int *loPtr); MODULE_SCOPE size_t TclBAInvertIndices(unsigned int hi, unsigned int lo); MODULE_SCOPE double TclBignumToDouble(const mp_int *bignum); MODULE_SCOPE int TclByteArrayMatch(const unsigned char *string, int strLen, const unsigned char *pattern, int ptnLen, int flags); MODULE_SCOPE double TclCeil(const mp_int *a); MODULE_SCOPE void TclChannelPreserve(Tcl_Channel chan); MODULE_SCOPE void TclChannelRelease(Tcl_Channel chan); |
| ︙ | ︙ | |||
2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 | const char *dict, int dictLength, const char **elementPtr, const char **nextPtr, int *sizePtr, int *literalPtr); /* TIP #280 - Modified token based evulation, with line information. */ MODULE_SCOPE int TclEvalEx(Tcl_Interp *interp, const char *script, int numBytes, int flags, int line, int *clNextOuter, const char *outerScript); MODULE_SCOPE Tcl_ObjCmdProc TclFileAttrsCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileCopyCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileDeleteCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileLinkCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileMakeDirsCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileReadLinkCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileRenameCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileTemporaryCmd; MODULE_SCOPE void TclCreateLateExitHandler(Tcl_ExitProc *proc, ClientData clientData); MODULE_SCOPE void TclDeleteLateExitHandler(Tcl_ExitProc *proc, ClientData clientData); MODULE_SCOPE char * TclDStringAppendObj(Tcl_DString *dsPtr, Tcl_Obj *objPtr); MODULE_SCOPE char * TclDStringAppendDString(Tcl_DString *dsPtr, Tcl_DString *toAppendPtr); MODULE_SCOPE Tcl_Obj * TclDStringToObj(Tcl_DString *dsPtr); MODULE_SCOPE void TclFinalizeAllocSubsystem(void); MODULE_SCOPE void TclFinalizeAsync(void); MODULE_SCOPE void TclFinalizeDoubleConversion(void); MODULE_SCOPE void TclFinalizeEncodingSubsystem(void); MODULE_SCOPE void TclFinalizeEnvironment(void); MODULE_SCOPE void TclFinalizeEvaluation(void); MODULE_SCOPE void TclFinalizeExecution(void); | > > > > > > | 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 | const char *dict, int dictLength, const char **elementPtr, const char **nextPtr, int *sizePtr, int *literalPtr); /* TIP #280 - Modified token based evulation, with line information. */ MODULE_SCOPE int TclEvalEx(Tcl_Interp *interp, const char *script, int numBytes, int flags, int line, int *clNextOuter, const char *outerScript); MODULE_SCOPE int TclEvalScriptTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr, int length, int flags, int line, int* clNextOuter, const char* outerScript); MODULE_SCOPE Tcl_ObjCmdProc TclFileAttrsCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileCopyCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileDeleteCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileLinkCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileMakeDirsCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileReadLinkCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileRenameCmd; MODULE_SCOPE Tcl_ObjCmdProc TclFileTemporaryCmd; MODULE_SCOPE void TclCreateLateExitHandler(Tcl_ExitProc *proc, ClientData clientData); MODULE_SCOPE void TclDeleteLateExitHandler(Tcl_ExitProc *proc, ClientData clientData); MODULE_SCOPE char * TclDStringAppendObj(Tcl_DString *dsPtr, Tcl_Obj *objPtr); MODULE_SCOPE char * TclDStringAppendDString(Tcl_DString *dsPtr, Tcl_DString *toAppendPtr); MODULE_SCOPE Tcl_Obj * TclDStringToObj(Tcl_DString *dsPtr); MODULE_SCOPE void TclFillTableWithExports(Namespace *nsPtr, Tcl_HashTable *hash); MODULE_SCOPE void TclFinalizeAllocSubsystem(void); MODULE_SCOPE void TclFinalizeAsync(void); MODULE_SCOPE void TclFinalizeDoubleConversion(void); MODULE_SCOPE void TclFinalizeEncodingSubsystem(void); MODULE_SCOPE void TclFinalizeEnvironment(void); MODULE_SCOPE void TclFinalizeEvaluation(void); MODULE_SCOPE void TclFinalizeExecution(void); |
| ︙ | ︙ | |||
2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 | const char *modeString, int *seekFlagPtr, int *binaryPtr); MODULE_SCOPE Tcl_Obj * TclGetProcessGlobalValue(ProcessGlobalValue *pgvPtr); MODULE_SCOPE Tcl_Obj * TclGetSourceFromFrame(CmdFrame *cfPtr, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE char * TclGetStringStorage(Tcl_Obj *objPtr, unsigned int *sizePtr); MODULE_SCOPE int TclIncrObj(Tcl_Interp *interp, Tcl_Obj *valuePtr, Tcl_Obj *incrPtr); MODULE_SCOPE Tcl_Obj * TclIncrObjVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *incrPtr, int flags); MODULE_SCOPE int TclInfoExistsCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int TclInfoCoroutineCmd(ClientData dummy, Tcl_Interp *interp, | > > | 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 | const char *modeString, int *seekFlagPtr, int *binaryPtr); MODULE_SCOPE Tcl_Obj * TclGetProcessGlobalValue(ProcessGlobalValue *pgvPtr); MODULE_SCOPE Tcl_Obj * TclGetSourceFromFrame(CmdFrame *cfPtr, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE char * TclGetStringStorage(Tcl_Obj *objPtr, unsigned int *sizePtr); MODULE_SCOPE Tcl_Token *TclGetTokensFromObj(Tcl_Obj *objPtr, Tcl_Token **lastTokenPtrPtr); MODULE_SCOPE int TclIncrObj(Tcl_Interp *interp, Tcl_Obj *valuePtr, Tcl_Obj *incrPtr); MODULE_SCOPE Tcl_Obj * TclIncrObjVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *incrPtr, int flags); MODULE_SCOPE int TclInfoExistsCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int TclInfoCoroutineCmd(ClientData dummy, Tcl_Interp *interp, |
| ︙ | ︙ | |||
2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 | MODULE_SCOPE Tcl_Command TclMakeEnsemble(Tcl_Interp *interp, const char *name, const EnsembleImplMap map[]); MODULE_SCOPE int TclMaxListLength(const char *bytes, int numBytes, const char **endPtr); MODULE_SCOPE int TclMergeReturnOptions(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tcl_Obj **optionsPtrPtr, int *codePtr, int *levelPtr); MODULE_SCOPE Tcl_Obj * TclNoErrorStack(Tcl_Interp *interp, Tcl_Obj *options); MODULE_SCOPE int TclNokia770Doubles(void); MODULE_SCOPE void TclNsDecrRefCount(Namespace *nsPtr); MODULE_SCOPE void TclObjVarErrMsg(Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, const char *operation, const char *reason, int index); MODULE_SCOPE int TclObjInvokeNamespace(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tcl_Namespace *nsPtr, int flags); MODULE_SCOPE int TclObjUnsetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); MODULE_SCOPE int TclParseBackslash(const char *src, int numBytes, int *readPtr, char *dst); MODULE_SCOPE int TclParseHex(const char *src, int numBytes, int *resultPtr); MODULE_SCOPE int TclParseNumber(Tcl_Interp *interp, Tcl_Obj *objPtr, const char *expected, const char *bytes, int numBytes, const char **endPtrPtr, int flags); MODULE_SCOPE void TclParseInit(Tcl_Interp *interp, const char *string, int numBytes, Tcl_Parse *parsePtr); MODULE_SCOPE int TclParseAllWhiteSpace(const char *src, int numBytes); MODULE_SCOPE int TclProcessReturn(Tcl_Interp *interp, int code, int level, Tcl_Obj *returnOpts); MODULE_SCOPE int TclpObjLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf); MODULE_SCOPE Tcl_Obj * TclpTempFileName(void); MODULE_SCOPE Tcl_Obj * TclpTempFileNameForLibrary(Tcl_Interp *interp, Tcl_Obj* pathPtr); MODULE_SCOPE Tcl_Obj * TclNewFSPathObj(Tcl_Obj *dirPtr, const char *addStrRep, | > > > > > > > > > > > > > > > | 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 | MODULE_SCOPE Tcl_Command TclMakeEnsemble(Tcl_Interp *interp, const char *name, const EnsembleImplMap map[]); MODULE_SCOPE int TclMaxListLength(const char *bytes, int numBytes, const char **endPtr); MODULE_SCOPE int TclMergeReturnOptions(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tcl_Obj **optionsPtrPtr, int *codePtr, int *levelPtr); MODULE_SCOPE int TclMSB(size_t n); MODULE_SCOPE Tcl_Obj * TclNoErrorStack(Tcl_Interp *interp, Tcl_Obj *options); MODULE_SCOPE int TclNokia770Doubles(void); MODULE_SCOPE void TclNsDecrRefCount(Namespace *nsPtr); MODULE_SCOPE void TclObjVarErrMsg(Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, const char *operation, const char *reason, int index); MODULE_SCOPE int TclObjInvokeNamespace(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tcl_Namespace *nsPtr, int flags); MODULE_SCOPE int TclObjUnsetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); MODULE_SCOPE int TclParseBackslash(const char *src, int numBytes, int *readPtr, char *dst); MODULE_SCOPE int TclParseCommand(Tcl_Interp *interp, const char *start, int numBytes, int flags, Tcl_Parse *parsePtr); MODULE_SCOPE int TclParseHex(const char *src, int numBytes, int *resultPtr); MODULE_SCOPE int TclParseNumber(Tcl_Interp *interp, Tcl_Obj *objPtr, const char *expected, const char *bytes, int numBytes, const char **endPtrPtr, int flags); MODULE_SCOPE void TclParseInit(Tcl_Interp *interp, const char *string, int numBytes, Tcl_Parse *parsePtr); MODULE_SCOPE int TclParseQuotedString(Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int flags, const char **termPtr); MODULE_SCOPE Tcl_Token *TclParseScript(Tcl_Interp *interp, const char *script, int numBytes, int flags, Tcl_Token **lastTokenPtrPtr, const char **termPtr); MODULE_SCOPE int TclParseScriptSubst(const char *src, int numBytes, Tcl_Parse *parsePtr, int flags); MODULE_SCOPE int TclParseVarName(Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int flags); MODULE_SCOPE int TclParseAllWhiteSpace(const char *src, int numBytes); MODULE_SCOPE int TclProcessReturn(Tcl_Interp *interp, int code, int level, Tcl_Obj *returnOpts); MODULE_SCOPE int TclpObjLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf); MODULE_SCOPE Tcl_Obj * TclpTempFileName(void); MODULE_SCOPE Tcl_Obj * TclpTempFileNameForLibrary(Tcl_Interp *interp, Tcl_Obj* pathPtr); MODULE_SCOPE Tcl_Obj * TclNewFSPathObj(Tcl_Obj *dirPtr, const char *addStrRep, |
| ︙ | ︙ | |||
3071 3072 3073 3074 3075 3076 3077 | MODULE_SCOPE Tcl_Obj * TclStringObjReverse(Tcl_Obj *objPtr); MODULE_SCOPE void TclSubstCompile(Tcl_Interp *interp, const char *bytes, int numBytes, int flags, int line, struct CompileEnv *envPtr); MODULE_SCOPE int TclSubstOptions(Tcl_Interp *interp, int numOpts, Tcl_Obj *const opts[], int *flagPtr); MODULE_SCOPE void TclSubstParse(Tcl_Interp *interp, const char *bytes, | | < | > > | 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 | MODULE_SCOPE Tcl_Obj * TclStringObjReverse(Tcl_Obj *objPtr); MODULE_SCOPE void TclSubstCompile(Tcl_Interp *interp, const char *bytes, int numBytes, int flags, int line, struct CompileEnv *envPtr); MODULE_SCOPE int TclSubstOptions(Tcl_Interp *interp, int numOpts, Tcl_Obj *const opts[], int *flagPtr); MODULE_SCOPE void TclSubstParse(Tcl_Interp *interp, const char *bytes, int numBytes, int flags, Tcl_Parse *parsePtr); MODULE_SCOPE int TclSubstTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr, int count, int *tokensLeftPtr, int line, int* clNextOuter, const char* outerScript, int flags); MODULE_SCOPE Tcl_Obj * TclTokensCopy(Tcl_Obj *objPtr); MODULE_SCOPE int TclTrimLeft(const char *bytes, int numBytes, const char *trim, int numTrim); MODULE_SCOPE int TclTrimRight(const char *bytes, int numBytes, const char *trim, int numTrim); MODULE_SCOPE int TclUtfCasecmp(const char *cs, const char *ct); MODULE_SCOPE Tcl_Obj * TclpNativeToNormalized(ClientData clientData); MODULE_SCOPE Tcl_Obj * TclpFilesystemPathType(Tcl_Obj *pathPtr); |
| ︙ | ︙ | |||
4378 4379 4380 4381 4382 4383 4384 | * counter. The ANSI C "prototype" for this macro is: * * MODULE_SCOPE void TclInvalidateNsCmdLookup(Namespace *nsPtr); *---------------------------------------------------------------- */ #define TclInvalidateNsCmdLookup(nsPtr) \ | | | 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 |
* counter. The ANSI C "prototype" for this macro is:
*
* MODULE_SCOPE void TclInvalidateNsCmdLookup(Namespace *nsPtr);
*----------------------------------------------------------------
*/
#define TclInvalidateNsCmdLookup(nsPtr) \
if ((nsPtr)->exportPatternList) { \
(nsPtr)->exportLookupEpoch++; \
} \
if ((nsPtr)->commandPathLength) { \
(nsPtr)->cmdRefEpoch++; \
}
/*
|
| ︙ | ︙ |
Changes to generic/tclLiteral.c.
| ︙ | ︙ | |||
24 25 26 27 28 29 30 | #define REBUILD_MULTIPLIER 3 /* * Function prototypes for static functions in this file: */ | | | > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | #define REBUILD_MULTIPLIER 3 /* * Function prototypes for static functions in this file: */ static Tcl_Obj * CreateLiteral(Interp *iPtr, char *bytes, int length, int *newPtr, Namespace *nsPtr, int flags, LiteralEntry **globalPtrPtr); static void ExpandLocalLiteralArray(CompileEnv *envPtr); static unsigned HashString(const char *string, int length); #ifdef TCL_COMPILE_DEBUG static LiteralEntry * LookupLiteralEntry(Tcl_Interp *interp, Tcl_Obj *objPtr); #endif static void RebuildLiteralTable(LiteralTable *tablePtr); |
| ︙ | ︙ | |||
152 153 154 155 156 157 158 | * * Find, or if necessary create, an object in the interpreter's literal * table that has a string representation matching the argument * string. If nsPtr!=NULL then only literals stored for the namespace are * considered. * * Results: | | < | > > > > | > > > > | > | | | < < < > > > | > > > > > > > > | | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 |
*
* Find, or if necessary create, an object in the interpreter's literal
* table that has a string representation matching the argument
* string. If nsPtr!=NULL then only literals stored for the namespace are
* considered.
*
* Results:
* The literal object.
*
* Side effects:
* Increments the ref count of the global LiteralEntry since the caller
* now holds a reference. If LITERAL_ON_HEAP is set in flags, this
* function is given ownership of the string: if an object is created
* then its string representation is set directly from string, otherwise
* the string is freed. Typically, a caller sets LITERAL_ON_HEAP if
* "string" is an already heap-allocated buffer holding the result of
* backslash substitutions.
*
*----------------------------------------------------------------------
*/
Tcl_Obj *
TclCreateLiteral(
Interp *iPtr,
char *bytes, /* The start of the string. Note that this is
* not a NUL-terminated string. */
int length) /* Number of bytes in the string. */
{
int new;
return CreateLiteral(iPtr, bytes, length, &new, NULL, 0, NULL);
}
static Tcl_Obj *
CreateLiteral(
Interp *iPtr,
char *bytes, /* The start of the string. Note that this is
* not a NUL-terminated string. */
int length, /* Number of bytes in the string. */
int *newPtr,
Namespace *nsPtr,
int flags,
LiteralEntry **globalPtrPtr)
{
LiteralTable *globalTablePtr = &iPtr->literalTable;
LiteralEntry *globalPtr;
int globalHash;
Tcl_Obj *objPtr;
/*
* Is it in the interpreter's global literal table?
*/
if (length < 0) {
length = strlen(bytes);
}
globalHash = (HashString(bytes, length) & globalTablePtr->mask);
for (globalPtr=globalTablePtr->buckets[globalHash] ; globalPtr!=NULL;
globalPtr = globalPtr->nextPtr) {
objPtr = globalPtr->objPtr;
if ((globalPtr->nsPtr == nsPtr)
&& (objPtr->length == length) && ((length == 0)
|| ((objPtr->bytes[0] == bytes[0])
&& (memcmp(objPtr->bytes, bytes, (unsigned) length) == 0)))) {
/*
* A literal was found: return it
*/
if (newPtr) {
*newPtr = 0;
}
if (flags & LITERAL_ON_HEAP) {
ckfree(bytes);
}
if (globalPtrPtr) {
*globalPtrPtr = globalPtr;
} else {
globalPtr->refCount++;
#ifdef TCL_COMPILE_DEBUG
if (globalPtr->refCount < 1) {
Tcl_Panic("%s: global literal \"%.*s\" had bad refCount %d",
"TclRegisterLiteral", (length>60? 60 : length), bytes,
globalPtr->refCount);
}
#endif
}
return objPtr;
}
}
if (newPtr == NULL) {
if (flags & LITERAL_ON_HEAP) {
ckfree(bytes);
}
return NULL;
}
/*
|
| ︙ | ︙ | |||
293 294 295 296 297 298 299 |
iPtr->stats.totalLitStringBytes += (double) (length + 1);
iPtr->stats.currentLitStringBytes += (double) (length + 1);
iPtr->stats.literalCount[TclLog2(length)]++;
#endif /*TCL_COMPILE_STATS*/
if (globalPtrPtr) {
*globalPtrPtr = globalPtr;
| | | 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 |
iPtr->stats.totalLitStringBytes += (double) (length + 1);
iPtr->stats.currentLitStringBytes += (double) (length + 1);
iPtr->stats.literalCount[TclLog2(length)]++;
#endif /*TCL_COMPILE_STATS*/
if (globalPtrPtr) {
*globalPtrPtr = globalPtr;
}
*newPtr = 1;
return objPtr;
}
/*
*----------------------------------------------------------------------
*
|
| ︙ | ︙ | |||
322 323 324 325 326 327 328 |
* fetch the registered literal value. */
unsigned int index) /* Index of the desired literal, as returned
* by prior call to TclRegisterLiteral() */
{
if (index >= (unsigned int) envPtr->literalArrayNext) {
return NULL;
}
| | | 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 |
* fetch the registered literal value. */
unsigned int index) /* Index of the desired literal, as returned
* by prior call to TclRegisterLiteral() */
{
if (index >= (unsigned int) envPtr->literalArrayNext) {
return NULL;
}
return envPtr->literalArrayPtr[index];
}
/*
*----------------------------------------------------------------------
*
* TclRegisterLiteral --
*
|
| ︙ | ︙ | |||
370 371 372 373 374 375 376 |
* malloc'd bytes and ownership is passed to
* this function. If LITERAL_CMD_NAME then
* the literal should not be shared accross
* namespaces. */
{
CompileEnv *envPtr = ePtr;
Interp *iPtr = envPtr->iPtr;
| < < < < < | | < < < < | < < < < | < < < < < < < < < < < < < < < | | < < | | | | < < | < < < < | | < | > | > > | < < | | < < > > > | 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 |
* malloc'd bytes and ownership is passed to
* this function. If LITERAL_CMD_NAME then
* the literal should not be shared accross
* namespaces. */
{
CompileEnv *envPtr = ePtr;
Interp *iPtr = envPtr->iPtr;
Namespace *nsPtr = NULL;
Tcl_Obj *objPtr;
LiteralEntry *globalPtr;
Tcl_HashEntry *hePtr;
int objIndex, globalNew, new = 0;
/*
* If the literal is a command name, avoid sharing it across namespaces,
* and try not to share it with non-cmd literals. Note that FQ command
* names can be shared, so that we register the namespace as the
* interp's global NS.
*/
if (flags & LITERAL_CMD_NAME) {
if ((length >= 2) && (bytes[0] == ':') && (bytes[1] == ':')) {
nsPtr = iPtr->globalNsPtr;
} else {
nsPtr = iPtr->varFramePtr->nsPtr;
}
}
objPtr = CreateLiteral(iPtr, bytes, length, &globalNew, nsPtr,
flags, &globalPtr);
hePtr = Tcl_CreateHashEntry(&envPtr->litMap, objPtr, &new);
if (new) {
objIndex = TclAddLiteralObj(envPtr, objPtr, NULL);
Tcl_SetHashValue(hePtr, INT2PTR(objIndex));
if (!globalNew) {
globalPtr->refCount++;
}
} else {
objIndex = PTR2INT(Tcl_GetHashValue(hePtr));
}
return objIndex;
}
#ifdef TCL_COMPILE_DEBUG
/*
*----------------------------------------------------------------------
*
|
| ︙ | ︙ | |||
515 516 517 518 519 520 521 |
Tcl_Interp *interp, /* Interpreter for which objPtr was created to
* hold a literal. */
register CompileEnv *envPtr,/* Points to CompileEnv whose literal array
* contains the entry being hidden. */
int index) /* The index of the entry in the literal
* array. */
{
| < < < | > > > > > > | | | < < < < < < < < < < < < < < | < | | | < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 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 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 |
Tcl_Interp *interp, /* Interpreter for which objPtr was created to
* hold a literal. */
register CompileEnv *envPtr,/* Points to CompileEnv whose literal array
* contains the entry being hidden. */
int index) /* The index of the entry in the literal
* array. */
{
Tcl_Obj **lPtr;
Tcl_Obj *newObjPtr;
Tcl_HashEntry *hePtr;
lPtr = &envPtr->literalArrayPtr[index];
/*
* To avoid unwanted sharing we need to copy the object and remove it from
* the local and global literal tables. It still has a slot in the literal
* array so it can be referred to by byte codes, but it will not be
* matched by literal searches.
*/
hePtr = Tcl_FindHashEntry(&envPtr->litMap, *lPtr);
if (hePtr) {
Tcl_DeleteHashEntry(hePtr);
}
newObjPtr = Tcl_DuplicateObj(*lPtr);
Tcl_IncrRefCount(newObjPtr);
TclReleaseLiteral(interp, *lPtr);
*lPtr = newObjPtr;
}
/*
*----------------------------------------------------------------------
*
* TclAddLiteralObj --
*
* Add a single literal object to the literal array. This function does
* not add the literal to the local or global literal tables. The caller
* is expected to add the entry to whatever tables are appropriate.
*
* Results:
* The index in the CompileEnv's literal array that references the
* literal.
*
* Side effects:
* Expands the literal array if necessary. Increments the refcount on the
* literal object.
*
*----------------------------------------------------------------------
*/
int
TclAddLiteralObj(
register CompileEnv *envPtr,/* Points to CompileEnv in whose literal array
* the object is to be inserted. */
Tcl_Obj *objPtr, /* The object to insert into the array. */
LiteralEntry **litPtrPtr) /* UNUSED. Still in place due to publication
* in the internal stubs table, and use by
* tclcompiler. */
{
int objIndex;
if (envPtr->literalArrayNext >= envPtr->literalArrayEnd) {
ExpandLocalLiteralArray(envPtr);
}
objIndex = envPtr->literalArrayNext;
envPtr->literalArrayNext++;
envPtr->literalArrayPtr[objIndex] = objPtr;
Tcl_IncrRefCount(objPtr);
return objIndex;
}
/*
*----------------------------------------------------------------------
*
|
| ︙ | ︙ | |||
707 708 709 710 711 712 713 |
* must be enlarged. */
{
/*
* The current allocated local literal entries are stored between elements
* 0 and (envPtr->literalArrayNext - 1) [inclusive].
*/
| < | | | < < < < < < < < < < < < < < < < < < < < | 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 |
* must be enlarged. */
{
/*
* The current allocated local literal entries are stored between elements
* 0 and (envPtr->literalArrayNext - 1) [inclusive].
*/
int currElems = envPtr->literalArrayNext;
size_t currBytes = (currElems * sizeof(Tcl_Obj *));
Tcl_Obj **currArrayPtr = envPtr->literalArrayPtr;
Tcl_Obj **newArrayPtr;
if (envPtr->mallocedLiteralArray) {
newArrayPtr = ckrealloc(currArrayPtr, 2 * currBytes);
} else {
/*
* envPtr->literalArrayPtr isn't a ckalloc'd pointer, so we must
* code a ckrealloc equivalent for ourselves.
*/
newArrayPtr = ckalloc(2 * currBytes);
memcpy(newArrayPtr, currArrayPtr, currBytes);
envPtr->mallocedLiteralArray = 1;
}
envPtr->literalArrayPtr = newArrayPtr;
envPtr->literalArrayEnd = (2 * currElems);
}
/*
|
| ︙ | ︙ | |||
1004 1005 1006 1007 1008 1009 1010 |
* command literal. */
const char *name, /* Points to the start of the cmd literal
* name. */
Namespace *nsPtr) /* The namespace for which to lookup and
* invalidate a cmd literal. */
{
Interp *iPtr = (Interp *) interp;
| > | | | < | < < < < | 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 |
* command literal. */
const char *name, /* Points to the start of the cmd literal
* name. */
Namespace *nsPtr) /* The namespace for which to lookup and
* invalidate a cmd literal. */
{
Interp *iPtr = (Interp *) interp;
LiteralEntry *globalPtr;
Tcl_Obj *literalObjPtr = CreateLiteral(iPtr, (char *) name, -1,
NULL, nsPtr, 0, &globalPtr);
if (literalObjPtr && (literalObjPtr->typePtr == &tclCmdNameType)) {
TclFreeIntRep(literalObjPtr);
}
}
#ifdef TCL_COMPILE_STATS
/*
*----------------------------------------------------------------------
*
|
| ︙ | ︙ | |||
1114 1115 1116 1117 1118 1119 1120 |
*/
void
TclVerifyLocalLiteralTable(
CompileEnv *envPtr) /* Points to CompileEnv whose literal table is
* to be validated. */
{
| | > | < < < < < < | > | | < | | < | | < > | | | < < < < < < < < < | | 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 |
*/
void
TclVerifyLocalLiteralTable(
CompileEnv *envPtr) /* Points to CompileEnv whose literal table is
* to be validated. */
{
Tcl_HashTable *mapPtr = &envPtr->litMap;
Tcl_HashSearch search;
Tcl_HashEntry *hePtr = Tcl_FirstHashEntry(mapPtr, &search);
while (hePtr) {
Tcl_Obj *objPtr = Tcl_GetHashKey(mapPtr, hePtr);
if (objPtr->bytes == NULL) {
Tcl_Panic("%s: literal has NULL string rep",
"TclVerifyLocalLiteralTable");
}
if (LookupLiteralEntry((Tcl_Interp *) envPtr->iPtr, objPtr) == NULL) {
int length;
const char *bytes = Tcl_GetStringFromObj(objPtr, &length);
Tcl_Panic("%s: local literal \"%.*s\" is not global",
"TclVerifyLocalLiteralTable",
(length>60? 60 : length), bytes);
}
hePtr = Tcl_NextHashEntry(&search);
}
}
/*
*----------------------------------------------------------------------
*
* TclVerifyGlobalLiteralTable --
|
| ︙ | ︙ |
Changes to generic/tclNamesp.c.
| ︙ | ︙ | |||
786 787 788 789 790 791 792 |
nsPtr->nsId = ++(tsdPtr->numNsCreated);
nsPtr->interp = interp;
nsPtr->flags = 0;
nsPtr->activationCount = 0;
nsPtr->refCount = 0;
Tcl_InitHashTable(&nsPtr->cmdTable, TCL_STRING_KEYS);
TclInitVarHashTable(&nsPtr->varTable, nsPtr);
| | < < | 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 |
nsPtr->nsId = ++(tsdPtr->numNsCreated);
nsPtr->interp = interp;
nsPtr->flags = 0;
nsPtr->activationCount = 0;
nsPtr->refCount = 0;
Tcl_InitHashTable(&nsPtr->cmdTable, TCL_STRING_KEYS);
TclInitVarHashTable(&nsPtr->varTable, nsPtr);
nsPtr->exportPatternList = NULL;
nsPtr->cmdRefEpoch = 0;
nsPtr->resolverEpoch = 0;
nsPtr->cmdResProc = NULL;
nsPtr->varResProc = NULL;
nsPtr->compiledVarResProc = NULL;
nsPtr->exportLookupEpoch = 0;
nsPtr->ensembles = NULL;
|
| ︙ | ︙ | |||
1103 1104 1105 1106 1107 1108 1109 |
* and unlinked from its parent. */
{
Interp *iPtr = (Interp *) nsPtr->interp;
register Tcl_HashEntry *entryPtr;
Tcl_HashSearch search;
Tcl_Namespace *childNsPtr;
Tcl_Command cmd;
| < | 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 |
* and unlinked from its parent. */
{
Interp *iPtr = (Interp *) nsPtr->interp;
register Tcl_HashEntry *entryPtr;
Tcl_HashSearch search;
Tcl_Namespace *childNsPtr;
Tcl_Command cmd;
/*
* Start by destroying the namespace's variable table, since variables
* might trigger traces. Variable table should be cleared but not freed!
* TclDeleteNamespaceVars frees it, so we reinitialize it afterwards.
*/
|
| ︙ | ︙ | |||
1198 1199 1200 1201 1202 1203 1204 |
}
#endif
/*
* Free the namespace's export pattern array.
*/
| | < < < | | < < | 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 |
}
#endif
/*
* Free the namespace's export pattern array.
*/
if (nsPtr->exportPatternList != NULL) {
Tcl_DecrRefCount(nsPtr->exportPatternList);
nsPtr->exportPatternList = NULL;
}
/*
* Free any client data associated with the namespace.
*/
if (nsPtr->deleteProc != NULL) {
|
| ︙ | ︙ | |||
1321 1322 1323 1324 1325 1326 1327 |
const char *pattern, /* String pattern indicating which commands to
* export. This pattern may not include any
* namespace qualifiers; only commands in the
* specified namespace may be exported. */
int resetListFirst) /* If nonzero, resets the namespace's export
* list before appending. */
{
| < < < | < < < < < < | | | < | > > | > > | < | < < < < | < < < < < < | < < < | < | < | 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 |
const char *pattern, /* String pattern indicating which commands to
* export. This pattern may not include any
* namespace qualifiers; only commands in the
* specified namespace may be exported. */
int resetListFirst) /* If nonzero, resets the namespace's export
* list before appending. */
{
Namespace *nsPtr, *exportNsPtr, *dummyPtr;
Namespace *currNsPtr = (Namespace *) TclGetCurrentNamespace(interp);
const char *simplePattern;
/*
* If the specified namespace is NULL, use the current namespace.
*/
if (namespacePtr == NULL) {
nsPtr = (Namespace *) currNsPtr;
} else {
nsPtr = (Namespace *) namespacePtr;
}
/*
* If resetListFirst is true (nonzero), clear the namespace's export
* pattern list.
*/
if (resetListFirst && nsPtr->exportPatternList) {
TclInvalidateNsCmdLookup(nsPtr);
Tcl_DecrRefCount(nsPtr->exportPatternList);
nsPtr->exportPatternList = NULL;
}
/*
* Check that the pattern doesn't have namespace qualifiers.
*/
TclGetNamespaceForQualName(interp, pattern, nsPtr, TCL_NAMESPACE_ONLY,
&exportNsPtr, &dummyPtr, &dummyPtr, &simplePattern);
if ((exportNsPtr != nsPtr) || (strcmp(pattern, simplePattern) != 0)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf("invalid export pattern"
" \"%s\": pattern can't specify a namespace", pattern));
Tcl_SetErrorCode(interp, "TCL", "EXPORT", "INVALID", NULL);
return TCL_ERROR;
}
/*
* Make sure that we don't already have the pattern in the array
*/
if (nsPtr->exportPatternList != NULL) {
int objc;
Tcl_Obj **objv;
Tcl_ListObjGetElements(NULL, nsPtr->exportPatternList, &objc, &objv);
while (objc--) {
if (strcmp(pattern, Tcl_GetString(*objv++)) == 0) {
/*
* The pattern already exists in the list.
*/
return TCL_OK;
}
}
} else {
nsPtr->exportPatternList = Tcl_NewObj();
}
/*
* Add the pattern to the namespace's list of export patterns.
*/
Tcl_ListObjAppendElement(NULL, nsPtr->exportPatternList,
Tcl_NewStringObj(pattern, -1));
/*
* The list of commands actually exported from the namespace might have
* changed (probably will have!) However, we do not need to recompute this
* just yet; next time we need the info will be soon enough.
*/
TclInvalidateNsCmdLookup(nsPtr);
return TCL_OK;
}
/*
*----------------------------------------------------------------------
*
* Tcl_AppendExportList --
*
|
| ︙ | ︙ | |||
1453 1454 1455 1456 1457 1458 1459 |
Tcl_Namespace *namespacePtr,/* Points to the namespace whose export
* pattern list is appended onto objPtr. NULL
* for the current namespace. */
Tcl_Obj *objPtr) /* Points to the Tcl object onto which the
* export pattern list is appended. */
{
Namespace *nsPtr;
| < | > > > > | > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > | > | | | > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 |
Tcl_Namespace *namespacePtr,/* Points to the namespace whose export
* pattern list is appended onto objPtr. NULL
* for the current namespace. */
Tcl_Obj *objPtr) /* Points to the Tcl object onto which the
* export pattern list is appended. */
{
Namespace *nsPtr;
/*
* If the specified namespace is NULL, use the current namespace.
*/
if (namespacePtr == NULL) {
nsPtr = (Namespace *) TclGetCurrentNamespace(interp);
} else {
nsPtr = (Namespace *) namespacePtr;
}
/*
* Append the export pattern list onto objPtr.
*/
if (nsPtr->exportPatternList == NULL) {
return TCL_OK;
}
return Tcl_ListObjAppendList(interp, objPtr, nsPtr->exportPatternList);
}
/*
*----------------------------------------------------------------------
*
* TclFillTableWithExports --
*
* Discover what commands are actually exported by *nsPtr.
* What we have is an array of patterns and a hash table whose keys
* are the command names defined in the namespace (the contents do
* not matter here.) We must find out what commands are actually
* exported by filtering each command in the namespace against each of
* the patterns in the export list. Store the exported command
* set in hash, with fully qualified command prefix as value.
*
* Suggestion for future enhancement: compute the unique prefixes and
* place them in the hash too, which should make for even faster
* matching.
*
* Results:
*
* Side effects:
*
*----------------------------------------------------------------------
*/
void
TclFillTableWithExports(
Namespace *nsPtr,
Tcl_HashTable *hash)
{
Tcl_HashSearch search;
Tcl_HashEntry *hPtr;
if (nsPtr->exportPatternList == NULL) {
return;
}
hPtr = Tcl_FirstHashEntry(&nsPtr->cmdTable, &search);
for (; hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
int objc;
Tcl_Obj **objv;
char *nsCmdName = Tcl_GetHashKey(&nsPtr->cmdTable, hPtr);
Tcl_ListObjGetElements(NULL, nsPtr->exportPatternList, &objc, &objv);
while (objc--) {
if (Tcl_StringMatch(nsCmdName, Tcl_GetString(*objv++))) {
int isNew;
Tcl_HashEntry *exportPtr = Tcl_CreateHashEntry(hash,
nsCmdName, &isNew);
/*
* Remember, hash entries have a full reference to the
* substituted part of the command (as a list) as their
* content!
*/
if (isNew) {
Tcl_Obj *cmdObj, *cmdPrefixObj;
TclNewObj(cmdObj);
Tcl_AppendStringsToObj(cmdObj, nsPtr->fullName,
(nsPtr->parentPtr ? "::" : ""), nsCmdName, NULL);
cmdPrefixObj = Tcl_NewListObj(1, &cmdObj);
Tcl_SetHashValue(exportPtr, cmdPrefixObj);
Tcl_IncrRefCount(cmdPrefixObj);
}
break;
}
}
}
}
/*
*----------------------------------------------------------------------
*
* Tcl_Import --
*
|
| ︙ | ︙ | |||
1655 1656 1657 1658 1659 1660 1661 |
Namespace *nsPtr,
Tcl_HashEntry *hPtr,
const char *cmdName,
const char *pattern,
Namespace *importNsPtr,
int allowOverwrite)
{
| | > > > > > > | | < | 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 |
Namespace *nsPtr,
Tcl_HashEntry *hPtr,
const char *cmdName,
const char *pattern,
Namespace *importNsPtr,
int allowOverwrite)
{
int objc, exported = 0;
Tcl_Obj **objv;
Tcl_HashEntry *found;
/*
* The command cmdName in the source namespace matches the pattern. Check
* whether it was exported. If it wasn't, we ignore it.
*/
if (importNsPtr->exportPatternList == NULL) {
return TCL_OK;
}
Tcl_ListObjGetElements(NULL, importNsPtr->exportPatternList, &objc, &objv);
while (!exported && objc--) {
exported |= Tcl_StringMatch(cmdName, Tcl_GetString(*objv++));
}
if (!exported) {
return TCL_OK;
}
/*
* Unless there is a name clash, create an imported command in the current
|
| ︙ | ︙ | |||
3462 3463 3464 3465 3466 3467 3468 |
static int
NamespaceExportCmd(
ClientData dummy, /* Not used. */
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
| > > | > > < | < | > > | | > > > > > > > > > > > > > > > > > > > | | > > > | > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 |
static int
NamespaceExportCmd(
ClientData dummy, /* Not used. */
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* Argument objects. */
{
Namespace *nsPtr;
Tcl_Obj *dict, *value;
int startSize, endSize, firstArg, i, changed = 0;
int code = TCL_OK;
if (objc < 1) {
Tcl_WrongNumArgs(interp, 1, objv, "?-clear? ?pattern pattern...?");
return TCL_ERROR;
}
/*
* If no pattern arguments are given, and "-clear" isn't specified, return
* the namespace's current export pattern list.
*/
nsPtr = (Namespace *) TclGetCurrentNamespace(interp);
if (objc == 1) {
if (nsPtr->exportPatternList) {
Tcl_SetObjResult(interp,
TclListObjCopy(NULL, nsPtr->exportPatternList));
}
return TCL_OK;
}
/*
* Process the optional "-clear" argument.
*/
firstArg = 1;
if (strcmp("-clear", Tcl_GetString(objv[firstArg])) == 0) {
if (nsPtr->exportPatternList) {
Tcl_DecrRefCount(nsPtr->exportPatternList);
nsPtr->exportPatternList = NULL;
changed = 1;
}
firstArg++;
}
/*
* Add each pattern to the namespace's export pattern list.
* Use a dict as a simple way to screen out duplicates.
*/
dict = Tcl_NewDictObj();
value = Tcl_NewObj();
Tcl_IncrRefCount(value);
if (nsPtr->exportPatternList) {
int epc;
Tcl_Obj **epv;
Tcl_ListObjGetElements(NULL, nsPtr->exportPatternList, &epc, &epv);
while (epc--) {
Tcl_DictObjPut(NULL, dict, *epv++, value);
}
}
Tcl_DictObjSize(NULL, dict, &startSize);
for (i = firstArg; i < objc; i++) {
Namespace *exportNsPtr, *dummyPtr;
const char *simplePattern, *pattern = Tcl_GetString(objv[i]);
TclGetNamespaceForQualName(interp, pattern, nsPtr,
TCL_NAMESPACE_ONLY, &exportNsPtr, &dummyPtr, &dummyPtr,
&simplePattern);
if ((exportNsPtr != nsPtr) || (strcmp(pattern, simplePattern) != 0)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf("invalid export pattern"
" \"%s\": pattern can't specify a namespace", pattern));
Tcl_SetErrorCode(interp, "TCL", "EXPORT", "INVALID", NULL);
code = TCL_ERROR;
break;
}
Tcl_DictObjPut(NULL, dict, objv[i], value);
}
Tcl_DictObjSize(NULL, dict, &endSize);
changed |= (endSize > startSize);
if (endSize > startSize) {
int done;
Tcl_Obj *ep;
Tcl_DictSearch search;
if (nsPtr->exportPatternList == NULL) {
nsPtr->exportPatternList = Tcl_NewObj();
Tcl_IncrRefCount(nsPtr->exportPatternList);
}
i = 0;
Tcl_DictObjFirst(NULL, dict, &search, &ep, NULL, &done);
for (; !done; i++, Tcl_DictObjNext(&search, &ep, NULL, &done)) {
if (i < startSize) {
continue;
}
Tcl_ListObjAppendElement(NULL, nsPtr->exportPatternList, ep);
}
Tcl_DictObjDone(&search);
}
Tcl_DecrRefCount(value);
Tcl_DecrRefCount(dict);
if (changed) {
TclInvalidateNsCmdLookup(nsPtr);
}
return code;
}
/*
*----------------------------------------------------------------------
*
* NamespaceForgetCmd --
*
|
| ︙ | ︙ |
Changes to generic/tclOptimize.c.
| ︙ | ︙ | |||
61 62 63 64 65 66 67 |
Tcl_InitHashTable(tablePtr, TCL_ONE_WORD_KEYS);
/*
* The starts of commands represent target addresses.
*/
for (i=0 ; i<envPtr->numCommands ; i++) {
| | < | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 |
Tcl_InitHashTable(tablePtr, TCL_ONE_WORD_KEYS);
/*
* The starts of commands represent target addresses.
*/
for (i=0 ; i<envPtr->numCommands ; i++) {
DefineTargetAddress(tablePtr, TclCmdStartAddress(envPtr, i));
}
/*
* Find places where we should be careful about replacing instructions
* because they are the targets of various types of jumps.
*/
|
| ︙ | ︙ |
Changes to generic/tclParse.c.
| ︙ | ︙ | |||
152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 |
TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL,
TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL,
TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL,
TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL,
TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL,
};
/*
* Prototypes for local functions defined in this file:
*/
static inline int CommandComplete(const char *script, int numBytes);
static int ParseComment(const char *src, int numBytes,
Tcl_Parse *parsePtr);
static int ParseTokens(const char *src, int numBytes, int mask,
int flags, Tcl_Parse *parsePtr);
static int ParseWhiteSpace(const char *src, int numBytes,
int *incompletePtr, char *typePtr);
/*
*----------------------------------------------------------------------
*
* TclParseInit --
*
* Initialize the fields of a Tcl_Parse struct.
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 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 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 |
TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL,
TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL,
TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL,
TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL,
TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL, TYPE_NORMAL,
};
/* Set of parsing error messages */
static const char *parseErrorMsg[] = {
"",
"extra characters after close-quote",
"extra characters after close-brace",
"missing close-brace",
"missing close-bracket",
"missing )",
"missing \"",
"missing close-brace for variable name",
"syntax error in expression",
"bad number in expression"
};
/*
* Prototypes for local functions defined in this file:
*/
static inline int CommandComplete(const char *script, int numBytes);
static int ParseBraces(Tcl_Interp *interp, const char *start,
int numBytes, Tcl_Parse *parsePtr, int flags,
const char **termPtr);
static int ParseComment(const char *src, int numBytes,
Tcl_Parse *parsePtr);
void ParseScript(const char *script, int numBytes,
int flags, Tcl_Parse *parsePtr);
static int ParseTokens(const char *src, int numBytes, int mask,
int flags, Tcl_Parse *parsePtr);
static int ParseWhiteSpace(const char *src, int numBytes,
int *incompletePtr, char *typePtr);
/*
* Prototypes for the Tokens object type.
*/
static void DupTokensInternalRep(Tcl_Obj *objPtr, Tcl_Obj *copyPtr);
static void FreeTokensInternalRep(Tcl_Obj *objPtr);
static int SetTokensFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
static void UpdateStringOfTokens(Tcl_Obj *objPtr);
/*
* The structure below defines the "tokens" Tcl object type.
*/
static Tcl_ObjType tokensType = {
"tokens", /* name */
FreeTokensInternalRep, /* freeIntRepProc */
DupTokensInternalRep, /* dupIntRepProc */
UpdateStringOfTokens, /* updateStringProc */
SetTokensFromAny /* setFromAnyProc */
};
/* Structure to hold the data of the "tokens" internal rep */
typedef struct TokenIntRep {
int refCount;
Tcl_Obj * scriptObjPtr;
Tcl_Token * tokenPtr;
Tcl_Token * lastTokenPtr;
} TokenIntRep;
/*
*----------------------------------------------------------------------
*
* FreeTokensInternalRep --
*
* Frees the resources associated with a tokens object's internal
* representation.
*
* Results:
* None.
*
* Side effects:
* Frees the cached Tcl_Token array.
*
*----------------------------------------------------------------------
*/
static void
FreeTokensInternalRep(objPtr)
Tcl_Obj *objPtr;
{
TokenIntRep *tirPtr = objPtr->internalRep.otherValuePtr;
if (tirPtr->refCount) {
tirPtr->refCount--;
if (tirPtr->refCount == 0) {
/* Only one holder left.
* If it's the original, break the reference cycle. */
if (tirPtr->scriptObjPtr == objPtr) {
/* Make direct change to refCount. Don't call
* Tcl_DecrRefCount() so we avoid freeing the value
* when dropping from refCount 1 to refCount 0.
*/
objPtr->refCount--;
tirPtr->scriptObjPtr = NULL;
}
}
return;
}
if (tirPtr->scriptObjPtr) {
Tcl_DecrRefCount(tirPtr->scriptObjPtr);
}
ckfree(tirPtr->tokenPtr);
ckfree(tirPtr);
}
/*
*----------------------------------------------------------------------
*
* DupTokensInternalRep --
*
* Do not copy the internal Tcl_Token array, because it contains
* pointers into the original string rep. Instead, leave the copied
* Tcl_Obj untyped with only the string value. If the new copied
* value gets used as a script, new parsing will be done to produce
* a new Tcl_Token array intrep tied to the copied string.
*
* Results:
* None.
*
* Side effects:
* None.
*
*----------------------------------------------------------------------
*/
static void
DupTokensInternalRep(srcPtr, dupPtr)
Tcl_Obj *srcPtr; /* Object with internal rep to copy. */
Tcl_Obj *dupPtr; /* Object with internal rep to set. */
{
TokenIntRep *tirPtr = srcPtr->internalRep.otherValuePtr;
if (tirPtr->refCount == 0) {
tirPtr->scriptObjPtr = srcPtr;
Tcl_IncrRefCount(srcPtr);
}
tirPtr->refCount++;
dupPtr->internalRep.otherValuePtr = tirPtr;
dupPtr->typePtr = &tokensType;
return;
}
/*
*----------------------------------------------------------------------
*
* SetTokensFromAny --
*
* Generates an internal representation, an array of Tcl_Token's,
* by parsing the string representation as a Tcl script.
*
* Results:
* Returns TCL_OK. (Parsing always succeeds, in the sense that
* a sequence of Tcl_Token's is always generated. Parse errors
* get represented by a special Tcl_Token type.)
*
* Side effects:
* Frees the old internal representation. Sets the first pointer
* of the twoPtrValue field of the internal rep to a (Tcl_Token *)
* pointing to an array of Tcl_Token's from the parse, and the
* second pointer to point to the last token in the array.
*
*----------------------------------------------------------------------
*/
static int
SetTokensFromAny (interp, objPtr)
Tcl_Interp *interp; /* Not used. */
Tcl_Obj *objPtr; /* Value for which to generate Tcl_Token array by
* parsing the string value */
{
int numBytes;
const char *script = Tcl_GetStringFromObj(objPtr, &numBytes);
TokenIntRep *tirPtr = ckalloc(sizeof(TokenIntRep));
/*
* Free the old internal rep, parse the string as a Tcl script, and
* save the Tcl_Token array as the new internal rep
*/
TclFreeIntRep(objPtr);
tirPtr->tokenPtr = TclParseScript(interp, script, numBytes, 0,
&(tirPtr->lastTokenPtr), NULL);
tirPtr->scriptObjPtr = NULL;
tirPtr->refCount = 0;
objPtr->internalRep.otherValuePtr = tirPtr;
objPtr->typePtr = &tokensType;
return TCL_OK;
}
/*
*----------------------------------------------------------------------
*
* UpdateStringOfTokens --
*
* The Tcl_Obj returned by TclTokensCopy is pure -- it has no valid
* string rep. When we have to have one, this routine generates it.
*
* Results:
* Returns TCL_OK.
*
* Side effects:
* Allocates new string rep to hold copy of the original string
* parsed to make the tokens.
*
*----------------------------------------------------------------------
*/
static void
UpdateStringOfTokens(
Tcl_Obj *objPtr)
{
TokenIntRep *tirPtr = objPtr->internalRep.otherValuePtr;
int length;
char *bytes;
if (tirPtr->scriptObjPtr == NULL) {
Tcl_Panic("Lost scriptObjPtr in tokens value");
}
bytes = Tcl_GetStringFromObj(tirPtr->scriptObjPtr, &length);
TclInitStringRep(objPtr, bytes, length);
}
/*
*----------------------------------------------------------------------
*
* TclTokensCopy --
*
* Make a pure copy of a list value. Cheap operation so caller can
* call TclGetTokensFromObj without fear of shimmering.
*
* Results:
* Returns pointer to new Tcl_Obj with refCount zero.
*
* Side effects:
* None.
*
*----------------------------------------------------------------------
*/
Tcl_Obj *
TclTokensCopy(
Tcl_Obj *objPtr)
{
Tcl_Obj *copyPtr;
if (objPtr->typePtr != &tokensType) {
SetTokensFromAny(NULL, objPtr);
}
TclNewObj(copyPtr);
TclInvalidateStringRep(copyPtr);
DupTokensInternalRep(objPtr, copyPtr);
return copyPtr;
}
/*
*-------------------------------------------------------------------------
*
* TclGetTokensFromObj --
*
* Returns a Tcl_Token sequence derived from parsing a Tcl_Obj.
*
* Results:
* Parses the string rep of the Tcl_Obj, if not already done.
*
* Side effects:
* Initializes the table of defined object types "typeTable" with
* builtin object types defined in this file.
*
*-------------------------------------------------------------------------
*/
Tcl_Token *
TclGetTokensFromObj(objPtr,lastTokenPtrPtr)
Tcl_Obj *objPtr; /* Value to parse and return tokens for */
Tcl_Token **lastTokenPtrPtr; /* If not NULL, fill with pointer to last
* token in the token array */
{
TokenIntRep *tirPtr;
if (objPtr->typePtr != &tokensType) {
SetTokensFromAny(NULL, objPtr);
}
tirPtr = objPtr->internalRep.otherValuePtr;
if (lastTokenPtrPtr != NULL) {
*lastTokenPtrPtr = tirPtr->lastTokenPtr;
}
return tirPtr->tokenPtr;
}
/*
*----------------------------------------------------------------------
*
* TclParseScript --
*
* Results:
*
* Side effects:
*
*----------------------------------------------------------------------
*/
Tcl_Token *
TclParseScript(interp, script, numBytes, flags, lastTokenPtrPtr, termPtr)
Tcl_Interp *interp;
const char *script; /* The string to parse */
int numBytes; /* Length of string in bytes */
int flags; /* Bit flags that control parsing details. */
Tcl_Token **lastTokenPtrPtr;/* Return pointer to last token */
const char **termPtr; /* Return the terminating character in string */
{
Tcl_Parse *parsePtr = TclStackAlloc(interp, sizeof(Tcl_Parse));
Tcl_Token *result;
if (numBytes < 0) {
numBytes = strlen(script);
}
TclParseInit(NULL, script, numBytes, parsePtr);
ParseScript(script, numBytes, flags, parsePtr);
if (termPtr != NULL) {
*termPtr = parsePtr->term;
}
/*
* Note no call to Tcl_FreeParse().
* We'll transfer the tokens to the caller.
*/
if (parsePtr->tokenPtr != parsePtr->staticTokens) {
result = ckrealloc(parsePtr->tokenPtr,
parsePtr->numTokens * sizeof(Tcl_Token));
} else {
result = ckalloc(parsePtr->numTokens * sizeof(Tcl_Token));
memcpy(result, parsePtr->tokenPtr,
(size_t) (parsePtr->numTokens * sizeof(Tcl_Token)));
}
if (lastTokenPtrPtr != NULL) {
*lastTokenPtrPtr = &(result[parsePtr->numTokens - 1]);
}
TclStackFree(interp, parsePtr);
return result;
}
void
ParseScript(script, numBytes, flags, parsePtr)
const char *script; /* The string to parse */
int numBytes; /* Length of string in bytes */
int flags; /* Bit flags that control parsing details. */
Tcl_Parse *parsePtr;
{
const char *p, *end;
int nested = (flags & PARSE_NESTED);
int scriptToken, numValidTokens;
Tcl_Token *scriptTokenPtr;
TclGrowParseTokenArray(parsePtr, 1);
scriptToken = parsePtr->numTokens++;
scriptTokenPtr = &parsePtr->tokenPtr[scriptToken];
scriptTokenPtr->type = TCL_TOKEN_SCRIPT;
scriptTokenPtr->start = script;
scriptTokenPtr->size = numBytes;
scriptTokenPtr->numComponents = 0;
p = script;
end = p + numBytes;
numValidTokens = parsePtr->numTokens;
while (p < end) {
int cmdToken;
Tcl_Token *cmdTokenPtr;
TclGrowParseTokenArray(parsePtr, 1);
cmdToken = parsePtr->numTokens++;
parsePtr->errorType = TCL_PARSE_SUCCESS;
parsePtr->term = parsePtr->end;
if (TCL_OK != TclParseCommand(parsePtr->interp, p, (int) (end - p),
flags | PARSE_APPEND | PARSE_USE_INTERNAL_TOKENS, parsePtr)) {
break;
}
p = parsePtr->commandStart + parsePtr->commandSize;
/*
* Check for missing close-brace for nested script substitution.
* If close-brace is missing, blame it on the last command parsed,
* and do not add it to the token array.
*/
if (nested && (parsePtr->term >= end)) {
break;
}
cmdTokenPtr = &parsePtr->tokenPtr[cmdToken];
cmdTokenPtr->type = TCL_TOKEN_CMD;
cmdTokenPtr->start = parsePtr->commandStart;
if (parsePtr->commandStart + parsePtr->commandSize == parsePtr->term) {
cmdTokenPtr->size = parsePtr->commandSize;
} else {
cmdTokenPtr->size = parsePtr->commandSize - 1;
}
cmdTokenPtr->numComponents = parsePtr->numWords;
scriptTokenPtr = &parsePtr->tokenPtr[scriptToken];
scriptTokenPtr->numComponents++; /* Another command parsed */
numValidTokens = parsePtr->numTokens;
if (nested && (parsePtr->term < end) && (*parsePtr->term == ']')) {
scriptTokenPtr->size = parsePtr->term - scriptTokenPtr->start;
break;
}
}
/* Check all cases that indicate missing ] */
if (nested && (p >= end) && ((parsePtr->term >= parsePtr->end)
|| (*parsePtr->term != ']'))) {
parsePtr->errorType = TCL_PARSE_MISSING_BRACKET;
parsePtr->term = script - 1;
parsePtr->incomplete = 1;
if (parsePtr->interp != NULL) {
Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
parseErrorMsg[parsePtr->errorType], -1));
}
}
parsePtr->numTokens = numValidTokens;
if ((parsePtr->errorType != TCL_PARSE_SUCCESS)) {
int errorToken;
Tcl_Token *errorTokenPtr;
TclGrowParseTokenArray(parsePtr, 1);
errorToken = parsePtr->numTokens++;
errorTokenPtr = &parsePtr->tokenPtr[errorToken];
errorTokenPtr->type = TCL_TOKEN_ERROR;
errorTokenPtr->start = parsePtr->commandStart;
errorTokenPtr->size = parsePtr->term + 1 - parsePtr->commandStart;
errorTokenPtr->numComponents = parsePtr->errorType;
}
}
/*
*----------------------------------------------------------------------
*
* TclParseInit --
*
* Initialize the fields of a Tcl_Parse struct.
|
| ︙ | ︙ | |||
226 227 228 229 230 231 232 233 234 235 236 237 238 239 |
* release any additional space that was allocated.
*
*----------------------------------------------------------------------
*/
int
Tcl_ParseCommand(
Tcl_Interp *interp, /* Interpreter to use for error reporting; if
* NULL, then no error message is provided. */
const char *start, /* First character of string containing one or
* more Tcl commands. */
register int numBytes, /* Total number of bytes in string. If < 0,
* the script consists of all bytes up to the
* first null character. */
| > > > > > > > > > > > > > > > > > > > > | | < | > > > > > | | | | | > | 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 |
* release any additional space that was allocated.
*
*----------------------------------------------------------------------
*/
int
Tcl_ParseCommand(
Tcl_Interp *interp, /* See TclParseCommand */
const char *start, /* See TclParseCommand */
register int numBytes, /* See TclParseCommand */
int nested, /* Non-zero means this is a nested command:
* close bracket should be considered
* a command terminator. If zero, then close
* bracket has no special meaning. */
register Tcl_Parse *parsePtr)
/* See TclParseCommand */
{
int code = TclParseCommand(interp, start, numBytes,
(nested != 0) ? PARSE_NESTED : 0, parsePtr);
if (code == TCL_ERROR) {
Tcl_FreeParse(parsePtr);
}
return code;
}
int
TclParseCommand(
Tcl_Interp *interp, /* Interpreter to use for error reporting; if
* NULL, then no error message is provided. */
const char *start, /* First character of string containing one or
* more Tcl commands. */
register int numBytes, /* Total number of bytes in string. If < 0,
* the script consists of all bytes up to the
* first null character. */
int flags, /* Bit flags to control details of the parsing.
* Only the PARSE_NESTED flag has an effect
* here. Other flags are passed along. */
register Tcl_Parse *parsePtr)
/* Structure to fill in with information about
* the parsed command; any previous
* information in the structure is ignored. */
{
register const char *src; /* Points to current character in the
* command. */
char type; /* Result returned by CHAR_TYPE(*src). */
Tcl_Token *tokenPtr; /* Pointer to token being filled in. */
int wordIndex; /* Index of word token for current word. */
int terminators; /* CHAR_TYPE bits that indicate the end of a
* command. */
const char *termPtr; /* Set by Tcl_ParseBraces/QuotedString to
* point to char after terminating one. */
int scanned;
int nested = (flags & PARSE_NESTED);
int append = (flags & PARSE_APPEND);
const char *commandStart;
int numWords = 0;
if ((start == NULL) && (numBytes != 0)) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"can't parse a NULL pointer", -1));
}
return TCL_ERROR;
}
if (numBytes < 0) {
numBytes = strlen(start);
}
if (!append) {
TclParseInit(interp, start, numBytes, parsePtr);
parsePtr->commentStart = NULL;
parsePtr->commentSize = 0;
parsePtr->commandStart = NULL;
parsePtr->commandSize = 0;
}
if (nested != 0) {
terminators = TYPE_COMMAND_END | TYPE_CLOSE_BRACK;
} else {
terminators = TYPE_COMMAND_END;
}
/*
|
| ︙ | ︙ | |||
293 294 295 296 297 298 299 |
}
/*
* The following loop parses the words of the command, one word in each
* iteration through the loop.
*/
| | | 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 |
}
/*
* The following loop parses the words of the command, one word in each
* iteration through the loop.
*/
commandStart = parsePtr->commandStart = src;
while (1) {
int expandWord = 0;
/*
* Create the token for the word.
*/
|
| ︙ | ︙ | |||
325 326 327 328 329 330 331 |
if ((type & terminators) != 0) {
parsePtr->term = src;
src++;
break;
}
tokenPtr->start = src;
parsePtr->numTokens++;
| | | | | | | 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 |
if ((type & terminators) != 0) {
parsePtr->term = src;
src++;
break;
}
tokenPtr->start = src;
parsePtr->numTokens++;
numWords++;
/*
* At this point the word can have one of four forms: something
* enclosed in quotes, something enclosed in braces, and expanding
* word, or an unquoted word (anything else).
*/
parseWord:
if (*src == '"') {
if (TclParseQuotedString(interp, src, numBytes, parsePtr,
flags | PARSE_APPEND, &termPtr) != TCL_OK) {
goto error;
}
src = termPtr;
numBytes = parsePtr->end - src;
} else if (*src == '{') {
int expIdx = wordIndex + 1;
Tcl_Token *expPtr;
if (ParseBraces(interp, src, numBytes, parsePtr,
flags | PARSE_APPEND, &termPtr) != TCL_OK) {
goto error;
}
src = termPtr;
numBytes = parsePtr->end - src;
/*
* Check whether the braces contained the word expansion prefix
|
| ︙ | ︙ | |||
381 382 383 384 385 386 387 |
} else {
/*
* This is an unquoted word. Call ParseTokens and let it do all of
* the work.
*/
if (ParseTokens(src, numBytes, TYPE_SPACE|terminators,
| | | 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 |
} else {
/*
* This is an unquoted word. Call ParseTokens and let it do all of
* the work.
*/
if (ParseTokens(src, numBytes, TYPE_SPACE|terminators,
flags | TCL_SUBST_ALL, parsePtr) != TCL_OK) {
goto error;
}
src = parsePtr->term;
numBytes = parsePtr->end - src;
}
/*
|
| ︙ | ︙ | |||
476 477 478 479 480 481 482 | /* * We are expanding a literal empty list. This means that * the expanding word completely disappears, leaving no * word generated this pass through the loop. Adjust * accounting appropriately. */ | | | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 |
/*
* We are expanding a literal empty list. This means that
* the expanding word completely disappears, leaving no
* word generated this pass through the loop. Adjust
* accounting appropriately.
*/
numWords--;
parsePtr->numTokens = wordIndex;
} else {
/*
* Recalculate the number of Tcl_Tokens needed to store
* tokens representing the expanded list.
*/
const char *listStart;
int growthNeeded = wordIndex + 2*elemCount
- parsePtr->numTokens;
numWords += elemCount - 1;
if (growthNeeded > 0) {
TclGrowParseTokenArray(parsePtr, growthNeeded);
tokenPtr = &parsePtr->tokenPtr[wordIndex];
}
parsePtr->numTokens = wordIndex + 2*elemCount;
/*
|
| ︙ | ︙ | |||
581 582 583 584 585 586 587 588 589 590 591 |
}
parsePtr->errorType = TCL_PARSE_BRACE_EXTRA;
}
parsePtr->term = src;
goto error;
}
parsePtr->commandSize = src - parsePtr->commandStart;
return TCL_OK;
error:
| > > | > | 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 |
}
parsePtr->errorType = TCL_PARSE_BRACE_EXTRA;
}
parsePtr->term = src;
goto error;
}
parsePtr->numWords = numWords;
parsePtr->commandStart = commandStart;
parsePtr->commandSize = src - parsePtr->commandStart;
return TCL_OK;
error:
parsePtr->numWords = numWords;
parsePtr->commandStart = commandStart;
parsePtr->commandSize = parsePtr->end - parsePtr->commandStart;
return TCL_ERROR;
}
/*
*----------------------------------------------------------------------
*
|
| ︙ | ︙ | |||
1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 |
* termination information. */
{
char type;
int originalTokens;
int noSubstCmds = !(flags & TCL_SUBST_COMMANDS);
int noSubstVars = !(flags & TCL_SUBST_VARIABLES);
int noSubstBS = !(flags & TCL_SUBST_BACKSLASHES);
Tcl_Token *tokenPtr;
/*
* Each iteration through the following loop adds one token of type
* TCL_TOKEN_TEXT, TCL_TOKEN_BS, TCL_TOKEN_COMMAND, or TCL_TOKEN_VARIABLE
* to parsePtr. For TCL_TOKEN_VARIABLE tokens, additional tokens are added
* for the parsed variable name.
| > | 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 |
* termination information. */
{
char type;
int originalTokens;
int noSubstCmds = !(flags & TCL_SUBST_COMMANDS);
int noSubstVars = !(flags & TCL_SUBST_VARIABLES);
int noSubstBS = !(flags & TCL_SUBST_BACKSLASHES);
int useInternalTokens = (flags & PARSE_USE_INTERNAL_TOKENS);
Tcl_Token *tokenPtr;
/*
* Each iteration through the following loop adds one token of type
* TCL_TOKEN_TEXT, TCL_TOKEN_BS, TCL_TOKEN_COMMAND, or TCL_TOKEN_VARIABLE
* to parsePtr. For TCL_TOKEN_VARIABLE tokens, additional tokens are added
* for the parsed variable name.
|
| ︙ | ︙ | |||
1120 1121 1122 1123 1124 1125 1126 | /* * This is a variable reference. Call Tcl_ParseVarName to do all * the dirty work of parsing the name. */ varToken = parsePtr->numTokens; | | | | > | > > > > > > > > > > | | | 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 |
/*
* This is a variable reference. Call Tcl_ParseVarName to do all
* the dirty work of parsing the name.
*/
varToken = parsePtr->numTokens;
if (TclParseVarName(parsePtr->interp, src, numBytes, parsePtr,
flags | PARSE_APPEND) != TCL_OK) {
return TCL_ERROR;
}
src += parsePtr->tokenPtr[varToken].size;
numBytes -= parsePtr->tokenPtr[varToken].size;
} else if (*src == '[') {
Tcl_Parse *nestedPtr;
if (noSubstCmds) {
tokenPtr->type = TCL_TOKEN_TEXT;
tokenPtr->size = 1;
parsePtr->numTokens++;
src++;
numBytes--;
continue;
}
/*
* Command substitution. Call Tcl_ParseCommand recursively (and
* repeatedly) to parse the nested command(s). If internal tokens
* are acceptable, keep all the parsing information; otherwise,
* throw away the nested parse information.
*/
if (useInternalTokens) {
if (TclParseScriptSubst(src, numBytes, parsePtr, flags)
!= TCL_OK) {
return TCL_ERROR;
}
src = parsePtr->term + 1;
numBytes = parsePtr->end - src;
continue;
}
src++;
numBytes--;
nestedPtr = TclStackAlloc(parsePtr->interp, sizeof(Tcl_Parse));
while (1) {
if (TCL_OK != TclParseCommand(parsePtr->interp, src, numBytes,
(flags | PARSE_NESTED) & ~PARSE_APPEND, nestedPtr)) {
parsePtr->errorType = nestedPtr->errorType;
parsePtr->term = nestedPtr->term;
parsePtr->incomplete = nestedPtr->incomplete;
TclStackFree(parsePtr->interp, nestedPtr);
return TCL_ERROR;
}
src = nestedPtr->commandStart + nestedPtr->commandSize;
|
| ︙ | ︙ | |||
1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 |
parsePtr->tokenPtr = parsePtr->staticTokens;
}
}
/*
*----------------------------------------------------------------------
*
* Tcl_ParseVarName --
*
* Given a string starting with a $ sign, parse off a variable name and
* return information about the parse. No more than numBytes bytes will
* be scanned.
*
* Results:
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 |
parsePtr->tokenPtr = parsePtr->staticTokens;
}
}
/*
*----------------------------------------------------------------------
*
* TclParseScriptSubst --
*
* Given a string starting with a [ sign, parse the script substitution
* and return information about the parse. No more than numBytes bytes
* will be scanned.
*
* Results:
*
* Side effects:
*
*----------------------------------------------------------------------
*/
int
TclParseScriptSubst(
const char *src,
register int numBytes,
Tcl_Parse *parsePtr,
int flags)
{
int scriptToken;
Tcl_Token *scriptTokenPtr;
TclGrowParseTokenArray(parsePtr, 1);
scriptToken = parsePtr->numTokens++;
ParseScript(src+1, numBytes-1, flags | PARSE_NESTED, parsePtr);
scriptTokenPtr = &parsePtr->tokenPtr[scriptToken];
scriptTokenPtr->type = TCL_TOKEN_SCRIPT_SUBST;
scriptTokenPtr->start = src;
scriptTokenPtr->size = parsePtr->term - src + 1;
scriptTokenPtr->numComponents = parsePtr->numTokens - scriptToken - 1;
if (parsePtr->errorType != TCL_PARSE_SUCCESS) {
return TCL_ERROR;
}
return TCL_OK;
}
/*
*----------------------------------------------------------------------
*
* Tcl_ParseVarName --
*
* Given a string starting with a $ sign, parse off a variable name and
* return information about the parse. No more than numBytes bytes will
* be scanned.
*
* Results:
|
| ︙ | ︙ | |||
1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 |
* release any additional space that was allocated.
*
*----------------------------------------------------------------------
*/
int
Tcl_ParseVarName(
Tcl_Interp *interp, /* Interpreter to use for error reporting; if
* NULL, then no error message is provided. */
const char *start, /* Start of variable substitution string.
* First character must be "$". */
register int numBytes, /* Total number of bytes in string. If < 0,
* the string consists of all bytes up to the
* first null character. */
Tcl_Parse *parsePtr, /* Structure to fill in with information about
* the variable name. */
| > > > > > > > > > > > > > > > > > > > | | < | > | 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 |
* release any additional space that was allocated.
*
*----------------------------------------------------------------------
*/
int
Tcl_ParseVarName(
Tcl_Interp *interp, /* See TclParseVarName */
const char *start, /* See TclParseVarName */
register int numBytes, /* See TclParseVarName */
Tcl_Parse *parsePtr, /* See TclParseVarName */
int append) /* Non-zero means append tokens to existing
* information in parsePtr; zero means ignore
* existing tokens in parsePtr and reinitialize
* it. */
{
int code = TclParseVarName(interp, start, numBytes, parsePtr,
(append != 0) ? PARSE_APPEND : 0);
if (code == TCL_ERROR) {
Tcl_FreeParse(parsePtr);
}
return code;
}
int
TclParseVarName(
Tcl_Interp *interp, /* Interpreter to use for error reporting; if
* NULL, then no error message is provided. */
const char *start, /* Start of variable substitution string.
* First character must be "$". */
register int numBytes, /* Total number of bytes in string. If < 0,
* the string consists of all bytes up to the
* first null character. */
Tcl_Parse *parsePtr, /* Structure to fill in with information about
* the variable name. */
int flags) /* Bit flags to control details of the parsing.
* Only the PARSE_APPEND flag has an effect
* here. Other flags are passed along. */
{
Tcl_Token *tokenPtr;
register const char *src;
unsigned char c;
int varIndex, offset;
Tcl_UniChar ch;
unsigned array;
int append = (flags & PARSE_APPEND);
if ((numBytes == 0) || (start == NULL)) {
return TCL_ERROR;
}
if (numBytes < 0) {
numBytes = strlen(start);
}
|
| ︙ | ︙ | |||
1472 1473 1474 1475 1476 1477 1478 | /* * This is a reference to an array element. Call ParseTokens * recursively to parse the element name, since it could contain * any number of substitutions. */ if (TCL_OK != ParseTokens(src+1, numBytes-1, TYPE_CLOSE_PAREN, | | | 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 |
/*
* This is a reference to an array element. Call ParseTokens
* recursively to parse the element name, since it could contain
* any number of substitutions.
*/
if (TCL_OK != ParseTokens(src+1, numBytes-1, TYPE_CLOSE_PAREN,
flags | TCL_SUBST_ALL, parsePtr)) {
goto error;
}
if ((parsePtr->term == src+numBytes) || (*parsePtr->term != ')')){
if (parsePtr->interp != NULL) {
Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
"missing )", -1));
}
|
| ︙ | ︙ | |||
1507 1508 1509 1510 1511 1512 1513 |
tokenPtr = &parsePtr->tokenPtr[varIndex];
tokenPtr->type = TCL_TOKEN_TEXT;
tokenPtr->size = 1;
tokenPtr->numComponents = 0;
return TCL_OK;
error:
| > | > > > | 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 |
tokenPtr = &parsePtr->tokenPtr[varIndex];
tokenPtr->type = TCL_TOKEN_TEXT;
tokenPtr->size = 1;
tokenPtr->numComponents = 0;
return TCL_OK;
error:
/* Convert variable substitution token to error token */
tokenPtr = &parsePtr->tokenPtr[varIndex];
tokenPtr->type = TCL_TOKEN_ERROR;
tokenPtr->numComponents = parsePtr->errorType;
tokenPtr->size = parsePtr->term + 1 - tokenPtr->start;
return TCL_ERROR;
}
/*
*----------------------------------------------------------------------
*
* Tcl_ParseVar --
|
| ︙ | ︙ | |||
1545 1546 1547 1548 1549 1550 1551 |
* character just after last one in the
* variable specifier. */
{
register Tcl_Obj *objPtr;
int code;
Tcl_Parse *parsePtr = TclStackAlloc(interp, sizeof(Tcl_Parse));
| | > > | | 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 |
* character just after last one in the
* variable specifier. */
{
register Tcl_Obj *objPtr;
int code;
Tcl_Parse *parsePtr = TclStackAlloc(interp, sizeof(Tcl_Parse));
if (TCL_OK != TclParseVarName(interp, start, -1, parsePtr,
PARSE_USE_INTERNAL_TOKENS)) {
Tcl_FreeParse(parsePtr);
TclStackFree(interp, parsePtr);
return NULL;
}
if (termPtr != NULL) {
*termPtr = start + parsePtr->tokenPtr->size;
}
if (parsePtr->numTokens == 1) {
/*
* There isn't a variable name after all: the $ is just a $.
*/
TclStackFree(interp, parsePtr);
return "$";
}
code = TclSubstTokens(interp, parsePtr->tokenPtr, parsePtr->numTokens,
NULL, 1, NULL, NULL, 0);
Tcl_FreeParse(parsePtr);
TclStackFree(interp, parsePtr);
if (code != TCL_OK) {
return NULL;
}
objPtr = Tcl_GetObjResult(interp);
|
| ︙ | ︙ | |||
1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 |
* release any additional space that was allocated.
*
*----------------------------------------------------------------------
*/
int
Tcl_ParseBraces(
Tcl_Interp *interp, /* Interpreter to use for error reporting; if
* NULL, then no error message is provided. */
const char *start, /* Start of string enclosed in braces. The
* first character must be {'. */
register int numBytes, /* Total number of bytes in string. If < 0,
* the string consists of all bytes up to the
* first null character. */
register Tcl_Parse *parsePtr,
/* Structure to fill in with information about
* the string. */
| > > > > > > > > > > > > > > > > > > > > > > | | < | > | 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 |
* release any additional space that was allocated.
*
*----------------------------------------------------------------------
*/
int
Tcl_ParseBraces(
Tcl_Interp *interp, /* See ParseBraces */
const char *start, /* See ParseBraces */
register int numBytes, /* See ParseBraces */
register Tcl_Parse *parsePtr,
/* See ParseBraces */
int append, /* Non-zero means append tokens to existing
* information in parsePtr; zero means
* ignore existing tokens in parsePtr and
* reinitialize it. */
const char **termPtr) /* See ParseBraces */
{
int code = ParseBraces(interp, start, numBytes, parsePtr,
(append != 0) ? PARSE_APPEND : 0, termPtr);
if (code == TCL_ERROR) {
Tcl_FreeParse(parsePtr);
}
return code;
}
static int
ParseBraces(
Tcl_Interp *interp, /* Interpreter to use for error reporting; if
* NULL, then no error message is provided. */
const char *start, /* Start of string enclosed in braces. The
* first character must be {'. */
register int numBytes, /* Total number of bytes in string. If < 0,
* the string consists of all bytes up to the
* first null character. */
register Tcl_Parse *parsePtr,
/* Structure to fill in with information about
* the string. */
int flags, /* Bit flags to control details of the parsing.
* Only the PARSE_APPEND flag has an effect
* here. Other flags are passed along. */
const char **termPtr) /* If non-NULL, points to word in which to
* store a pointer to the character just after
* the terminating '}' if the parse was
* successful. */
{
Tcl_Token *tokenPtr;
register const char *src;
int startIndex, level, length;
int append = (flags & PARSE_APPEND);
if ((numBytes == 0) || (start == NULL)) {
return TCL_ERROR;
}
if (numBytes < 0) {
numBytes = strlen(start);
}
|
| ︙ | ︙ | |||
1784 1785 1786 1787 1788 1789 1790 |
}
break;
}
}
}
error:
| < | 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 |
}
break;
}
}
}
error:
return TCL_ERROR;
}
/*
*----------------------------------------------------------------------
*
* Tcl_ParseQuotedString --
|
| ︙ | ︙ | |||
1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 |
* release any additional space that was allocated.
*
*----------------------------------------------------------------------
*/
int
Tcl_ParseQuotedString(
Tcl_Interp *interp, /* Interpreter to use for error reporting; if
* NULL, then no error message is provided. */
const char *start, /* Start of the quoted string. The first
* character must be '"'. */
register int numBytes, /* Total number of bytes in string. If < 0,
* the string consists of all bytes up to the
* first null character. */
register Tcl_Parse *parsePtr,
/* Structure to fill in with information about
* the string. */
| > > > > > > > > > > > > > > > > > > > > > | | < | > > | | < | 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 |
* release any additional space that was allocated.
*
*----------------------------------------------------------------------
*/
int
Tcl_ParseQuotedString(
Tcl_Interp *interp, /* See TclParseQuotedString */
const char *start, /* See TclParseQuotedString */
int numBytes, /* See TclParseQuotedString */
Tcl_Parse *parsePtr,
/* See TclParseQuotedString */
int append, /* Non-zero means append tokens to existing
* information in parsePtr; zero means
* ignore existing tokens in parsePtr and
* reinitialize it. */
const char **termPtr) /* See TclParseQuotedString */
{
int code = TclParseQuotedString(interp, start, numBytes, parsePtr,
(append != 0) ? PARSE_APPEND : 0, termPtr);
if (code == TCL_ERROR) {
Tcl_FreeParse(parsePtr);
}
return code;
}
int
TclParseQuotedString(
Tcl_Interp *interp, /* Interpreter to use for error reporting; if
* NULL, then no error message is provided. */
const char *start, /* Start of the quoted string. The first
* character must be '"'. */
register int numBytes, /* Total number of bytes in string. If < 0,
* the string consists of all bytes up to the
* first null character. */
register Tcl_Parse *parsePtr,
/* Structure to fill in with information about
* the string. */
int flags, /* Bit flags to control details of the parsing.
* Only the PARSE_APPEND flag has an effect
* here. Other flags are passed along. */
const char **termPtr) /* If non-NULL, points to word in which to
* store a pointer to the character just after
* the quoted string's terminating close-quote
* if the parse succeeds. */
{
int append = (flags & PARSE_APPEND);
if ((numBytes == 0) || (start == NULL)) {
return TCL_ERROR;
}
if (numBytes < 0) {
numBytes = strlen(start);
}
if (!append) {
TclParseInit(interp, start, numBytes, parsePtr);
}
if (TCL_OK != ParseTokens(start+1, numBytes-1, TYPE_QUOTE,
flags | TCL_SUBST_ALL, parsePtr)) {
goto error;
}
if (*parsePtr->term != '"') {
if (parsePtr->interp != NULL) {
Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
"missing \"", -1));
}
parsePtr->errorType = TCL_PARSE_MISSING_QUOTE;
parsePtr->term = start;
parsePtr->incomplete = 1;
goto error;
}
if (termPtr != NULL) {
*termPtr = (parsePtr->term + 1);
}
return TCL_OK;
error:
return TCL_ERROR;
}
/*
*----------------------------------------------------------------------
*
* TclSubstParse --
|
| ︙ | ︙ | |||
1891 1892 1893 1894 1895 1896 1897 | * None. * * Side effects: * The Tcl_Parse struct '*parsePtr' is filled with parse results. * The caller is expected to eventually call Tcl_FreeParse() to properly * cleanup the value written there. * | < < < < < < | < < < < | | < < < < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 |
* None.
*
* Side effects:
* The Tcl_Parse struct '*parsePtr' is filled with parse results.
* The caller is expected to eventually call Tcl_FreeParse() to properly
* cleanup the value written there.
*
*----------------------------------------------------------------------
*/
void
TclSubstParse(
Tcl_Interp *interp,
const char *bytes,
int numBytes,
int flags,
Tcl_Parse *parsePtr)
{
TclParseInit(interp, bytes, numBytes, parsePtr);
flags &= TCL_SUBST_ALL;
flags |= PARSE_USE_INTERNAL_TOKENS;
ParseTokens(bytes, numBytes, /* mask */ 0, flags, parsePtr);
}
/*
*----------------------------------------------------------------------
*
* TclSubstTokens --
*
|
| ︙ | ︙ | |||
2110 2111 2112 2113 2114 2115 2116 |
int count, /* Number of tokens to consider at tokenPtr.
* Must be at least 1. */
int *tokensLeftPtr, /* If not NULL, points to memory where an
* integer representing the number of tokens
* left to be substituted will be written */
int line, /* The line the script starts on. */
int *clNextOuter, /* Information about an outer context for */
| | > | 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 |
int count, /* Number of tokens to consider at tokenPtr.
* Must be at least 1. */
int *tokensLeftPtr, /* If not NULL, points to memory where an
* integer representing the number of tokens
* left to be substituted will be written */
int line, /* The line the script starts on. */
int *clNextOuter, /* Information about an outer context for */
const char *outerScript, /* continuation line data. This is set by
* EvalEx() to properly handle [...]-nested
* commands. The 'outerScript' refers to the
* most-outer script containing the embedded
* command, which is refered to by 'script'.
* The 'clNextOuter' refers to the current
* entry in the table of continuation lines in
* this "master script", and the character
* offsets are relative to the 'outerScript'
* as well.
*
* If outerScript == script, then this call is
* for words in the outer-most script or
* command. See Tcl_EvalEx and TclEvalObjEx
* for the places generating arguments for
* which this is true. */
int flags)
{
Tcl_Obj *result;
int code = TCL_OK;
#define NUM_STATIC_POS 20
int isLiteral, maxNumCL, numCL, i, adjust;
int *clPosition = NULL;
Interp *iPtr = (Interp *) interp;
|
| ︙ | ︙ | |||
2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 |
numCL++;
}
adjust++;
}
break;
case TCL_TOKEN_COMMAND: {
/* TIP #280: Transfer line information to nested command */
iPtr->numLevels++;
code = TclInterpReady(interp);
if (code == TCL_OK) {
/*
* Test cases: info-30.{6,8,9}
*/
int theline;
TclAdvanceContinuations(&line, &clNextOuter,
tokenPtr->start - outerScript);
theline = line + adjust;
code = TclEvalEx(interp, tokenPtr->start+1, tokenPtr->size-2,
| > > > > > > | | 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 |
numCL++;
}
adjust++;
}
break;
case TCL_TOKEN_COMMAND: {
/*
* This case exists only for the sake of the public routines
* Tcl_EvalTokens(Standard)(). All internal parsing avoids
* generation of the TCL_TOKEN_COMMAND token type.
*/
/* TIP #280: Transfer line information to nested command */
iPtr->numLevels++;
code = TclInterpReady(interp);
if (code == TCL_OK) {
/*
* Test cases: info-30.{6,8,9}
*/
int theline;
TclAdvanceContinuations(&line, &clNextOuter,
tokenPtr->start - outerScript);
theline = line + adjust;
code = TclEvalEx(interp, tokenPtr->start+1, tokenPtr->size-2,
flags, theline, clNextOuter, outerScript);
TclAdvanceLines(&line, tokenPtr->start+1,
tokenPtr->start + tokenPtr->size - 1);
/*
* Restore flag reset by nested eval for future bracketed
* commands and their cmdframe setup
|
| ︙ | ︙ | |||
2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 |
break;
}
case TCL_TOKEN_VARIABLE: {
Tcl_Obj *arrayIndex = NULL;
Tcl_Obj *varName = NULL;
if (tokenPtr->numComponents > 1) {
/*
* Subst the index part of an array variable reference.
*/
code = TclSubstTokens(interp, tokenPtr+2,
| > > > | > | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 |
break;
}
case TCL_TOKEN_VARIABLE: {
Tcl_Obj *arrayIndex = NULL;
Tcl_Obj *varName = NULL;
if (count <= tokenPtr->numComponents) {
Tcl_Panic("token components overflow token array");
}
if (tokenPtr->numComponents > 1) {
/*
* Subst the index part of an array variable reference.
*/
code = TclSubstTokens(interp, tokenPtr+2,
tokenPtr->numComponents - 1, NULL, line, NULL, NULL,
flags);
arrayIndex = Tcl_GetObjResult(interp);
Tcl_IncrRefCount(arrayIndex);
}
if (code == TCL_OK) {
varName = Tcl_NewStringObj(tokenPtr[1].start,
tokenPtr[1].size);
appendObj = Tcl_ObjGetVar2(interp, varName, arrayIndex,
TCL_LEAVE_ERR_MSG |
((flags & TCL_EVAL_GLOBAL) ? TCL_GLOBAL_ONLY : 0));
Tcl_DecrRefCount(varName);
if (appendObj == NULL) {
code = TCL_ERROR;
}
}
switch (code) {
case TCL_OK: /* Got value */
case TCL_ERROR: /* Already have error message */
case TCL_BREAK: /* Will not substitute anyway */
case TCL_CONTINUE: /* Will not substitute anyway */
break;
default:
/*
* All other return codes, we will subst the ulesult from the
* code-throwing evaluation.
*/
appendObj = Tcl_GetObjResult(interp);
}
if (arrayIndex != NULL) {
Tcl_DecrRefCount(arrayIndex);
}
count -= tokenPtr->numComponents;
tokenPtr += tokenPtr->numComponents;
break;
}
case TCL_TOKEN_SCRIPT_SUBST: {
Interp *iPtr = (Interp *) interp;
iPtr->numLevels++;
code = TclInterpReady(interp);
if (code == TCL_OK) {
int theline;
if (count <= tokenPtr->numComponents) {
Tcl_Panic("token components overflow token array");
}
TclAdvanceContinuations (&line, &clNextOuter,
tokenPtr->start - outerScript);
theline = line + adjust;
code = TclEvalScriptTokens(interp, tokenPtr+1,
tokenPtr->numComponents, flags, line,
clNextOuter, outerScript);
TclAdvanceLines(&line, tokenPtr->start+1,
tokenPtr->start + tokenPtr->size - 1);
/*
* Restore flag reset by nested eval for future bracketed
* commands and their cmdframe setup
*/
if (inFile) {
iPtr->evalFlags |= TCL_EVAL_FILE;
}
count -= tokenPtr->numComponents;
tokenPtr += tokenPtr->numComponents;
}
iPtr->numLevels--;
appendObj = Tcl_GetObjResult(interp);
break;
}
case TCL_TOKEN_ERROR:
Tcl_SetResult(interp, (char *)
parseErrorMsg[tokenPtr->numComponents], TCL_STATIC);
code = TCL_ERROR;
break;
default:
Tcl_Panic("unexpected token type in TclSubstTokens: %d",
tokenPtr->type);
}
if ((code == TCL_BREAK) || (code == TCL_CONTINUE)) {
|
| ︙ | ︙ | |||
2416 2417 2418 2419 2420 2421 2422 |
static inline int
CommandComplete(
const char *script, /* Script to check. */
int numBytes) /* Number of bytes in script. */
{
Tcl_Parse parse;
const char *p, *end;
| | > > > > > > > > | | < < < | | < < < < < < | 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 |
static inline int
CommandComplete(
const char *script, /* Script to check. */
int numBytes) /* Number of bytes in script. */
{
Tcl_Parse parse;
const char *p, *end;
/*
* NOTE: This set of routines should not be converted to make use of
* TclParseScript, because [info complete] is defined to operate only
* one parsing level deep, while TclParseScript digs out parsing errors
* in nested script substitutions. See test parse-6.8, etc.
*/
p = script;
end = p + numBytes;
parse.incomplete = 0;
while ((p < end)
&& (Tcl_ParseCommand(NULL, p, end - p, 0, &parse)) == TCL_OK) {
p = parse.commandStart + parse.commandSize;
Tcl_FreeParse(&parse);
}
return (parse.incomplete == 0);
}
/*
*----------------------------------------------------------------------
*
* Tcl_CommandComplete --
*
|
| ︙ | ︙ |
Changes to generic/tclPreserve.c.
| ︙ | ︙ | |||
9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 |
* Copyright (c) 1994-1998 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#include "tclInt.h"
/*
* The following data structure is used to keep track of all the Tcl_Preserve
* calls that are still in effect. It grows as needed to accommodate any
* number of calls in effect.
*/
typedef struct {
ClientData clientData; /* Address of preserved block. */
int refCount; /* Number of Tcl_Preserve calls in effect for
* block. */
| > > < < < < < | | < < | | < < | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 |
* Copyright (c) 1994-1998 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#include "tclInt.h"
#include "tclBrodnik.h"
/*
* The following data structure is used to keep track of all the Tcl_Preserve
* calls that are still in effect. It grows as needed to accommodate any
* number of calls in effect.
*/
typedef struct {
ClientData clientData; /* Address of preserved block. */
Tcl_FreeProc *freeProc; /* Function to call to free. */
int refCount; /* Number of Tcl_Preserve calls in effect for
* block. */
} Reference;
/*
* Global data structures used to hold the list of preserved data references.
* These variables are protected by "preserveMutex".
*/
TclBrodnikArray(Reference);
static BA_Reference *refArray = NULL;
TCL_DECLARE_MUTEX(preserveMutex) /* To protect the refArray */
/*
* The following data structure is used to keep track of whether an arbitrary
* block of memory has been deleted. This is used by the TclHandle code to
* avoid the more time-expensive algorithm of Tcl_Preserve(). This mechanism
* is mainly used when we have lots of references to a few big, expensive
* objects that we don't want to live any longer than necessary.
|
| ︙ | ︙ | |||
84 85 86 87 88 89 90 |
*/
/* ARGSUSED */
void
TclFinalizePreserve(void)
{
Tcl_MutexLock(&preserveMutex);
| | | < < < | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 |
*/
/* ARGSUSED */
void
TclFinalizePreserve(void)
{
Tcl_MutexLock(&preserveMutex);
if (refArray) {
BA_Reference_Destroy(refArray);
}
Tcl_MutexUnlock(&preserveMutex);
}
/*
*----------------------------------------------------------------------
*
|
| ︙ | ︙ | |||
117 118 119 120 121 122 123 |
*/
void
Tcl_Preserve(
ClientData clientData) /* Pointer to malloc'ed block of memory. */
{
Reference *refPtr;
| < > > > > | > > | | | | | < | < < < < | < < < | < | < | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 |
*/
void
Tcl_Preserve(
ClientData clientData) /* Pointer to malloc'ed block of memory. */
{
Reference *refPtr;
/*
* See if there is already a reference for this pointer. If so, just
* increment its reference count.
*/
Tcl_MutexLock(&preserveMutex);
if (refArray == NULL) {
refArray = BA_Reference_Create();
} else {
BP_Reference ptr;
refPtr = BA_Reference_First(refArray, &ptr);
while (refPtr) {
if (refPtr->clientData == clientData) {
refPtr->refCount++;
Tcl_MutexUnlock(&preserveMutex);
return;
}
refPtr = BP_Reference_Next(&ptr);
}
}
/*
* Make a new entry for the new reference.
*/
refPtr = BA_Reference_Append(refArray);
refPtr->clientData = clientData;
refPtr->refCount = 1;
refPtr->freeProc = NULL;
Tcl_MutexUnlock(&preserveMutex);
}
/*
*----------------------------------------------------------------------
*
* Tcl_Release --
|
| ︙ | ︙ | |||
180 181 182 183 184 185 186 |
*/
void
Tcl_Release(
ClientData clientData) /* Pointer to malloc'ed block of memory. */
{
Reference *refPtr;
| | | > > | > > > | < | | < | < < | < | 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 |
*/
void
Tcl_Release(
ClientData clientData) /* Pointer to malloc'ed block of memory. */
{
Reference *refPtr;
BP_Reference ptr;
Tcl_MutexLock(&preserveMutex);
if (refArray == NULL) {
refArray = BA_Reference_Create();
}
for (refPtr = BA_Reference_First(refArray, &ptr); refPtr;
refPtr = BP_Reference_Next(&ptr)) {
Tcl_FreeProc *freeProc;
Reference *lastRefPtr;
if (refPtr->clientData != clientData) {
continue;
}
if (--refPtr->refCount != 0) {
Tcl_MutexUnlock(&preserveMutex);
return;
}
/*
* Must remove information from the slot before calling freeProc to
* avoid reentrancy problems if the freeProc calls Tcl_Preserve on the
* same clientData. Copy down the last reference in the array to
* overwrite the current slot.
*/
freeProc = refPtr->freeProc;
lastRefPtr = BA_Reference_Detach(refArray);
if (refPtr != lastRefPtr) {
*refPtr = *lastRefPtr;
}
/*
* Now committed to disposing the data. But first, we've patched up
* all the global data structures so we should release the mutex now.
* Only then should we dabble around with potentially-slow memory
* managers...
*/
Tcl_MutexUnlock(&preserveMutex);
if (freeProc) {
freeProc(clientData);
}
return;
}
Tcl_MutexUnlock(&preserveMutex);
/*
* Reference not found. This is a bug in the caller.
|
| ︙ | ︙ | |||
260 261 262 263 264 265 266 |
void
Tcl_EventuallyFree(
ClientData clientData, /* Pointer to malloc'ed block of memory. */
Tcl_FreeProc *freeProc) /* Function to actually do free. */
{
Reference *refPtr;
| > | > > | | | > > > | | > | | < < < < | < | 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 |
void
Tcl_EventuallyFree(
ClientData clientData, /* Pointer to malloc'ed block of memory. */
Tcl_FreeProc *freeProc) /* Function to actually do free. */
{
Reference *refPtr;
BP_Reference ptr;
if (freeProc == TCL_DYNAMIC) {
freeProc = Tcl_Free;
}
/*
* See if there is a reference for this pointer. If so, set the freeProc
* to call (it should not be set already!).
*/
Tcl_MutexLock(&preserveMutex);
if (refArray == NULL) {
refArray = BA_Reference_Create();
}
for (refPtr = BA_Reference_First(refArray, &ptr); refPtr;
refPtr = BP_Reference_Next(&ptr)) {
if (refPtr->clientData != clientData) {
continue;
}
if (refPtr->freeProc) {
Tcl_Panic("Tcl_EventuallyFree called twice for %p", clientData);
}
refPtr->freeProc = freeProc;
Tcl_MutexUnlock(&preserveMutex);
return;
}
Tcl_MutexUnlock(&preserveMutex);
/*
* No reference for this block. Free it now.
*/
freeProc(clientData);
}
/*
*---------------------------------------------------------------------------
*
* TclHandleCreate --
*
|
| ︙ | ︙ |
Changes to generic/tclProc.c.
| ︙ | ︙ | |||
1360 1361 1362 1363 1364 1365 1366 |
int localCt = procPtr->numCompiledLocals;
int numArgs = procPtr->numArgs, i = 0;
Tcl_Obj **namePtr;
Var *varPtr;
LocalCache *localCachePtr;
CompiledLocal *localPtr;
| < | | < | 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 |
int localCt = procPtr->numCompiledLocals;
int numArgs = procPtr->numArgs, i = 0;
Tcl_Obj **namePtr;
Var *varPtr;
LocalCache *localCachePtr;
CompiledLocal *localPtr;
/*
* Cache the names and initial values of local variables; store the
* cache in both the framePtr for this execution and in the codePtr
* for future calls.
*/
localCachePtr = ckalloc(sizeof(LocalCache)
+ (localCt - 1) * sizeof(Tcl_Obj *)
+ numArgs * sizeof(Var));
namePtr = &localCachePtr->varName0;
varPtr = (Var *) (namePtr + localCt);
localPtr = procPtr->firstLocalPtr;
while (localPtr) {
if (TclIsVarTemporary(localPtr)) {
*namePtr = NULL;
} else {
*namePtr = TclCreateLiteral(iPtr,
localPtr->name, localPtr->nameLength);
Tcl_IncrRefCount(*namePtr);
}
if (i < numArgs) {
varPtr->flags = (localPtr->flags & VAR_IS_ARGS);
varPtr->value.objPtr = localPtr->defValuePtr;
varPtr++;
|
| ︙ | ︙ |
Changes to generic/tclStrToD.c.
| ︙ | ︙ | |||
1948 1949 1950 1951 1952 1953 1954 | *---------------------------------------------------------------------- * * RequiredPrecision -- * * Determines the number of bits needed to hold an intger. * * Results: | | > > > > > > > > | 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 |
*----------------------------------------------------------------------
*
* RequiredPrecision --
*
* Determines the number of bits needed to hold an intger.
*
* Results:
* Returns the position of the most significant bit (1 - 64), starting
* the counting at 1 for the LSB. (RP(1) -> 1). Returns 0
* if the number is zero.
*
*----------------------------------------------------------------------
*/
static int
RequiredPrecision(
Tcl_WideUInt w) /* Number to interrogate. */
{
int rv;
unsigned long wi;
if (w == 0) {
return 0;
}
if (sizeof(Tcl_WideUInt) <= sizeof(size_t)) {
return 1 + TclMSB(w);
}
if (w & ((Tcl_WideUInt) 0xffffffff << 32)) {
wi = (unsigned long) (w >> 32); rv = 32;
} else {
wi = (unsigned long) w; rv = 0;
}
if (wi & 0xffff0000) {
|
| ︙ | ︙ |
Changes to generic/tclTest.c.
| ︙ | ︙ | |||
285 286 287 288 289 290 291 292 293 294 295 296 297 298 | Tcl_Obj *const objv[]); static int TestmainthreadCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); static int TestsetmainloopCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); static int TestexitmainloopCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); static int TestpanicCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); static int TestparseargsCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); static int TestparserObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); | > > > | 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 | Tcl_Obj *const objv[]); static int TestmainthreadCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); static int TestsetmainloopCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); static int TestexitmainloopCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); static int TestmsbObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); static int TestpanicCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); static int TestparseargsCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); static int TestparserObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); |
| ︙ | ︙ | |||
608 609 610 611 612 613 614 615 616 617 618 619 620 621 |
Tcl_CreateObjCommand(interp, "testgetvarfullname",
TestgetvarfullnameCmd, NULL, NULL);
Tcl_CreateCommand(interp, "testinterpdelete", TestinterpdeleteCmd,
NULL, NULL);
Tcl_CreateCommand(interp, "testlink", TestlinkCmd, NULL, NULL);
Tcl_CreateObjCommand(interp, "testlocale", TestlocaleCmd, NULL,
NULL);
Tcl_CreateCommand(interp, "testpanic", TestpanicCmd, NULL, NULL);
Tcl_CreateObjCommand(interp, "testparseargs", TestparseargsCmd,NULL,NULL);
Tcl_CreateObjCommand(interp, "testparser", TestparserObjCmd,
NULL, NULL);
Tcl_CreateObjCommand(interp, "testparsevar", TestparsevarObjCmd,
NULL, NULL);
Tcl_CreateObjCommand(interp, "testparsevarname", TestparsevarnameObjCmd,
| > | 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 |
Tcl_CreateObjCommand(interp, "testgetvarfullname",
TestgetvarfullnameCmd, NULL, NULL);
Tcl_CreateCommand(interp, "testinterpdelete", TestinterpdeleteCmd,
NULL, NULL);
Tcl_CreateCommand(interp, "testlink", TestlinkCmd, NULL, NULL);
Tcl_CreateObjCommand(interp, "testlocale", TestlocaleCmd, NULL,
NULL);
Tcl_CreateObjCommand(interp, "testmsb", TestmsbObjCmd, NULL, NULL);
Tcl_CreateCommand(interp, "testpanic", TestpanicCmd, NULL, NULL);
Tcl_CreateObjCommand(interp, "testparseargs", TestparseargsCmd,NULL,NULL);
Tcl_CreateObjCommand(interp, "testparser", TestparserObjCmd,
NULL, NULL);
Tcl_CreateObjCommand(interp, "testparsevar", TestparsevarObjCmd,
NULL, NULL);
Tcl_CreateObjCommand(interp, "testparsevarname", TestparsevarnameObjCmd,
|
| ︙ | ︙ | |||
3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 |
static void
CleanupTestSetassocdataTests(
ClientData clientData, /* Data to be released. */
Tcl_Interp *interp) /* Interpreter being deleted. */
{
ckfree(clientData);
}
/*
*----------------------------------------------------------------------
*
* TestparserObjCmd --
*
* This procedure implements the "testparser" command. It is
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 |
static void
CleanupTestSetassocdataTests(
ClientData clientData, /* Data to be released. */
Tcl_Interp *interp) /* Interpreter being deleted. */
{
ckfree(clientData);
}
/*
*----------------------------------------------------------------------
*
* TestmsbObjCmd --
*
* This procedure implements the "testmsb" command. It is
* used for testing the TclMSB() routine.
*
* Results:
* A standard Tcl result.
*
* Side effects:
* None.
*
*----------------------------------------------------------------------
*/
static int
TestmsbObjCmd(
ClientData clientData, /* Not used. */
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
Tcl_Obj *const objv[]) /* The argument objects. */
{
Tcl_WideInt w = 0;
if (objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "integer");
return TCL_ERROR;
}
if (sizeof(Tcl_WideUInt) <= sizeof(size_t)) {
if (TCL_OK != Tcl_GetWideIntFromObj(interp, objv[1], &w)) {
return TCL_ERROR;
}
Tcl_SetObjResult(interp, Tcl_NewIntObj(TclMSB(w)));
} else {
int i;
if (TCL_OK != Tcl_GetIntFromObj(interp, objv[1], &i)) {
return TCL_ERROR;
}
Tcl_SetObjResult(interp, Tcl_NewIntObj(TclMSB(i)));
}
return TCL_OK;
}
/*
*----------------------------------------------------------------------
*
* TestparserObjCmd --
*
* This procedure implements the "testparser" command. It is
|
| ︙ | ︙ |
Added tests/brodnik.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 |
# This file contains a collection of tests for the procedures in the
# file tclBrodnik.c.
#
# Contributions from Don Porter, NIST, 2013. (not subject to US copyright)
#
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
package require Tcl 8.6-
package require tcltest 2
namespace eval ::tcl::test::brodnik {
namespace import ::tcltest::loadTestedCommands
namespace import ::tcltest::testConstraint
namespace import ::tcltest::test
namespace import ::tcltest::cleanupTests
loadTestedCommands
try {package require Tcltest}
testConstraint testmsb [expr {[namespace which -command testmsb] ne {}}]
namespace eval tcl {
namespace eval mathfunc {
proc log2 {i} {
set k 0
while {[set i [expr {$i>>1}]]} {
incr k
}
return $k
}
}
}
# Tests for values with MSB in the low block
variable v 0
while {$v < 1<<8} {
test brodnik-1.$v {TclMSB correctness} testmsb {
testmsb $v
} [expr {int(log2($v))}]
incr v
}
variable i 8
while {$i < 8*$::tcl_platform(pointerSize)} {
variable j -1
while {$j < 2} {
set v [expr {(1<<$i) + $j}]
test brodnik-2.$i.$j {TclMSB correctness} testmsb {
testmsb $v
} [expr {int(log2($v))}]
incr j
}
incr i
}
cleanupTests
}
namespace delete ::tcl::test::brodnik
return
|
Changes to unix/Makefile.in.
| ︙ | ︙ | |||
287 288 289 290 291 292 293 | TCLTEST_OBJS = tclTestInit.o tclTest.o tclTestObj.o tclTestProcBodyObj.o \ tclThreadTest.o tclUnixTest.o XTTEST_OBJS = xtTestInit.o tclTest.o tclTestObj.o tclTestProcBodyObj.o \ tclThreadTest.o tclUnixTest.o tclXtNotify.o tclXtTest.o GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o tclAlloc.o \ | | | | 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 | TCLTEST_OBJS = tclTestInit.o tclTest.o tclTestObj.o tclTestProcBodyObj.o \ tclThreadTest.o tclUnixTest.o XTTEST_OBJS = xtTestInit.o tclTest.o tclTestObj.o tclTestProcBodyObj.o \ tclThreadTest.o tclUnixTest.o tclXtNotify.o tclXtTest.o GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o tclAlloc.o \ tclAssembly.o tclAsync.o tclBasic.o tclBinary.o tclBrodnik.o \ tclCkalloc.o tclClock.o tclCmdAH.o tclCmdIL.o tclCmdMZ.o \ tclCompCmds.o tclCompCmdsGR.o tclCompCmdsSZ.o tclCompExpr.o \ tclCompile.o tclConfig.o tclDate.o tclDictObj.o tclDisassemble.o \ tclEncoding.o tclEnsemble.o \ tclEnv.o tclEvent.o tclExecute.o tclFCmd.o tclFileName.o tclGet.o \ tclHash.o tclHistory.o tclIndexObj.o tclInterp.o tclIO.o tclIOCmd.o \ tclIORChan.o tclIORTrans.o tclIOGT.o tclIOSock.o tclIOUtil.o \ tclLink.o tclListObj.o \ |
| ︙ | ︙ | |||
389 390 391 392 393 394 395 396 397 398 399 400 401 402 | $(GENERIC_DIR)/regfree.c \ $(GENERIC_DIR)/regerror.c \ $(GENERIC_DIR)/tclAlloc.c \ $(GENERIC_DIR)/tclAssembly.c \ $(GENERIC_DIR)/tclAsync.c \ $(GENERIC_DIR)/tclBasic.c \ $(GENERIC_DIR)/tclBinary.c \ $(GENERIC_DIR)/tclCkalloc.c \ $(GENERIC_DIR)/tclClock.c \ $(GENERIC_DIR)/tclCmdAH.c \ $(GENERIC_DIR)/tclCmdIL.c \ $(GENERIC_DIR)/tclCmdMZ.c \ $(GENERIC_DIR)/tclCompCmds.c \ $(GENERIC_DIR)/tclCompCmdsGR.c \ | > | 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 | $(GENERIC_DIR)/regfree.c \ $(GENERIC_DIR)/regerror.c \ $(GENERIC_DIR)/tclAlloc.c \ $(GENERIC_DIR)/tclAssembly.c \ $(GENERIC_DIR)/tclAsync.c \ $(GENERIC_DIR)/tclBasic.c \ $(GENERIC_DIR)/tclBinary.c \ $(GENERIC_DIR)/tclBrodnik.c \ $(GENERIC_DIR)/tclCkalloc.c \ $(GENERIC_DIR)/tclClock.c \ $(GENERIC_DIR)/tclCmdAH.c \ $(GENERIC_DIR)/tclCmdIL.c \ $(GENERIC_DIR)/tclCmdMZ.c \ $(GENERIC_DIR)/tclCompCmds.c \ $(GENERIC_DIR)/tclCompCmdsGR.c \ |
| ︙ | ︙ | |||
1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 | tclBasic.o: $(GENERIC_DIR)/tclBasic.c $(COMPILEHDR) $(MATHHDRS) $(NREHDR) $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBasic.c tclBinary.o: $(GENERIC_DIR)/tclBinary.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBinary.c tclCkalloc.o: $(GENERIC_DIR)/tclCkalloc.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCkalloc.c tclClock.o: $(GENERIC_DIR)/tclClock.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclClock.c tclCmdAH.o: $(GENERIC_DIR)/tclCmdAH.c | > > > | 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 | tclBasic.o: $(GENERIC_DIR)/tclBasic.c $(COMPILEHDR) $(MATHHDRS) $(NREHDR) $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBasic.c tclBinary.o: $(GENERIC_DIR)/tclBinary.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBinary.c tclBrodnik.o: $(GENERIC_DIR)/tclBrodnik.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBrodnik.c tclCkalloc.o: $(GENERIC_DIR)/tclCkalloc.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCkalloc.c tclClock.o: $(GENERIC_DIR)/tclClock.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclClock.c tclCmdAH.o: $(GENERIC_DIR)/tclCmdAH.c |
| ︙ | ︙ |