| ︙ | | |
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
-
+
-
+
+
|
static void DupLambdaInternalRep(Tcl_Obj *objPtr,
Tcl_Obj *copyPtr);
static void FreeLambdaInternalRep(Tcl_Obj *objPtr);
static int InitArgsAndLocals(Tcl_Interp *interp,
Tcl_Obj *procNameObj, int skip);
static int InitArgsWithOptions(Tcl_Interp *interp,
Tcl_Obj *procNameObj, Tcl_Obj *const *argObjs,
int numArgs);
int numArgs, int *errorSet);
static int InitArgWithUpvarSpec(Tcl_Interp *interp,
Var *varArrayPtr, CompiledLocal *localPtr,
ExtendedArgSpec *argSpecPtr, Tcl_Obj *objPtr);
ExtendedArgSpec *argSpecPtr, Tcl_Obj *objPtr,
int *errorSet);
static void InitResolvedLocals(Tcl_Interp *interp,
ByteCode *codePtr, Var *defPtr,
Namespace *nsPtr);
static void InitLocalCache(Proc *procPtr);
static void ProcBodyDup(Tcl_Obj *srcPtr, Tcl_Obj *dupPtr);
static void ProcBodyFree(Tcl_Obj *objPtr);
static int ProcWrongNumArgs(Tcl_Interp *interp, int skip);
|
| ︙ | | |
797
798
799
800
801
802
803
804
805
806
807
808
809
810
|
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
|
+
|
/*
* Handle '-name name'. This create a name group if not
* already created.
*/
if ((localPtr->argSpecPtr != NULL)
&& (localPtr->argSpecPtr->nameLength == 0)
&& (localPtr->argSpecPtr->flags & VAR_UPVAR_ARG)) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-upvar is not allowed before first -name", -1));
goto parseError;
}
length = strlen(fieldValues[i+1]);
|
| ︙ | | |
833
834
835
836
837
838
839
840
841
842
843
844
845
846
|
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
|
+
+
+
+
+
|
* a name group.
*/
if (lastArgSpecPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-name required for -value", -1));
goto parseError;
}
if (lastArgSpecPtr->flags & VAR_UPVAR_ARG) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-upvar and -value are not allowed together", -1));
goto parseError;
}
if (lastArgSpecPtr->valuePtr != NULL) {
Tcl_DecrRefCount(lastArgSpecPtr->valuePtr);
}
lastArgSpecPtr->valuePtr =
Tcl_NewStringObj(fieldValues[i+1], -1);
Tcl_IncrRefCount(lastArgSpecPtr->valuePtr);
|
| ︙ | | |
868
869
870
871
872
873
874
875
876
877
878
879
880
881
|
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
|
+
+
+
+
+
|
localPtr->argSpecPtr = argSpecPtr;
lastArgSpecPtr = argSpecPtr;
} else {
if (lastArgSpecPtr->flags & VAR_UPVAR_ARG) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-upvar has already been set", -1));
goto parseError;
}
if (lastArgSpecPtr->valuePtr != NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"-upvar and -value are not allowed together", -1));
goto parseError;
}
lastArgSpecPtr->flags |= VAR_UPVAR_ARG;
}
length = strlen(fieldValues[i+1]);
if (length > 0) {
upLocalPtr = ckalloc(TclOffset(CompiledLocal, name) + length+1);
|
| ︙ | | |
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
|
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
|
+
|
{
CallFrame *framePtr = ((Interp *)interp)->varFramePtr;
register Proc *procPtr = framePtr->procPtr;
ByteCode *codePtr = procPtr->bodyPtr->internalRep.twoPtrValue.ptr1;
register Var *varPtr, *defPtr;
int localCt = procPtr->numCompiledLocals, numArgs, argCt, i, imax;
Tcl_Obj *const *argObjs;
int errorSet = 0;
/*
* Make sure that the local cache of variable names and initial values has
* been initialised properly .
*/
if (localCt) {
|
| ︙ | | |
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
|
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
|
-
+
+
|
}
}
if ((procPtr->flags & PROC_HAS_EXT_ARG_SPEC) != 0) {
int result;
memset(varPtr, 0, numArgs*sizeof(Var));
result = InitArgsWithOptions(interp, procNameObj, argObjs, argCt);
result = InitArgsWithOptions(interp, procNameObj, argObjs, argCt,
&errorSet);
varPtr += numArgs;
if (result != TCL_OK) {
goto incorrectArgs;
} else {
goto correctArgs;
}
}
|
| ︙ | | |
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
|
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
|
+
+
+
|
incorrectArgs:
if ((skip != 1) &&
TclInitRewriteEnsemble(interp, skip-1, 0, framePtr->objv)) {
TclNRAddCallback(interp, TclClearRootEnsemble, NULL, NULL, NULL, NULL);
}
memset(varPtr, 0,
((framePtr->compiledLocals + localCt)-varPtr) * sizeof(Var));
if (errorSet != 0) {
return TCL_ERROR;
}
return ProcWrongNumArgs(interp, skip);
}
/*
*----------------------------------------------------------------------
*
* InitArgsWithOptions --
|
| ︙ | | |
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
|
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
|
-
+
+
|
static int
InitArgsWithOptions(
register Tcl_Interp *interp,/* Interpreter in which procedure was
* invoked. */
Tcl_Obj *procNameObj, /* Procedure name for error reporting. */
Tcl_Obj *const *argObjs, /* Array of input arguments */
int argCt) /* Number of input arguments */
int argCt, /* Number of input arguments */
int *errorSet) /* Set to 1 if error is set here */
{
CallFrame *framePtr = ((Interp *)interp)->varFramePtr;
register Proc *procPtr = framePtr->procPtr;
register Var *varPtr = framePtr->compiledLocals;
int numArgs = procPtr->numArgs, iLocal, iArg;
Tcl_Obj *objPtr;
CompiledLocal *localPtr, *namedLocalPtr;
|
| ︙ | | |
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
|
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
|
-
+
|
return TCL_ERROR;
} else if (argSpecPtr->valuePtr) {
objPtr = argSpecPtr->valuePtr;
} else if (iArg+1 < argCt) {
objPtr = argObjs[++iArg];
if (argSpecPtr->flags & VAR_UPVAR_ARG) {
result = InitArgWithUpvarSpec(interp, varPtr,
localPtr, argSpecPtr, objPtr);
localPtr, argSpecPtr, objPtr, errorSet);
if (result != TCL_OK) {
return result;
}
continue;
}
} else {
return TCL_ERROR;
|
| ︙ | | |
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
|
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
|
-
+
|
* Set normal or 'upvar' variable using next input argument.
*/
objPtr = argObjs[iArg++];
if ((localPtr->argSpecPtr != NULL)
&& (localPtr->argSpecPtr->flags & VAR_UPVAR_ARG)) {
result = InitArgWithUpvarSpec(interp, varPtr, localPtr,
argSpecPtr, objPtr);
argSpecPtr, objPtr, errorSet);
if (result != TCL_OK) {
return result;
}
} else {
varPtr[iLocal].value.objPtr = objPtr;
Tcl_IncrRefCount(objPtr);
}
|
| ︙ | | |
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
|
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
|
-
+
+
+
+
+
+
+
|
InitArgWithUpvarSpec(
Tcl_Interp *interp, /* Interpreter in which procedure was
* invoked. */
Var *varArrayPtr, /* array of local variables */
CompiledLocal *localPtr, /* related variable */
ExtendedArgSpec *argSpecPtr,
/* related argument specification */
Tcl_Obj *objPtr) /* input object */
Tcl_Obj *objPtr, /* input object */
int *errorSet) /* Set to 1 if error is set here */
{
register Var *varPtr = &(varArrayPtr[localPtr->frameIndex]);
int result;
if (varPtr->value.objPtr != NULL) {
Tcl_DecrRefCount(varPtr->value.objPtr);
varPtr->value.objPtr = NULL;
}
result = Tcl_UpVar(interp, "1", TclGetString(objPtr), localPtr->name, 0);
if (result != TCL_OK) {
return result;
}
if ((varPtr->value.linkPtr == NULL)
|| (varPtr->value.linkPtr->value.objPtr == NULL)) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"wrong args: pass-by-name variable \"%s\" does not exist",
TclGetString(objPtr)));
Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
*errorSet = 1;
return TCL_ERROR;
}
if (localPtr->argSpecPtr->upvarNameIndex >= 0) {
Var *varNamePtr = &(varArrayPtr[localPtr->argSpecPtr->upvarNameIndex]);
if (varNamePtr->value.objPtr) {
Tcl_DecrRefCount(varNamePtr->value.objPtr);
|
| ︙ | | |