Tcl Source Code

Hex Artifact Content
Login

Artifact 903b989a796bf3abf9f33830aca8a49eba8db205:

Attachment "errorstack5.patch" to ticket [2868499fff] added by ferrieux 2009-10-31 23:36:43.
0000: 49 6e 64 65 78 3a 20 67 65 6e 65 72 69 63 2f 74  Index: generic/t
0010: 63 6c 42 61 73 69 63 2e 63 0a 3d 3d 3d 3d 3d 3d  clBasic.c.======
0020: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0030: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0040: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0050: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 0a 52 43  =============.RC
0060: 53 20 66 69 6c 65 3a 20 2f 63 76 73 72 6f 6f 74  S file: /cvsroot
0070: 2f 74 63 6c 2f 74 63 6c 2f 67 65 6e 65 72 69 63  /tcl/tcl/generic
0080: 2f 74 63 6c 42 61 73 69 63 2e 63 2c 76 0a 72 65  /tclBasic.c,v.re
0090: 74 72 69 65 76 69 6e 67 20 72 65 76 69 73 69 6f  trieving revisio
00a0: 6e 20 31 2e 34 30 34 0a 64 69 66 66 20 2d 75 20  n 1.404.diff -u 
00b0: 2d 72 31 2e 34 30 34 20 74 63 6c 42 61 73 69 63  -r1.404 tclBasic
00c0: 2e 63 0a 2d 2d 2d 20 67 65 6e 65 72 69 63 2f 74  .c.--- generic/t
00d0: 63 6c 42 61 73 69 63 2e 63 09 31 31 20 53 65 70  clBasic.c.11 Sep
00e0: 20 32 30 30 39 20 32 30 3a 31 33 3a 32 37 20 2d   2009 20:13:27 -
00f0: 30 30 30 30 09 31 2e 34 30 34 0a 2b 2b 2b 20 67  0000.1.404.+++ g
0100: 65 6e 65 72 69 63 2f 74 63 6c 42 61 73 69 63 2e  eneric/tclBasic.
0110: 63 09 33 31 20 4f 63 74 20 32 30 30 39 20 31 36  c.31 Oct 2009 16
0120: 3a 33 33 3a 31 37 20 2d 30 30 30 30 0a 40 40 20  :33:17 -0000.@@ 
0130: 2d 35 33 30 2c 36 20 2b 35 33 30 2c 39 20 40 40  -530,6 +530,9 @@
0140: 0a 20 20 20 20 20 69 50 74 72 2d 3e 65 72 72 6f  .     iPtr->erro
0150: 72 49 6e 66 6f 20 3d 20 4e 55 4c 4c 3b 0a 20 20  rInfo = NULL;.  
0160: 20 20 20 54 63 6c 4e 65 77 4c 69 74 65 72 61 6c     TclNewLiteral
0170: 53 74 72 69 6e 67 4f 62 6a 28 69 50 74 72 2d 3e  StringObj(iPtr->
0180: 65 69 56 61 72 2c 20 22 3a 3a 65 72 72 6f 72 49  eiVar, "::errorI
0190: 6e 66 6f 22 29 3b 0a 20 20 20 20 20 54 63 6c 5f  nfo");.     Tcl_
01a0: 49 6e 63 72 52 65 66 43 6f 75 6e 74 28 69 50 74  IncrRefCount(iPt
01b0: 72 2d 3e 65 69 56 61 72 29 3b 0a 2b 20 20 20 20  r->eiVar);.+    
01c0: 69 50 74 72 2d 3e 65 72 72 6f 72 53 74 61 63 6b  iPtr->errorStack
01d0: 20 3d 20 54 63 6c 5f 4e 65 77 4c 69 73 74 4f 62   = Tcl_NewListOb
01e0: 6a 28 30 2c 20 4e 55 4c 4c 29 3b 0a 2b 20 20 20  j(0, NULL);.+   
01f0: 20 54 63 6c 5f 49 6e 63 72 52 65 66 43 6f 75 6e   Tcl_IncrRefCoun
0200: 74 28 69 50 74 72 2d 3e 65 72 72 6f 72 53 74 61  t(iPtr->errorSta
0210: 63 6b 29 3b 0a 2b 20 20 20 20 69 50 74 72 2d 3e  ck);.+    iPtr->
0220: 72 65 73 65 74 45 72 72 6f 72 53 74 61 63 6b 20  resetErrorStack 
0230: 3d 20 31 3b 0a 20 20 20 20 20 69 50 74 72 2d 3e  = 1;.     iPtr->
0240: 65 72 72 6f 72 43 6f 64 65 20 3d 20 4e 55 4c 4c  errorCode = NULL
0250: 3b 0a 20 20 20 20 20 54 63 6c 4e 65 77 4c 69 74  ;.     TclNewLit
0260: 65 72 61 6c 53 74 72 69 6e 67 4f 62 6a 28 69 50  eralStringObj(iP
0270: 74 72 2d 3e 65 63 56 61 72 2c 20 22 3a 3a 65 72  tr->ecVar, "::er
0280: 72 6f 72 43 6f 64 65 22 29 3b 0a 20 20 20 20 20  rorCode");.     
0290: 54 63 6c 5f 49 6e 63 72 52 65 66 43 6f 75 6e 74  Tcl_IncrRefCount
02a0: 28 69 50 74 72 2d 3e 65 63 56 61 72 29 3b 0a 40  (iPtr->ecVar);.@
02b0: 40 20 2d 31 34 37 30 2c 36 20 2b 31 34 37 33 2c  @ -1470,6 +1473,
02c0: 37 20 40 40 0a 20 09 54 63 6c 5f 44 65 63 72 52  7 @@. .Tcl_DecrR
02d0: 65 66 43 6f 75 6e 74 28 69 50 74 72 2d 3e 65 72  efCount(iPtr->er
02e0: 72 6f 72 49 6e 66 6f 29 3b 0a 20 09 69 50 74 72  rorInfo);. .iPtr
02f0: 2d 3e 65 72 72 6f 72 49 6e 66 6f 20 3d 20 4e 55  ->errorInfo = NU
0300: 4c 4c 3b 0a 20 20 20 20 20 7d 0a 2b 20 20 20 20  LL;.     }.+    
0310: 54 63 6c 5f 44 65 63 72 52 65 66 43 6f 75 6e 74  Tcl_DecrRefCount
0320: 28 69 50 74 72 2d 3e 65 72 72 6f 72 53 74 61 63  (iPtr->errorStac
0330: 6b 29 3b 0a 20 20 20 20 20 69 66 20 28 69 50 74  k);.     if (iPt
0340: 72 2d 3e 72 65 74 75 72 6e 4f 70 74 73 29 20 7b  r->returnOpts) {
0350: 0a 20 09 54 63 6c 5f 44 65 63 72 52 65 66 43 6f  . .Tcl_DecrRefCo
0360: 75 6e 74 28 69 50 74 72 2d 3e 72 65 74 75 72 6e  unt(iPtr->return
0370: 4f 70 74 73 29 3b 0a 20 20 20 20 20 7d 0a 40 40  Opts);.     }.@@
0380: 20 2d 38 38 32 31 2c 35 20 2b 38 38 32 35 2c 37   -8821,5 +8825,7
0390: 20 40 40 0a 20 20 2a 20 6d 6f 64 65 3a 20 63 0a   @@.  * mode: c.
03a0: 20 20 2a 20 63 2d 62 61 73 69 63 2d 6f 66 66 73    * c-basic-offs
03b0: 65 74 3a 20 34 0a 20 20 2a 20 66 69 6c 6c 2d 63  et: 4.  * fill-c
03c0: 6f 6c 75 6d 6e 3a 20 37 38 0a 2b 20 2a 20 74 61  olumn: 78.+ * ta
03d0: 62 2d 77 69 64 74 68 3a 20 38 0a 2b 20 2a 20 69  b-width: 8.+ * i
03e0: 6e 64 65 6e 74 2d 74 61 62 73 2d 6d 6f 64 65 3a  ndent-tabs-mode:
03f0: 20 6e 69 6c 0a 20 20 2a 20 45 6e 64 3a 0a 20 20   nil.  * End:.  
0400: 2a 2f 0a 49 6e 64 65 78 3a 20 67 65 6e 65 72 69  */.Index: generi
0410: 63 2f 74 63 6c 43 6d 64 49 4c 2e 63 0a 3d 3d 3d  c/tclCmdIL.c.===
0420: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0430: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0440: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0450: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0460: 0a 52 43 53 20 66 69 6c 65 3a 20 2f 63 76 73 72  .RCS file: /cvsr
0470: 6f 6f 74 2f 74 63 6c 2f 74 63 6c 2f 67 65 6e 65  oot/tcl/tcl/gene
0480: 72 69 63 2f 74 63 6c 43 6d 64 49 4c 2e 63 2c 76  ric/tclCmdIL.c,v
0490: 0a 72 65 74 72 69 65 76 69 6e 67 20 72 65 76 69  .retrieving revi
04a0: 73 69 6f 6e 20 31 2e 31 37 31 0a 64 69 66 66 20  sion 1.171.diff 
04b0: 2d 75 20 2d 72 31 2e 31 37 31 20 74 63 6c 43 6d  -u -r1.171 tclCm
04c0: 64 49 4c 2e 63 0a 2d 2d 2d 20 67 65 6e 65 72 69  dIL.c.--- generi
04d0: 63 2f 74 63 6c 43 6d 64 49 4c 2e 63 09 32 30 20  c/tclCmdIL.c.20 
04e0: 41 75 67 20 32 30 30 39 20 31 30 3a 35 36 3a 35  Aug 2009 10:56:5
04f0: 35 20 2d 30 30 30 30 09 31 2e 31 37 31 0a 2b 2b  5 -0000.1.171.++
0500: 2b 20 67 65 6e 65 72 69 63 2f 74 63 6c 43 6d 64  + generic/tclCmd
0510: 49 4c 2e 63 09 33 31 20 4f 63 74 20 32 30 30 39  IL.c.31 Oct 2009
0520: 20 31 36 3a 33 33 3a 32 30 20 2d 30 30 30 30 0a   16:33:20 -0000.
0530: 40 40 20 2d 31 31 38 2c 36 20 2b 31 31 38 2c 39  @@ -118,6 +118,9
0540: 20 40 40 0a 20 09 09 09 20 20 20 20 69 6e 74 20   @@. ...    int 
0550: 6f 62 6a 63 2c 20 54 63 6c 5f 4f 62 6a 20 2a 63  objc, Tcl_Obj *c
0560: 6f 6e 73 74 20 6f 62 6a 76 5b 5d 29 3b 0a 20 73  onst objv[]);. s
0570: 74 61 74 69 63 20 69 6e 74 09 09 49 6e 66 6f 44  tatic int..InfoD
0580: 65 66 61 75 6c 74 43 6d 64 28 43 6c 69 65 6e 74  efaultCmd(Client
0590: 44 61 74 61 20 64 75 6d 6d 79 2c 20 54 63 6c 5f  Data dummy, Tcl_
05a0: 49 6e 74 65 72 70 20 2a 69 6e 74 65 72 70 2c 0a  Interp *interp,.
05b0: 20 09 09 09 20 20 20 20 69 6e 74 20 6f 62 6a 63   ...    int objc
05c0: 2c 20 54 63 6c 5f 4f 62 6a 20 2a 63 6f 6e 73 74  , Tcl_Obj *const
05d0: 20 6f 62 6a 76 5b 5d 29 3b 0a 2b 2f 2a 20 54 49   objv[]);.+/* TI
05e0: 50 20 23 33 34 38 20 2d 20 4e 65 77 20 27 69 6e  P #348 - New 'in
05f0: 66 6f 27 20 73 75 62 63 6f 6d 6d 61 6e 64 20 27  fo' subcommand '
0600: 65 72 72 6f 72 73 74 61 63 6b 27 20 2a 2f 0a 2b  errorstack' */.+
0610: 73 74 61 74 69 63 20 69 6e 74 09 09 49 6e 66 6f  static int..Info
0620: 45 72 72 6f 72 53 74 61 63 6b 43 6d 64 28 43 6c  ErrorStackCmd(Cl
0630: 69 65 6e 74 44 61 74 61 20 64 75 6d 6d 79 2c 20  ientData dummy, 
0640: 54 63 6c 5f 49 6e 74 65 72 70 20 2a 69 6e 74 65  Tcl_Interp *inte
0650: 72 70 2c 0a 2b 09 09 09 20 20 20 20 69 6e 74 20  rp,.+...    int 
0660: 6f 62 6a 63 2c 20 54 63 6c 5f 4f 62 6a 20 2a 63  objc, Tcl_Obj *c
0670: 6f 6e 73 74 20 6f 62 6a 76 5b 5d 29 3b 0a 20 2f  onst objv[]);. /
0680: 2a 20 54 49 50 20 23 32 38 30 20 2d 20 4e 65 77  * TIP #280 - New
0690: 20 27 69 6e 66 6f 27 20 73 75 62 63 6f 6d 6d 61   'info' subcomma
06a0: 6e 64 20 27 66 72 61 6d 65 27 20 2a 2f 0a 20 73  nd 'frame' */. s
06b0: 74 61 74 69 63 20 69 6e 74 09 09 49 6e 66 6f 46  tatic int..InfoF
06c0: 72 61 6d 65 43 6d 64 28 43 6c 69 65 6e 74 44 61  rameCmd(ClientDa
06d0: 74 61 20 64 75 6d 6d 79 2c 20 54 63 6c 5f 49 6e  ta dummy, Tcl_In
06e0: 74 65 72 70 20 2a 69 6e 74 65 72 70 2c 0a 20 09  terp *interp,. .
06f0: 09 09 20 20 20 20 69 6e 74 20 6f 62 6a 63 2c 20  ..    int objc, 
0700: 54 63 6c 5f 4f 62 6a 20 2a 63 6f 6e 73 74 20 6f  Tcl_Obj *const o
0710: 62 6a 76 5b 5d 29 3b 0a 40 40 20 2d 31 36 34 2c  bjv[]);.@@ -164,
0720: 36 20 2b 31 36 37 2c 37 20 40 40 0a 20 20 20 20  6 +167,7 @@.    
0730: 20 7b 22 63 6f 6d 70 6c 65 74 65 22 2c 09 20 20   {"complete",.  
0740: 20 49 6e 66 6f 43 6f 6d 70 6c 65 74 65 43 6d 64   InfoCompleteCmd
0750: 2c 09 20 20 20 20 4e 55 4c 4c 7d 2c 0a 20 20 20  ,.    NULL},.   
0760: 20 20 7b 22 63 6f 72 6f 75 74 69 6e 65 22 2c 09    {"coroutine",.
0770: 20 20 20 54 63 6c 49 6e 66 6f 43 6f 72 6f 75 74     TclInfoCorout
0780: 69 6e 65 43 6d 64 2c 20 20 20 20 20 4e 55 4c 4c  ineCmd,     NULL
0790: 7d 2c 0a 20 20 20 20 20 7b 22 64 65 66 61 75 6c  },.     {"defaul
07a0: 74 22 2c 09 09 20 20 20 49 6e 66 6f 44 65 66 61  t",..   InfoDefa
07b0: 75 6c 74 43 6d 64 2c 09 20 20 20 20 4e 55 4c 4c  ultCmd,.    NULL
07c0: 7d 2c 0a 2b 20 20 20 20 7b 22 65 72 72 6f 72 73  },.+    {"errors
07d0: 74 61 63 6b 22 2c 09 20 20 20 49 6e 66 6f 45 72  tack",.   InfoEr
07e0: 72 6f 72 53 74 61 63 6b 43 6d 64 2c 09 20 20 20  rorStackCmd,.   
07f0: 20 4e 55 4c 4c 7d 2c 0a 20 20 20 20 20 7b 22 65   NULL},.     {"e
0800: 78 69 73 74 73 22 2c 09 09 20 20 20 54 63 6c 49  xists",..   TclI
0810: 6e 66 6f 45 78 69 73 74 73 43 6d 64 2c 09 20 20  nfoExistsCmd,.  
0820: 20 20 54 63 6c 43 6f 6d 70 69 6c 65 49 6e 66 6f    TclCompileInfo
0830: 45 78 69 73 74 73 43 6d 64 7d 2c 0a 20 20 20 20  ExistsCmd},.    
0840: 20 7b 22 66 72 61 6d 65 22 2c 09 09 20 20 20 49   {"frame",..   I
0850: 6e 66 6f 46 72 61 6d 65 43 6d 64 2c 09 20 20 20  nfoFrameCmd,.   
0860: 20 4e 55 4c 4c 7d 2c 0a 20 20 20 20 20 7b 22 66   NULL},.     {"f
0870: 75 6e 63 74 69 6f 6e 73 22 2c 09 20 20 20 49 6e  unctions",.   In
0880: 66 6f 46 75 6e 63 74 69 6f 6e 73 43 6d 64 2c 09  foFunctionsCmd,.
0890: 20 20 20 20 4e 55 4c 4c 7d 2c 0a 40 40 20 2d 31      NULL},.@@ -1
08a0: 30 31 37 2c 36 20 2b 31 30 32 31 2c 35 35 20 40  017,6 +1021,55 @
08b0: 40 0a 20 2f 2a 0a 20 20 2a 2d 2d 2d 2d 2d 2d 2d  @. /*.  *-------
08c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
08d0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
08e0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
08f0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a  ---------------.
0900: 20 20 2a 0a 2b 20 2a 20 49 6e 66 6f 45 72 72 6f    *.+ * InfoErro
0910: 72 53 74 61 63 6b 43 6d 64 20 2d 2d 0a 2b 20 2a  rStackCmd --.+ *
0920: 0a 2b 20 2a 09 43 61 6c 6c 65 64 20 74 6f 20 69  .+ *.Called to i
0930: 6d 70 6c 65 6d 65 6e 74 20 74 68 65 20 22 69 6e  mplement the "in
0940: 66 6f 20 65 72 72 6f 72 73 74 61 63 6b 22 20 63  fo errorstack" c
0950: 6f 6d 6d 61 6e 64 20 74 68 61 74 20 72 65 74 75  ommand that retu
0960: 72 6e 73 20 69 6e 66 6f 72 6d 61 74 69 6f 6e 0a  rns information.
0970: 2b 20 2a 09 61 62 6f 75 74 20 74 68 65 20 6c 61  + *.about the la
0980: 73 74 20 65 72 72 6f 72 27 73 20 63 61 6c 6c 20  st error's call 
0990: 73 74 61 63 6b 2e 20 48 61 6e 64 6c 65 73 20 74  stack. Handles t
09a0: 68 65 20 66 6f 6c 6c 6f 77 69 6e 67 20 73 79 6e  he following syn
09b0: 74 61 78 3a 0a 2b 20 2a 0a 2b 20 2a 09 20 20 20  tax:.+ *.+ *.   
09c0: 20 69 6e 66 6f 20 65 72 72 6f 72 73 74 61 63 6b   info errorstack
09d0: 20 3f 69 6e 74 65 72 70 3f 0a 2b 20 2a 0a 2b 20   ?interp?.+ *.+ 
09e0: 2a 20 52 65 73 75 6c 74 73 3a 0a 2b 20 2a 09 52  * Results:.+ *.R
09f0: 65 74 75 72 6e 73 20 54 43 4c 5f 4f 4b 20 69 66  eturns TCL_OK if
0a00: 20 73 75 63 63 65 73 73 66 75 6c 20 61 6e 64 20   successful and 
0a10: 54 43 4c 5f 45 52 52 4f 52 20 69 66 20 74 68 65  TCL_ERROR if the
0a20: 72 65 20 69 73 20 61 6e 20 65 72 72 6f 72 2e 0a  re is an error..
0a30: 2b 20 2a 0a 2b 20 2a 20 53 69 64 65 20 65 66 66  + *.+ * Side eff
0a40: 65 63 74 73 3a 0a 2b 20 2a 09 52 65 74 75 72 6e  ects:.+ *.Return
0a50: 73 20 61 20 72 65 73 75 6c 74 20 69 6e 20 74 68  s a result in th
0a60: 65 20 69 6e 74 65 72 70 72 65 74 65 72 27 73 20  e interpreter's 
0a70: 72 65 73 75 6c 74 20 6f 62 6a 65 63 74 2e 20 49  result object. I
0a80: 66 20 74 68 65 72 65 20 69 73 20 61 6e 0a 2b 20  f there is an.+ 
0a90: 2a 09 65 72 72 6f 72 2c 20 74 68 65 20 72 65 73  *.error, the res
0aa0: 75 6c 74 20 69 73 20 61 6e 20 65 72 72 6f 72 20  ult is an error 
0ab0: 6d 65 73 73 61 67 65 2e 0a 2b 20 2a 0a 2b 20 2a  message..+ *.+ *
0ac0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0ad0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0ae0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0af0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0b00: 2d 2d 2d 2d 2d 2d 0a 2b 20 2a 2f 0a 2b 0a 2b 73  ------.+ */.+.+s
0b10: 74 61 74 69 63 20 69 6e 74 0a 2b 49 6e 66 6f 45  tatic int.+InfoE
0b20: 72 72 6f 72 53 74 61 63 6b 43 6d 64 28 0a 2b 20  rrorStackCmd(.+ 
0b30: 20 20 20 43 6c 69 65 6e 74 44 61 74 61 20 64 75     ClientData du
0b40: 6d 6d 79 2c 09 09 2f 2a 20 4e 6f 74 20 75 73 65  mmy,../* Not use
0b50: 64 2e 20 2a 2f 0a 2b 20 20 20 20 54 63 6c 5f 49  d. */.+    Tcl_I
0b60: 6e 74 65 72 70 20 2a 69 6e 74 65 72 70 2c 09 09  nterp *interp,..
0b70: 2f 2a 20 43 75 72 72 65 6e 74 20 69 6e 74 65 72  /* Current inter
0b80: 70 72 65 74 65 72 2e 20 2a 2f 0a 2b 20 20 20 20  preter. */.+    
0b90: 69 6e 74 20 6f 62 6a 63 2c 09 09 09 2f 2a 20 4e  int objc,.../* N
0ba0: 75 6d 62 65 72 20 6f 66 20 61 72 67 75 6d 65 6e  umber of argumen
0bb0: 74 73 2e 20 2a 2f 0a 2b 20 20 20 20 54 63 6c 5f  ts. */.+    Tcl_
0bc0: 4f 62 6a 20 2a 63 6f 6e 73 74 20 6f 62 6a 76 5b  Obj *const objv[
0bd0: 5d 29 09 2f 2a 20 41 72 67 75 6d 65 6e 74 20 6f  ])./* Argument o
0be0: 62 6a 65 63 74 73 2e 20 2a 2f 0a 2b 7b 0a 2b 20  bjects. */.+{.+ 
0bf0: 20 20 20 54 63 6c 5f 49 6e 74 65 72 70 20 2a 74     Tcl_Interp *t
0c00: 61 72 67 65 74 3b 0a 2b 20 20 20 20 49 6e 74 65  arget;.+    Inte
0c10: 72 70 20 2a 69 50 74 72 3b 0a 2b 0a 2b 20 20 20  rp *iPtr;.+.+   
0c20: 20 69 66 20 28 28 6f 62 6a 63 20 21 3d 20 31 29   if ((objc != 1)
0c30: 20 26 26 20 28 6f 62 6a 63 20 21 3d 20 32 29 29   && (objc != 2))
0c40: 20 7b 0a 2b 09 54 63 6c 5f 57 72 6f 6e 67 4e 75   {.+.Tcl_WrongNu
0c50: 6d 41 72 67 73 28 69 6e 74 65 72 70 2c 20 31 2c  mArgs(interp, 1,
0c60: 20 6f 62 6a 76 2c 20 22 3f 69 6e 74 65 72 70 3f   objv, "?interp?
0c70: 22 29 3b 0a 2b 09 72 65 74 75 72 6e 20 54 43 4c  ");.+.return TCL
0c80: 5f 45 52 52 4f 52 3b 0a 2b 20 20 20 20 7d 0a 2b  _ERROR;.+    }.+
0c90: 20 20 20 20 0a 2b 20 20 20 20 74 61 72 67 65 74      .+    target
0ca0: 20 3d 20 69 6e 74 65 72 70 3b 0a 2b 20 20 20 20   = interp;.+    
0cb0: 69 66 20 28 6f 62 6a 63 20 3d 3d 20 32 29 20 7b  if (objc == 2) {
0cc0: 0a 2b 20 20 20 20 20 20 20 20 74 61 72 67 65 74  .+        target
0cd0: 20 3d 20 54 63 6c 5f 47 65 74 53 6c 61 76 65 28   = Tcl_GetSlave(
0ce0: 69 6e 74 65 72 70 2c 20 54 63 6c 5f 47 65 74 53  interp, Tcl_GetS
0cf0: 74 72 69 6e 67 28 6f 62 6a 76 5b 31 5d 29 29 3b  tring(objv[1]));
0d00: 0a 2b 20 20 20 20 20 20 20 20 69 66 20 28 74 61  .+        if (ta
0d10: 72 67 65 74 20 3d 3d 20 4e 55 4c 4c 29 20 7b 0a  rget == NULL) {.
0d20: 2b 20 20 20 20 20 20 20 20 20 20 20 20 72 65 74  +            ret
0d30: 75 72 6e 20 54 43 4c 5f 45 52 52 4f 52 3b 0a 2b  urn TCL_ERROR;.+
0d40: 20 20 20 20 20 20 20 20 7d 0a 2b 20 20 20 20 7d          }.+    }
0d50: 0a 2b 0a 2b 20 20 20 20 69 50 74 72 20 3d 20 28  .+.+    iPtr = (
0d60: 49 6e 74 65 72 70 20 2a 29 20 74 61 72 67 65 74  Interp *) target
0d70: 3b 0a 2b 20 20 20 20 54 63 6c 5f 53 65 74 4f 62  ;.+    Tcl_SetOb
0d80: 6a 52 65 73 75 6c 74 28 69 6e 74 65 72 70 2c 20  jResult(interp, 
0d90: 69 50 74 72 2d 3e 65 72 72 6f 72 53 74 61 63 6b  iPtr->errorStack
0da0: 29 3b 0a 2b 20 20 20 20 0a 2b 20 20 20 20 72 65  );.+    .+    re
0db0: 74 75 72 6e 20 54 43 4c 5f 4f 4b 3b 0a 2b 7d 0a  turn TCL_OK;.+}.
0dc0: 2b 0c 0a 2b 2f 2a 0a 2b 20 2a 2d 2d 2d 2d 2d 2d  +..+/*.+ *------
0dd0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0de0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0df0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0e00: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0e10: 0a 2b 20 2a 0a 20 20 2a 20 54 63 6c 49 6e 66 6f  .+ *.  * TclInfo
0e20: 45 78 69 73 74 73 43 6d 64 20 2d 2d 0a 20 20 2a  ExistsCmd --.  *
0e30: 0a 20 20 2a 09 43 61 6c 6c 65 64 20 74 6f 20 69  .  *.Called to i
0e40: 6d 70 6c 65 6d 65 6e 74 20 74 68 65 20 22 69 6e  mplement the "in
0e50: 66 6f 20 65 78 69 73 74 73 22 20 63 6f 6d 6d 61  fo exists" comma
0e60: 6e 64 20 74 68 61 74 20 64 65 74 65 72 6d 69 6e  nd that determin
0e70: 65 73 20 77 68 65 74 68 65 72 0a 40 40 20 2d 34  es whether.@@ -4
0e80: 33 38 38 2c 35 20 2b 34 34 34 31 2c 37 20 40 40  388,5 +4441,7 @@
0e90: 0a 20 20 2a 20 6d 6f 64 65 3a 20 63 0a 20 20 2a  .  * mode: c.  *
0ea0: 20 63 2d 62 61 73 69 63 2d 6f 66 66 73 65 74 3a   c-basic-offset:
0eb0: 20 34 0a 20 20 2a 20 66 69 6c 6c 2d 63 6f 6c 75   4.  * fill-colu
0ec0: 6d 6e 3a 20 37 38 0a 2b 20 2a 20 74 61 62 2d 77  mn: 78.+ * tab-w
0ed0: 69 64 74 68 3a 20 38 0a 2b 20 2a 20 69 6e 64 65  idth: 8.+ * inde
0ee0: 6e 74 2d 74 61 62 73 2d 6d 6f 64 65 3a 20 6e 69  nt-tabs-mode: ni
0ef0: 6c 0a 20 20 2a 20 45 6e 64 3a 0a 20 20 2a 2f 0a  l.  * End:.  */.
0f00: 49 6e 64 65 78 3a 20 67 65 6e 65 72 69 63 2f 74  Index: generic/t
0f10: 63 6c 49 6e 74 2e 68 0a 3d 3d 3d 3d 3d 3d 3d 3d  clInt.h.========
0f20: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0f30: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0f40: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0f50: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 0a 52 43 53 20  ===========.RCS 
0f60: 66 69 6c 65 3a 20 2f 63 76 73 72 6f 6f 74 2f 74  file: /cvsroot/t
0f70: 63 6c 2f 74 63 6c 2f 67 65 6e 65 72 69 63 2f 74  cl/tcl/generic/t
0f80: 63 6c 49 6e 74 2e 68 2c 76 0a 72 65 74 72 69 65  clInt.h,v.retrie
0f90: 76 69 6e 67 20 72 65 76 69 73 69 6f 6e 20 31 2e  ving revision 1.
0fa0: 34 34 35 0a 64 69 66 66 20 2d 75 20 2d 72 31 2e  445.diff -u -r1.
0fb0: 34 34 35 20 74 63 6c 49 6e 74 2e 68 0a 2d 2d 2d  445 tclInt.h.---
0fc0: 20 67 65 6e 65 72 69 63 2f 74 63 6c 49 6e 74 2e   generic/tclInt.
0fd0: 68 09 33 30 20 53 65 70 20 32 30 30 39 20 30 33  h.30 Sep 2009 03
0fe0: 3a 31 31 3a 32 36 20 2d 30 30 30 30 09 31 2e 34  :11:26 -0000.1.4
0ff0: 34 35 0a 2b 2b 2b 20 67 65 6e 65 72 69 63 2f 74  45.+++ generic/t
1000: 63 6c 49 6e 74 2e 68 09 33 31 20 4f 63 74 20 32  clInt.h.31 Oct 2
1010: 30 30 39 20 31 36 3a 33 33 3a 32 35 20 2d 30 30  009 16:33:25 -00
1020: 30 30 0a 40 40 20 2d 31 38 39 35 2c 36 20 2b 31  00.@@ -1895,6 +1
1030: 38 39 35 2c 38 20 40 40 0a 20 20 20 20 20 54 63  895,8 @@.     Tc
1040: 6c 5f 4f 62 6a 20 2a 65 69 56 61 72 3b 09 09 2f  l_Obj *eiVar;../
1050: 2a 20 63 61 63 68 65 64 20 72 65 66 20 74 6f 20  * cached ref to 
1060: 3a 3a 65 72 72 6f 72 49 6e 66 6f 20 76 61 72 69  ::errorInfo vari
1070: 61 62 6c 65 2e 20 2a 2f 0a 20 20 20 20 20 54 63  able. */.     Tc
1080: 6c 5f 4f 62 6a 20 2a 65 72 72 6f 72 43 6f 64 65  l_Obj *errorCode
1090: 3b 09 09 2f 2a 20 65 72 72 6f 72 43 6f 64 65 20  ;../* errorCode 
10a0: 76 61 6c 75 65 20 28 6e 6f 77 20 61 73 20 61 20  value (now as a 
10b0: 54 63 6c 5f 4f 62 6a 29 2e 20 2a 2f 0a 20 20 20  Tcl_Obj). */.   
10c0: 20 20 54 63 6c 5f 4f 62 6a 20 2a 65 63 56 61 72    Tcl_Obj *ecVar
10d0: 3b 09 09 2f 2a 20 63 61 63 68 65 64 20 72 65 66  ;../* cached ref
10e0: 20 74 6f 20 3a 3a 65 72 72 6f 72 49 6e 66 6f 20   to ::errorInfo 
10f0: 76 61 72 69 61 62 6c 65 2e 20 2a 2f 0a 2b 20 20  variable. */.+  
1100: 20 20 54 63 6c 5f 4f 62 6a 20 2a 65 72 72 6f 72    Tcl_Obj *error
1110: 53 74 61 63 6b 3b 09 2f 2a 20 3a 3a 74 63 6c 3a  Stack;./* ::tcl:
1120: 3a 65 72 72 6f 72 53 74 61 63 6b 20 76 61 6c 75  :errorStack valu
1130: 65 20 28 61 73 20 61 20 54 63 6c 5f 4f 62 6a 29  e (as a Tcl_Obj)
1140: 2e 20 2a 2f 0a 2b 20 20 20 20 69 6e 74 20 72 65  . */.+    int re
1150: 73 65 74 45 72 72 6f 72 53 74 61 63 6b 3b 20 20  setErrorStack;  
1160: 20 20 20 20 20 20 2f 2a 20 63 6f 6e 74 72 6f 6c        /* control
1170: 73 20 63 6c 65 61 6e 69 6e 67 20 75 70 20 6f 66  s cleaning up of
1180: 20 3a 3a 65 72 72 6f 72 53 74 61 63 6b 20 2a 2f   ::errorStack */
1190: 0a 20 20 20 20 20 69 6e 74 20 72 65 74 75 72 6e  .     int return
11a0: 4c 65 76 65 6c 3b 09 09 2f 2a 20 5b 72 65 74 75  Level;../* [retu
11b0: 72 6e 20 2d 6c 65 76 65 6c 5d 20 70 61 72 61 6d  rn -level] param
11c0: 65 74 65 72 2e 20 2a 2f 0a 20 0a 20 20 20 20 20  eter. */. .     
11d0: 2f 2a 0a 49 6e 64 65 78 3a 20 67 65 6e 65 72 69  /*.Index: generi
11e0: 63 2f 74 63 6c 4e 61 6d 65 73 70 2e 63 0a 3d 3d  c/tclNamesp.c.==
11f0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
1200: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
1210: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
1220: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
1230: 3d 0a 52 43 53 20 66 69 6c 65 3a 20 2f 63 76 73  =.RCS file: /cvs
1240: 72 6f 6f 74 2f 74 63 6c 2f 74 63 6c 2f 67 65 6e  root/tcl/tcl/gen
1250: 65 72 69 63 2f 74 63 6c 4e 61 6d 65 73 70 2e 63  eric/tclNamesp.c
1260: 2c 76 0a 72 65 74 72 69 65 76 69 6e 67 20 72 65  ,v.retrieving re
1270: 76 69 73 69 6f 6e 20 31 2e 31 39 33 0a 64 69 66  vision 1.193.dif
1280: 66 20 2d 75 20 2d 72 31 2e 31 39 33 20 74 63 6c  f -u -r1.193 tcl
1290: 4e 61 6d 65 73 70 2e 63 0a 2d 2d 2d 20 67 65 6e  Namesp.c.--- gen
12a0: 65 72 69 63 2f 74 63 6c 4e 61 6d 65 73 70 2e 63  eric/tclNamesp.c
12b0: 09 33 30 20 53 65 70 20 32 30 30 39 20 30 33 3a  .30 Sep 2009 03:
12c0: 31 31 3a 32 36 20 2d 30 30 30 30 09 31 2e 31 39  11:26 -0000.1.19
12d0: 33 0a 2b 2b 2b 20 67 65 6e 65 72 69 63 2f 74 63  3.+++ generic/tc
12e0: 6c 4e 61 6d 65 73 70 2e 63 09 33 31 20 4f 63 74  lNamesp.c.31 Oct
12f0: 20 32 30 30 39 20 31 36 3a 33 33 3a 33 35 20 2d   2009 16:33:35 -
1300: 30 30 30 30 0a 40 40 20 2d 37 35 37 34 2c 37 20  0000.@@ -7574,7 
1310: 2b 37 35 37 34 2c 37 20 40 40 0a 20 7b 0a 20 20  +7574,7 @@. {.  
1320: 20 20 20 72 65 67 69 73 74 65 72 20 63 6f 6e 73     register cons
1330: 74 20 63 68 61 72 20 2a 70 3b 0a 20 20 20 20 20  t char *p;.     
1340: 49 6e 74 65 72 70 20 2a 69 50 74 72 20 3d 20 28  Interp *iPtr = (
1350: 49 6e 74 65 72 70 20 2a 29 20 69 6e 74 65 72 70  Interp *) interp
1360: 3b 0a 2d 20 20 20 20 69 6e 74 20 6f 76 65 72 66  ;.-    int overf
1370: 6c 6f 77 2c 20 6c 69 6d 69 74 20 3d 20 31 35 30  low, limit = 150
1380: 3b 0a 2b 20 20 20 20 69 6e 74 20 6f 76 65 72 66  ;.+    int overf
1390: 6c 6f 77 2c 20 6c 69 6d 69 74 20 3d 20 31 35 30  low, limit = 150
13a0: 2c 20 6c 65 6e 3b 0a 20 20 20 20 20 56 61 72 20  , len;.     Var 
13b0: 2a 76 61 72 50 74 72 2c 20 2a 61 72 72 61 79 50  *varPtr, *arrayP
13c0: 74 72 3b 0a 20 0a 20 20 20 20 20 69 66 20 28 69  tr;. .     if (i
13d0: 50 74 72 2d 3e 66 6c 61 67 73 20 26 20 45 52 52  Ptr->flags & ERR
13e0: 5f 41 4c 52 45 41 44 59 5f 4c 4f 47 47 45 44 29  _ALREADY_LOGGED)
13f0: 20 7b 0a 40 40 20 2d 37 36 33 33 2c 36 20 2b 37   {.@@ -7633,6 +7
1400: 36 33 33 2c 33 36 20 40 40 0a 20 09 09 20 20 20  633,36 @@. ..   
1410: 20 54 43 4c 5f 47 4c 4f 42 41 4c 5f 4f 4e 4c 59   TCL_GLOBAL_ONLY
1420: 29 3b 0a 20 09 7d 0a 20 20 20 20 20 7d 0a 2b 0a  );. .}.     }.+.
1430: 2b 20 20 20 20 2f 2a 0a 2b 20 20 20 20 20 2a 20  +    /*.+     * 
1440: 54 49 50 20 23 33 34 38 0a 2b 20 20 20 20 20 2a  TIP #348.+     *
1450: 2f 0a 2b 0a 2b 20 20 20 20 69 66 20 28 54 63 6c  /.+.+    if (Tcl
1460: 5f 49 73 53 68 61 72 65 64 28 69 50 74 72 2d 3e  _IsShared(iPtr->
1470: 65 72 72 6f 72 53 74 61 63 6b 29 29 20 7b 0a 2b  errorStack)) {.+
1480: 20 20 20 20 20 20 20 20 54 63 6c 5f 4f 62 6a 20          Tcl_Obj 
1490: 2a 6e 65 77 4f 62 6a 3b 0a 2b 20 20 20 20 20 20  *newObj;.+      
14a0: 20 20 20 20 20 20 0a 2b 20 20 20 20 20 20 20 20        .+        
14b0: 6e 65 77 4f 62 6a 20 3d 20 54 63 6c 5f 44 75 70  newObj = Tcl_Dup
14c0: 6c 69 63 61 74 65 4f 62 6a 28 69 50 74 72 2d 3e  licateObj(iPtr->
14d0: 65 72 72 6f 72 53 74 61 63 6b 29 3b 0a 2b 20 20  errorStack);.+  
14e0: 20 20 20 20 20 20 54 63 6c 5f 44 65 63 72 52 65        Tcl_DecrRe
14f0: 66 43 6f 75 6e 74 28 69 50 74 72 2d 3e 65 72 72  fCount(iPtr->err
1500: 6f 72 53 74 61 63 6b 29 3b 0a 2b 20 20 20 20 20  orStack);.+     
1510: 20 20 20 54 63 6c 5f 49 6e 63 72 52 65 66 43 6f     Tcl_IncrRefCo
1520: 75 6e 74 28 6e 65 77 4f 62 6a 29 3b 0a 2b 20 20  unt(newObj);.+  
1530: 20 20 20 20 20 20 69 50 74 72 2d 3e 65 72 72 6f        iPtr->erro
1540: 72 53 74 61 63 6b 20 3d 20 6e 65 77 4f 62 6a 3b  rStack = newObj;
1550: 0a 2b 20 20 20 20 7d 0a 2b 20 20 20 20 54 63 6c  .+    }.+    Tcl
1560: 5f 4c 69 73 74 4f 62 6a 4c 65 6e 67 74 68 28 69  _ListObjLength(i
1570: 6e 74 65 72 70 2c 20 69 50 74 72 2d 3e 65 72 72  nterp, iPtr->err
1580: 6f 72 53 74 61 63 6b 2c 20 26 6c 65 6e 29 3b 0a  orStack, &len);.
1590: 2b 20 20 20 20 69 66 20 28 69 50 74 72 2d 3e 72  +    if (iPtr->r
15a0: 65 73 65 74 45 72 72 6f 72 53 74 61 63 6b 29 20  esetErrorStack) 
15b0: 7b 0a 2b 20 20 20 20 20 20 20 20 69 50 74 72 2d  {.+        iPtr-
15c0: 3e 72 65 73 65 74 45 72 72 6f 72 53 74 61 63 6b  >resetErrorStack
15d0: 20 3d 20 30 3b 0a 2b 20 20 20 20 20 20 20 20 2f   = 0;.+        /
15e0: 2a 20 72 65 73 65 74 20 77 68 69 6c 65 20 6b 65  * reset while ke
15f0: 65 70 69 6e 67 20 74 68 65 20 6c 69 73 74 20 69  eping the list i
1600: 6e 74 72 65 70 20 61 73 20 6d 75 63 68 20 61 73  ntrep as much as
1610: 20 70 6f 73 73 69 62 6c 65 20 2a 2f 0a 2b 20 20   possible */.+  
1620: 20 20 20 20 20 20 54 63 6c 5f 4c 69 73 74 4f 62        Tcl_ListOb
1630: 6a 52 65 70 6c 61 63 65 28 69 6e 74 65 72 70 2c  jReplace(interp,
1640: 20 69 50 74 72 2d 3e 65 72 72 6f 72 53 74 61 63   iPtr->errorStac
1650: 6b 2c 20 30 2c 20 6c 65 6e 2c 20 30 2c 20 4e 55  k, 0, len, 0, NU
1660: 4c 4c 29 3b 0a 2b 20 20 20 20 20 20 20 20 6c 65  LL);.+        le
1670: 6e 3d 30 3b 0a 2b 20 20 20 20 7d 20 0a 2b 20 20  n=0;.+    } .+  
1680: 20 20 69 66 20 28 69 50 74 72 2d 3e 76 61 72 46    if (iPtr->varF
1690: 72 61 6d 65 50 74 72 20 21 3d 20 69 50 74 72 2d  ramePtr != iPtr-
16a0: 3e 72 6f 6f 74 46 72 61 6d 65 50 74 72 29 20 7b  >rootFramePtr) {
16b0: 0a 2b 20 20 20 20 20 20 20 20 54 63 6c 5f 4f 62  .+        Tcl_Ob
16c0: 6a 20 2a 6c 69 73 74 50 74 72 3b 0a 2b 20 20 20  j *listPtr;.+   
16d0: 20 20 20 20 20 69 6e 74 20 72 65 73 75 6c 74 3b       int result;
16e0: 0a 2b 20 20 20 20 20 20 20 20 6c 69 73 74 50 74  .+        listPt
16f0: 72 3d 54 63 6c 5f 4e 65 77 4c 69 73 74 4f 62 6a  r=Tcl_NewListObj
1700: 28 69 50 74 72 2d 3e 76 61 72 46 72 61 6d 65 50  (iPtr->varFrameP
1710: 74 72 2d 3e 6f 62 6a 63 2c 0a 2b 20 20 20 20 20  tr->objc,.+     
1720: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20                  
1730: 20 20 20 20 20 20 20 20 20 20 69 50 74 72 2d 3e            iPtr->
1740: 76 61 72 46 72 61 6d 65 50 74 72 2d 3e 6f 62 6a  varFramePtr->obj
1750: 76 29 3b 0a 2b 20 20 20 20 20 20 20 20 72 65 73  v);.+        res
1760: 75 6c 74 20 3d 20 54 63 6c 5f 4c 69 73 74 4f 62  ult = Tcl_ListOb
1770: 6a 52 65 70 6c 61 63 65 28 69 6e 74 65 72 70 2c  jReplace(interp,
1780: 20 69 50 74 72 2d 3e 65 72 72 6f 72 53 74 61 63   iPtr->errorStac
1790: 6b 2c 20 6c 65 6e 2c 20 30 2c 20 31 2c 20 26 6c  k, len, 0, 1, &l
17a0: 69 73 74 50 74 72 29 3b 0a 2b 20 20 20 20 20 20  istPtr);.+      
17b0: 20 20 69 66 20 28 72 65 73 75 6c 74 20 21 3d 20    if (result != 
17c0: 54 43 4c 5f 4f 4b 29 20 7b 0a 2b 20 20 20 20 20  TCL_OK) {.+     
17d0: 20 20 20 20 20 20 20 54 63 6c 5f 44 65 63 72 52         Tcl_DecrR
17e0: 65 66 43 6f 75 6e 74 28 6c 69 73 74 50 74 72 29  efCount(listPtr)
17f0: 3b 0a 2b 20 20 20 20 20 20 20 20 7d 0a 2b 20 20  ;.+        }.+  
1800: 20 20 7d 0a 20 7d 0a 20 0c 0a 20 2f 2a 0a 40 40    }. }. .. /*.@@
1810: 20 2d 37 36 34 30 2c 35 20 2b 37 36 37 30 2c 37   -7640,5 +7670,7
1820: 20 40 40 0a 20 20 2a 20 6d 6f 64 65 3a 20 63 0a   @@.  * mode: c.
1830: 20 20 2a 20 63 2d 62 61 73 69 63 2d 6f 66 66 73    * c-basic-offs
1840: 65 74 3a 20 34 0a 20 20 2a 20 66 69 6c 6c 2d 63  et: 4.  * fill-c
1850: 6f 6c 75 6d 6e 3a 20 37 38 0a 2b 20 2a 20 74 61  olumn: 78.+ * ta
1860: 62 2d 77 69 64 74 68 3a 20 38 0a 2b 20 2a 20 69  b-width: 8.+ * i
1870: 6e 64 65 6e 74 2d 74 61 62 73 2d 6d 6f 64 65 3a  ndent-tabs-mode:
1880: 20 6e 69 6c 0a 20 20 2a 20 45 6e 64 3a 0a 20 20   nil.  * End:.  
1890: 2a 2f 0a 49 6e 64 65 78 3a 20 67 65 6e 65 72 69  */.Index: generi
18a0: 63 2f 74 63 6c 52 65 73 75 6c 74 2e 63 0a 3d 3d  c/tclResult.c.==
18b0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
18c0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
18d0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
18e0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
18f0: 3d 0a 52 43 53 20 66 69 6c 65 3a 20 2f 63 76 73  =.RCS file: /cvs
1900: 72 6f 6f 74 2f 74 63 6c 2f 74 63 6c 2f 67 65 6e  root/tcl/tcl/gen
1910: 65 72 69 63 2f 74 63 6c 52 65 73 75 6c 74 2e 63  eric/tclResult.c
1920: 2c 76 0a 72 65 74 72 69 65 76 69 6e 67 20 72 65  ,v.retrieving re
1930: 76 69 73 69 6f 6e 20 31 2e 35 34 0a 64 69 66 66  vision 1.54.diff
1940: 20 2d 75 20 2d 72 31 2e 35 34 20 74 63 6c 52 65   -u -r1.54 tclRe
1950: 73 75 6c 74 2e 63 0a 2d 2d 2d 20 67 65 6e 65 72  sult.c.--- gener
1960: 69 63 2f 74 63 6c 52 65 73 75 6c 74 2e 63 09 31  ic/tclResult.c.1
1970: 37 20 44 65 63 20 32 30 30 38 20 31 36 3a 34 37  7 Dec 2008 16:47
1980: 3a 33 38 20 2d 30 30 30 30 09 31 2e 35 34 0a 2b  :38 -0000.1.54.+
1990: 2b 2b 20 67 65 6e 65 72 69 63 2f 74 63 6c 52 65  ++ generic/tclRe
19a0: 73 75 6c 74 2e 63 09 33 31 20 4f 63 74 20 32 30  sult.c.31 Oct 20
19b0: 30 39 20 31 36 3a 33 33 3a 33 37 20 2d 30 30 30  09 16:33:37 -000
19c0: 30 0a 40 40 20 2d 31 39 2c 37 20 2b 31 39 2c 37  0.@@ -19,7 +19,7
19d0: 20 40 40 0a 20 0a 20 65 6e 75 6d 20 72 65 74 75   @@. . enum retu
19e0: 72 6e 4b 65 79 73 20 7b 0a 20 20 20 20 20 4b 45  rnKeys {.     KE
19f0: 59 5f 43 4f 44 45 2c 09 4b 45 59 5f 45 52 52 4f  Y_CODE,.KEY_ERRO
1a00: 52 43 4f 44 45 2c 09 4b 45 59 5f 45 52 52 4f 52  RCODE,.KEY_ERROR
1a10: 49 4e 46 4f 2c 09 4b 45 59 5f 45 52 52 4f 52 4c  INFO,.KEY_ERRORL
1a20: 49 4e 45 2c 0a 2d 20 20 20 20 4b 45 59 5f 4c 45  INE,.-    KEY_LE
1a30: 56 45 4c 2c 09 4b 45 59 5f 4f 50 54 49 4f 4e 53  VEL,.KEY_OPTIONS
1a40: 2c 09 4b 45 59 5f 4c 41 53 54 0a 2b 20 20 20 20  ,.KEY_LAST.+    
1a50: 4b 45 59 5f 4c 45 56 45 4c 2c 09 4b 45 59 5f 4f  KEY_LEVEL,.KEY_O
1a60: 50 54 49 4f 4e 53 2c 09 4b 45 59 5f 45 52 52 4f  PTIONS,.KEY_ERRO
1a70: 52 53 54 41 43 4b 2c 09 4b 45 59 5f 4c 41 53 54  RSTACK,.KEY_LAST
1a80: 0a 20 7d 3b 0a 20 0a 20 2f 2a 0a 40 40 20 2d 39  . };. . /*.@@ -9
1a90: 32 32 2c 36 20 2b 39 32 32 2c 37 20 40 40 0a 20  22,6 +922,7 @@. 
1aa0: 09 54 63 6c 5f 44 65 63 72 52 65 66 43 6f 75 6e  .Tcl_DecrRefCoun
1ab0: 74 28 69 50 74 72 2d 3e 65 72 72 6f 72 49 6e 66  t(iPtr->errorInf
1ac0: 6f 29 3b 0a 20 09 69 50 74 72 2d 3e 65 72 72 6f  o);. .iPtr->erro
1ad0: 72 49 6e 66 6f 20 3d 20 4e 55 4c 4c 3b 0a 20 20  rInfo = NULL;.  
1ae0: 20 20 20 7d 0a 2b 20 20 20 20 69 50 74 72 2d 3e     }.+    iPtr->
1af0: 72 65 73 65 74 45 72 72 6f 72 53 74 61 63 6b 20  resetErrorStack 
1b00: 3d 20 31 3b 0a 20 20 20 20 20 69 50 74 72 2d 3e  = 1;.     iPtr->
1b10: 72 65 74 75 72 6e 4c 65 76 65 6c 20 3d 20 31 3b  returnLevel = 1;
1b20: 0a 20 20 20 20 20 69 50 74 72 2d 3e 72 65 74 75  .     iPtr->retu
1b30: 72 6e 43 6f 64 65 20 3d 20 54 43 4c 5f 4f 4b 3b  rnCode = TCL_OK;
1b40: 0a 20 20 20 20 20 69 66 20 28 69 50 74 72 2d 3e  .     if (iPtr->
1b50: 72 65 74 75 72 6e 4f 70 74 73 29 20 7b 0a 40 40  returnOpts) {.@@
1b60: 20 2d 31 31 35 38 2c 36 20 2b 31 31 35 39 2c 37   -1158,6 +1159,7
1b70: 20 40 40 0a 20 09 54 63 6c 4e 65 77 4c 69 74 65   @@. .TclNewLite
1b80: 72 61 6c 53 74 72 69 6e 67 4f 62 6a 28 6b 65 79  ralStringObj(key
1b90: 73 5b 4b 45 59 5f 45 52 52 4f 52 43 4f 44 45 5d  s[KEY_ERRORCODE]
1ba0: 2c 20 22 2d 65 72 72 6f 72 63 6f 64 65 22 29 3b  , "-errorcode");
1bb0: 0a 20 09 54 63 6c 4e 65 77 4c 69 74 65 72 61 6c  . .TclNewLiteral
1bc0: 53 74 72 69 6e 67 4f 62 6a 28 6b 65 79 73 5b 4b  StringObj(keys[K
1bd0: 45 59 5f 45 52 52 4f 52 49 4e 46 4f 5d 2c 20 22  EY_ERRORINFO], "
1be0: 2d 65 72 72 6f 72 69 6e 66 6f 22 29 3b 0a 20 09  -errorinfo");. .
1bf0: 54 63 6c 4e 65 77 4c 69 74 65 72 61 6c 53 74 72  TclNewLiteralStr
1c00: 69 6e 67 4f 62 6a 28 6b 65 79 73 5b 4b 45 59 5f  ingObj(keys[KEY_
1c10: 45 52 52 4f 52 4c 49 4e 45 5d 2c 20 22 2d 65 72  ERRORLINE], "-er
1c20: 72 6f 72 6c 69 6e 65 22 29 3b 0a 2b 09 54 63 6c  rorline");.+.Tcl
1c30: 4e 65 77 4c 69 74 65 72 61 6c 53 74 72 69 6e 67  NewLiteralString
1c40: 4f 62 6a 28 6b 65 79 73 5b 4b 45 59 5f 45 52 52  Obj(keys[KEY_ERR
1c50: 4f 52 53 54 41 43 4b 5d 2c 22 2d 65 72 72 6f 72  ORSTACK],"-error
1c60: 73 74 61 63 6b 22 29 3b 0a 20 09 54 63 6c 4e 65  stack");. .TclNe
1c70: 77 4c 69 74 65 72 61 6c 53 74 72 69 6e 67 4f 62  wLiteralStringOb
1c80: 6a 28 6b 65 79 73 5b 4b 45 59 5f 4c 45 56 45 4c  j(keys[KEY_LEVEL
1c90: 5d 2c 09 20 20 20 20 22 2d 6c 65 76 65 6c 22 29  ],.    "-level")
1ca0: 3b 0a 20 09 54 63 6c 4e 65 77 4c 69 74 65 72 61  ;. .TclNewLitera
1cb0: 6c 53 74 72 69 6e 67 4f 62 6a 28 6b 65 79 73 5b  lStringObj(keys[
1cc0: 4b 45 59 5f 4f 50 54 49 4f 4e 53 5d 2c 20 20 20  KEY_OPTIONS],   
1cd0: 22 2d 6f 70 74 69 6f 6e 73 22 29 3b 0a 20 0a 40  "-options");. .@
1ce0: 40 20 2d 31 35 30 33 2c 36 20 2b 31 35 30 35 2c  @ -1503,6 +1505,
1cf0: 37 20 40 40 0a 20 09 54 63 6c 5f 44 69 63 74 4f  7 @@. .Tcl_DictO
1d00: 62 6a 50 75 74 28 4e 55 4c 4c 2c 20 6f 70 74 69  bjPut(NULL, opti
1d10: 6f 6e 73 2c 20 6b 65 79 73 5b 4b 45 59 5f 45 52  ons, keys[KEY_ER
1d20: 52 4f 52 4c 49 4e 45 5d 2c 0a 20 09 09 54 63 6c  RORLINE],. ..Tcl
1d30: 5f 4e 65 77 49 6e 74 4f 62 6a 28 69 50 74 72 2d  _NewIntObj(iPtr-
1d40: 3e 65 72 72 6f 72 4c 69 6e 65 29 29 3b 0a 20 20  >errorLine));.  
1d50: 20 20 20 7d 0a 2b 20 20 20 20 54 63 6c 5f 44 69     }.+    Tcl_Di
1d60: 63 74 4f 62 6a 50 75 74 28 4e 55 4c 4c 2c 20 6f  ctObjPut(NULL, o
1d70: 70 74 69 6f 6e 73 2c 20 6b 65 79 73 5b 4b 45 59  ptions, keys[KEY
1d80: 5f 45 52 52 4f 52 53 54 41 43 4b 5d 2c 20 69 50  _ERRORSTACK], iP
1d90: 74 72 2d 3e 65 72 72 6f 72 53 74 61 63 6b 29 3b  tr->errorStack);
1da0: 0a 20 20 20 20 20 72 65 74 75 72 6e 20 6f 70 74  .     return opt
1db0: 69 6f 6e 73 3b 0a 20 7d 0a 20 0c 0a 40 40 20 2d  ions;. }. ..@@ -
1dc0: 31 36 32 34 2c 35 20 2b 31 36 32 37 2c 37 20 40  1624,5 +1627,7 @
1dd0: 40 0a 20 20 2a 20 6d 6f 64 65 3a 20 63 0a 20 20  @.  * mode: c.  
1de0: 2a 20 63 2d 62 61 73 69 63 2d 6f 66 66 73 65 74  * c-basic-offset
1df0: 3a 20 34 0a 20 20 2a 20 66 69 6c 6c 2d 63 6f 6c  : 4.  * fill-col
1e00: 75 6d 6e 3a 20 37 38 0a 2b 20 2a 20 74 61 62 2d  umn: 78.+ * tab-
1e10: 77 69 64 74 68 3a 20 38 0a 2b 20 2a 20 69 6e 64  width: 8.+ * ind
1e20: 65 6e 74 2d 74 61 62 73 2d 6d 6f 64 65 3a 20 6e  ent-tabs-mode: n
1e30: 69 6c 0a 20 20 2a 20 45 6e 64 3a 0a 20 20 2a 2f  il.  * End:.  */
1e40: 0a 49 6e 64 65 78 3a 20 74 65 73 74 73 2f 63 6d  .Index: tests/cm
1e50: 64 4d 5a 2e 74 65 73 74 0a 3d 3d 3d 3d 3d 3d 3d  dMZ.test.=======
1e60: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
1e70: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
1e80: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
1e90: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 0a 52 43 53  ============.RCS
1ea0: 20 66 69 6c 65 3a 20 2f 63 76 73 72 6f 6f 74 2f   file: /cvsroot/
1eb0: 74 63 6c 2f 74 63 6c 2f 74 65 73 74 73 2f 63 6d  tcl/tcl/tests/cm
1ec0: 64 4d 5a 2e 74 65 73 74 2c 76 0a 72 65 74 72 69  dMZ.test,v.retri
1ed0: 65 76 69 6e 67 20 72 65 76 69 73 69 6f 6e 20 31  eving revision 1
1ee0: 2e 32 36 0a 64 69 66 66 20 2d 75 20 2d 72 31 2e  .26.diff -u -r1.
1ef0: 32 36 20 63 6d 64 4d 5a 2e 74 65 73 74 0a 2d 2d  26 cmdMZ.test.--
1f00: 2d 20 74 65 73 74 73 2f 63 6d 64 4d 5a 2e 74 65  - tests/cmdMZ.te
1f10: 73 74 09 31 30 20 53 65 70 20 32 30 30 38 20 31  st.10 Sep 2008 1
1f20: 33 3a 35 30 3a 30 35 20 2d 30 30 30 30 09 31 2e  3:50:05 -0000.1.
1f30: 32 36 0a 2b 2b 2b 20 74 65 73 74 73 2f 63 6d 64  26.+++ tests/cmd
1f40: 4d 5a 2e 74 65 73 74 09 33 31 20 4f 63 74 20 32  MZ.test.31 Oct 2
1f50: 30 30 39 20 31 36 3a 33 33 3a 34 31 20 2d 30 30  009 16:33:41 -00
1f60: 30 30 0a 40 40 20 2d 31 31 39 2c 31 38 20 2b 31  00.@@ -119,18 +1
1f70: 31 39 2c 31 38 20 40 40 0a 20 20 20 20 20 72 65  19,18 @@.     re
1f80: 74 75 72 6e 20 24 72 65 73 75 6c 74 0a 20 7d 0a  turn $result. }.
1f90: 20 0a 2d 74 65 73 74 20 63 6d 64 4d 5a 2d 72 65   .-test cmdMZ-re
1fa0: 74 75 72 6e 2d 32 2e 30 20 7b 72 65 74 75 72 6e  turn-2.0 {return
1fb0: 20 6f 70 74 69 6f 6e 20 68 61 6e 64 6c 69 6e 67   option handling
1fc0: 7d 20 7b 0a 2b 74 65 73 74 20 63 6d 64 4d 5a 2d  } {.+test cmdMZ-
1fd0: 72 65 74 75 72 6e 2d 32 2e 30 20 7b 72 65 74 75  return-2.0 {retu
1fe0: 72 6e 20 6f 70 74 69 6f 6e 20 68 61 6e 64 6c 69  rn option handli
1ff0: 6e 67 7d 20 2d 62 6f 64 79 20 7b 0a 20 20 20 20  ng} -body {.    
2000: 20 6c 69 73 74 20 5b 63 61 74 63 68 20 72 65 74   list [catch ret
2010: 75 72 6e 20 2d 3e 20 66 6f 6f 5d 20 5b 64 69 63  urn -> foo] [dic
2020: 74 53 6f 72 74 20 24 66 6f 6f 5d 0a 2d 7d 20 7b  tSort $foo].-} {
2030: 32 20 7b 2d 63 6f 64 65 20 30 20 2d 6c 65 76 65  2 {-code 0 -leve
2040: 6c 20 31 7d 7d 0a 2d 74 65 73 74 20 63 6d 64 4d  l 1}}.-test cmdM
2050: 5a 2d 72 65 74 75 72 6e 2d 32 2e 31 20 7b 72 65  Z-return-2.1 {re
2060: 74 75 72 6e 20 6f 70 74 69 6f 6e 20 68 61 6e 64  turn option hand
2070: 6c 69 6e 67 7d 20 7b 0a 2b 7d 20 2d 6d 61 74 63  ling} {.+} -matc
2080: 68 20 67 6c 6f 62 20 2d 72 65 73 75 6c 74 20 7b  h glob -result {
2090: 32 20 7b 2d 63 6f 64 65 20 30 20 2d 65 72 72 6f  2 {-code 0 -erro
20a0: 72 73 74 61 63 6b 20 2a 20 2d 6c 65 76 65 6c 20  rstack * -level 
20b0: 31 7d 7d 0a 2b 74 65 73 74 20 63 6d 64 4d 5a 2d  1}}.+test cmdMZ-
20c0: 72 65 74 75 72 6e 2d 32 2e 31 20 7b 72 65 74 75  return-2.1 {retu
20d0: 72 6e 20 6f 70 74 69 6f 6e 20 68 61 6e 64 6c 69  rn option handli
20e0: 6e 67 7d 20 2d 62 6f 64 79 20 7b 0a 20 20 20 20  ng} -body {.    
20f0: 20 6c 69 73 74 20 5b 63 61 74 63 68 20 7b 72 65   list [catch {re
2100: 74 75 72 6e 20 2d 62 61 72 20 73 6f 6f 6d 7d 20  turn -bar soom} 
2110: 2d 3e 20 66 6f 6f 5d 20 5b 64 69 63 74 53 6f 72  -> foo] [dictSor
2120: 74 20 24 66 6f 6f 5d 0a 2d 7d 20 7b 32 20 7b 2d  t $foo].-} {2 {-
2130: 62 61 72 20 73 6f 6f 6d 20 2d 63 6f 64 65 20 30  bar soom -code 0
2140: 20 2d 6c 65 76 65 6c 20 31 7d 7d 0a 2d 74 65 73   -level 1}}.-tes
2150: 74 20 63 6d 64 4d 5a 2d 72 65 74 75 72 6e 2d 32  t cmdMZ-return-2
2160: 2e 32 20 7b 72 65 74 75 72 6e 20 6f 70 74 69 6f  .2 {return optio
2170: 6e 20 68 61 6e 64 6c 69 6e 67 7d 20 7b 0a 2b 7d  n handling} {.+}
2180: 20 2d 6d 61 74 63 68 20 67 6c 6f 62 20 2d 72 65   -match glob -re
2190: 73 75 6c 74 20 7b 32 20 7b 2d 62 61 72 20 73 6f  sult {2 {-bar so
21a0: 6f 6d 20 2d 63 6f 64 65 20 30 20 2d 65 72 72 6f  om -code 0 -erro
21b0: 72 73 74 61 63 6b 20 2a 20 2d 6c 65 76 65 6c 20  rstack * -level 
21c0: 31 7d 7d 0a 2b 74 65 73 74 20 63 6d 64 4d 5a 2d  1}}.+test cmdMZ-
21d0: 72 65 74 75 72 6e 2d 32 2e 32 20 7b 72 65 74 75  return-2.2 {retu
21e0: 72 6e 20 6f 70 74 69 6f 6e 20 68 61 6e 64 6c 69  rn option handli
21f0: 6e 67 7d 20 2d 62 6f 64 79 20 7b 0a 20 20 20 20  ng} -body {.    
2200: 20 6c 69 73 74 20 5b 63 61 74 63 68 20 7b 72 65   list [catch {re
2210: 74 75 72 6e 20 2d 63 6f 64 65 20 72 65 74 75 72  turn -code retur
2220: 6e 7d 20 2d 3e 20 66 6f 6f 5d 20 5b 64 69 63 74  n} -> foo] [dict
2230: 53 6f 72 74 20 24 66 6f 6f 5d 0a 2d 7d 20 7b 32  Sort $foo].-} {2
2240: 20 7b 2d 63 6f 64 65 20 30 20 2d 6c 65 76 65 6c   {-code 0 -level
2250: 20 32 7d 7d 0a 2d 74 65 73 74 20 63 6d 64 4d 5a   2}}.-test cmdMZ
2260: 2d 72 65 74 75 72 6e 2d 32 2e 33 20 7b 72 65 74  -return-2.3 {ret
2270: 75 72 6e 20 6f 70 74 69 6f 6e 20 68 61 6e 64 6c  urn option handl
2280: 69 6e 67 7d 20 7b 0a 2b 7d 20 2d 6d 61 74 63 68  ing} {.+} -match
2290: 20 67 6c 6f 62 20 2d 72 65 73 75 6c 74 20 7b 32   glob -result {2
22a0: 20 7b 2d 63 6f 64 65 20 30 20 2d 65 72 72 6f 72   {-code 0 -error
22b0: 73 74 61 63 6b 20 2a 20 2d 6c 65 76 65 6c 20 32  stack * -level 2
22c0: 7d 7d 0a 2b 74 65 73 74 20 63 6d 64 4d 5a 2d 72  }}.+test cmdMZ-r
22d0: 65 74 75 72 6e 2d 32 2e 33 20 7b 72 65 74 75 72  eturn-2.3 {retur
22e0: 6e 20 6f 70 74 69 6f 6e 20 68 61 6e 64 6c 69 6e  n option handlin
22f0: 67 7d 20 2d 62 6f 64 79 20 7b 0a 20 20 20 20 20  g} -body {.     
2300: 6c 69 73 74 20 5b 63 61 74 63 68 20 7b 72 65 74  list [catch {ret
2310: 75 72 6e 20 2d 63 6f 64 65 20 72 65 74 75 72 6e  urn -code return
2320: 20 2d 6c 65 76 65 6c 20 31 30 7d 20 2d 3e 20 66   -level 10} -> f
2330: 6f 6f 5d 20 5b 64 69 63 74 53 6f 72 74 20 24 66  oo] [dictSort $f
2340: 6f 6f 5d 0a 2d 7d 20 7b 32 20 7b 2d 63 6f 64 65  oo].-} {2 {-code
2350: 20 30 20 2d 6c 65 76 65 6c 20 31 31 7d 7d 0a 2b   0 -level 11}}.+
2360: 7d 20 2d 6d 61 74 63 68 20 67 6c 6f 62 20 2d 72  } -match glob -r
2370: 65 73 75 6c 74 20 7b 32 20 7b 2d 63 6f 64 65 20  esult {2 {-code 
2380: 30 20 2d 65 72 72 6f 72 73 74 61 63 6b 20 2a 20  0 -errorstack * 
2390: 2d 6c 65 76 65 6c 20 31 31 7d 7d 0a 20 74 65 73  -level 11}}. tes
23a0: 74 20 63 6d 64 4d 5a 2d 72 65 74 75 72 6e 2d 32  t cmdMZ-return-2
23b0: 2e 34 20 7b 72 65 74 75 72 6e 20 6f 70 74 69 6f  .4 {return optio
23c0: 6e 20 68 61 6e 64 6c 69 6e 67 7d 20 2d 62 6f 64  n handling} -bod
23d0: 79 20 7b 0a 20 20 20 20 20 72 65 74 75 72 6e 20  y {.     return 
23e0: 2d 6c 65 76 65 6c 20 30 20 2d 63 6f 64 65 20 65  -level 0 -code e
23f0: 72 72 6f 72 0a 20 7d 20 2d 72 65 74 75 72 6e 43  rror. } -returnC
2400: 6f 64 65 73 20 65 72 72 6f 72 20 2d 72 65 73 75  odes error -resu
2410: 6c 74 20 7b 7d 0a 40 40 20 2d 31 34 39 2c 31 34  lt {}.@@ -149,14
2420: 20 2b 31 34 39 2c 31 34 20 40 40 0a 20 74 65 73   +149,14 @@. tes
2430: 74 20 63 6d 64 4d 5a 2d 72 65 74 75 72 6e 2d 32  t cmdMZ-return-2
2440: 2e 39 20 7b 72 65 74 75 72 6e 20 6f 70 74 69 6f  .9 {return optio
2450: 6e 20 68 61 6e 64 6c 69 6e 67 7d 20 2d 62 6f 64  n handling} -bod
2460: 79 20 7b 0a 20 20 20 20 20 72 65 74 75 72 6e 20  y {.     return 
2470: 2d 6c 65 76 65 6c 20 30 20 2d 63 6f 64 65 20 31  -level 0 -code 1
2480: 30 0a 20 7d 20 2d 72 65 74 75 72 6e 43 6f 64 65  0. } -returnCode
2490: 73 20 31 30 20 2d 72 65 73 75 6c 74 20 7b 7d 0a  s 10 -result {}.
24a0: 2d 74 65 73 74 20 63 6d 64 4d 5a 2d 72 65 74 75  -test cmdMZ-retu
24b0: 72 6e 2d 32 2e 31 30 20 7b 72 65 74 75 72 6e 20  rn-2.10 {return 
24c0: 6f 70 74 69 6f 6e 20 68 61 6e 64 6c 69 6e 67 7d  option handling}
24d0: 20 7b 0a 2b 74 65 73 74 20 63 6d 64 4d 5a 2d 72   {.+test cmdMZ-r
24e0: 65 74 75 72 6e 2d 32 2e 31 30 20 7b 72 65 74 75  eturn-2.10 {retu
24f0: 72 6e 20 6f 70 74 69 6f 6e 20 68 61 6e 64 6c 69  rn option handli
2500: 6e 67 7d 20 2d 62 6f 64 79 20 7b 0a 20 20 20 20  ng} -body {.    
2510: 20 6c 69 73 74 20 5b 63 61 74 63 68 20 7b 72 65   list [catch {re
2520: 74 75 72 6e 20 2d 6c 65 76 65 6c 20 30 20 2d 63  turn -level 0 -c
2530: 6f 64 65 20 65 72 72 6f 72 7d 20 2d 3e 20 66 6f  ode error} -> fo
2540: 6f 5d 20 5b 64 69 63 74 53 6f 72 74 20 24 66 6f  o] [dictSort $fo
2550: 6f 5d 0a 2d 7d 20 7b 31 20 7b 2d 63 6f 64 65 20  o].-} {1 {-code 
2560: 31 20 2d 65 72 72 6f 72 63 6f 64 65 20 4e 4f 4e  1 -errorcode NON
2570: 45 20 2d 65 72 72 6f 72 69 6e 66 6f 20 7b 0a 2b  E -errorinfo {.+
2580: 7d 20 2d 6d 61 74 63 68 20 67 6c 6f 62 20 2d 72  } -match glob -r
2590: 65 73 75 6c 74 20 7b 31 20 7b 2d 63 6f 64 65 20  esult {1 {-code 
25a0: 31 20 2d 65 72 72 6f 72 63 6f 64 65 20 4e 4f 4e  1 -errorcode NON
25b0: 45 20 2d 65 72 72 6f 72 69 6e 66 6f 20 7b 0a 20  E -errorinfo {. 
25c0: 20 20 20 20 77 68 69 6c 65 20 65 78 65 63 75 74      while execut
25d0: 69 6e 67 0a 2d 22 72 65 74 75 72 6e 20 2d 6c 65  ing.-"return -le
25e0: 76 65 6c 20 30 20 2d 63 6f 64 65 20 65 72 72 6f  vel 0 -code erro
25f0: 72 22 7d 20 2d 65 72 72 6f 72 6c 69 6e 65 20 31  r"} -errorline 1
2600: 20 2d 6c 65 76 65 6c 20 30 7d 7d 0a 2d 74 65 73   -level 0}}.-tes
2610: 74 20 63 6d 64 4d 5a 2d 72 65 74 75 72 6e 2d 32  t cmdMZ-return-2
2620: 2e 31 31 20 7b 72 65 74 75 72 6e 20 6f 70 74 69  .11 {return opti
2630: 6f 6e 20 68 61 6e 64 6c 69 6e 67 7d 20 7b 0a 2b  on handling} {.+
2640: 22 72 65 74 75 72 6e 20 2d 6c 65 76 65 6c 20 30  "return -level 0
2650: 20 2d 63 6f 64 65 20 65 72 72 6f 72 22 7d 20 2d   -code error"} -
2660: 65 72 72 6f 72 6c 69 6e 65 20 31 20 2d 65 72 72  errorline 1 -err
2670: 6f 72 73 74 61 63 6b 20 2a 20 2d 6c 65 76 65 6c  orstack * -level
2680: 20 30 7d 7d 0a 2b 74 65 73 74 20 63 6d 64 4d 5a   0}}.+test cmdMZ
2690: 2d 72 65 74 75 72 6e 2d 32 2e 31 31 20 7b 72 65  -return-2.11 {re
26a0: 74 75 72 6e 20 6f 70 74 69 6f 6e 20 68 61 6e 64  turn option hand
26b0: 6c 69 6e 67 7d 20 2d 62 6f 64 79 20 7b 0a 20 20  ling} -body {.  
26c0: 20 20 20 6c 69 73 74 20 5b 63 61 74 63 68 20 7b     list [catch {
26d0: 72 65 74 75 72 6e 20 2d 6c 65 76 65 6c 20 30 20  return -level 0 
26e0: 2d 63 6f 64 65 20 62 72 65 61 6b 7d 20 2d 3e 20  -code break} -> 
26f0: 66 6f 6f 5d 20 5b 64 69 63 74 53 6f 72 74 20 24  foo] [dictSort $
2700: 66 6f 6f 5d 0a 2d 7d 20 7b 33 20 7b 2d 63 6f 64  foo].-} {3 {-cod
2710: 65 20 33 20 2d 6c 65 76 65 6c 20 30 7d 7d 0a 2b  e 3 -level 0}}.+
2720: 7d 20 2d 6d 61 74 63 68 20 67 6c 6f 62 20 2d 72  } -match glob -r
2730: 65 73 75 6c 74 20 7b 33 20 7b 2d 63 6f 64 65 20  esult {3 {-code 
2740: 33 20 2d 65 72 72 6f 72 73 74 61 63 6b 20 2a 20  3 -errorstack * 
2750: 2d 6c 65 76 65 6c 20 30 7d 7d 0a 20 74 65 73 74  -level 0}}. test
2760: 20 63 6d 64 4d 5a 2d 72 65 74 75 72 6e 2d 32 2e   cmdMZ-return-2.
2770: 31 32 20 7b 72 65 74 75 72 6e 20 6f 70 74 69 6f  12 {return optio
2780: 6e 20 68 61 6e 64 6c 69 6e 67 7d 20 2d 62 6f 64  n handling} -bod
2790: 79 20 7b 0a 20 20 20 20 20 72 65 74 75 72 6e 20  y {.     return 
27a0: 2d 6c 65 76 65 6c 20 30 20 2d 63 6f 64 65 20 65  -level 0 -code e
27b0: 72 72 6f 72 20 2d 6f 70 74 69 6f 6e 73 20 7b 2d  rror -options {-
27c0: 63 6f 64 65 20 6f 6b 7d 0a 20 7d 20 2d 72 65 74  code ok}. } -ret
27d0: 75 72 6e 43 6f 64 65 73 20 6f 6b 20 2d 72 65 73  urnCodes ok -res
27e0: 75 6c 74 20 7b 7d 0a 49 6e 64 65 78 3a 20 74 65  ult {}.Index: te
27f0: 73 74 73 2f 65 72 72 6f 72 2e 74 65 73 74 0a 3d  sts/error.test.=
2800: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
2810: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
2820: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
2830: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
2840: 3d 3d 0a 52 43 53 20 66 69 6c 65 3a 20 2f 63 76  ==.RCS file: /cv
2850: 73 72 6f 6f 74 2f 74 63 6c 2f 74 63 6c 2f 74 65  sroot/tcl/tcl/te
2860: 73 74 73 2f 65 72 72 6f 72 2e 74 65 73 74 2c 76  sts/error.test,v
2870: 0a 72 65 74 72 69 65 76 69 6e 67 20 72 65 76 69  .retrieving revi
2880: 73 69 6f 6e 20 31 2e 32 32 0a 64 69 66 66 20 2d  sion 1.22.diff -
2890: 75 20 2d 72 31 2e 32 32 20 65 72 72 6f 72 2e 74  u -r1.22 error.t
28a0: 65 73 74 0a 2d 2d 2d 20 74 65 73 74 73 2f 65 72  est.--- tests/er
28b0: 72 6f 72 2e 74 65 73 74 09 32 38 20 53 65 70 20  ror.test.28 Sep 
28c0: 32 30 30 39 20 31 38 3a 30 32 3a 32 30 20 2d 30  2009 18:02:20 -0
28d0: 30 30 30 09 31 2e 32 32 0a 2b 2b 2b 20 74 65 73  000.1.22.+++ tes
28e0: 74 73 2f 65 72 72 6f 72 2e 74 65 73 74 09 33 31  ts/error.test.31
28f0: 20 4f 63 74 20 32 30 30 39 20 31 36 3a 33 33 3a   Oct 2009 16:33:
2900: 34 32 20 2d 30 30 30 30 0a 40 40 20 2d 31 35 33  42 -0000.@@ -153
2910: 2c 36 20 2b 31 35 33 2c 31 39 20 40 40 0a 20 20  ,6 +153,19 @@.  
2920: 20 20 20 6c 69 73 74 20 5b 63 61 74 63 68 20 7b     list [catch {
2930: 65 72 72 6f 72 20 6d 73 67 31 20 6d 73 67 32 20  error msg1 msg2 
2940: 7b 7d 7d 20 6d 73 67 5d 20 24 6d 73 67 20 24 3a  {}} msg] $msg $:
2950: 3a 65 72 72 6f 72 49 6e 66 6f 20 24 3a 3a 65 72  :errorInfo $::er
2960: 72 6f 72 43 6f 64 65 0a 20 7d 20 7b 31 20 6d 73  rorCode. } {1 ms
2970: 67 31 20 6d 73 67 32 20 7b 7d 7d 0a 20 0a 2b 74  g1 msg2 {}}. .+t
2980: 65 73 74 20 65 72 72 6f 72 2d 34 2e 36 20 7b 65  est error-4.6 {e
2990: 72 72 6f 72 73 74 61 63 6b 20 76 69 61 20 69 6e  rrorstack via in
29a0: 66 6f 20 7d 20 2d 62 6f 64 79 20 7b 0a 2b 20 20  fo } -body {.+  
29b0: 20 20 70 72 6f 63 20 66 20 78 20 7b 67 20 24 78    proc f x {g $x
29c0: 24 78 7d 0a 2b 20 20 20 20 70 72 6f 63 20 67 20  $x}.+    proc g 
29d0: 78 20 7b 65 72 72 6f 72 20 47 3a 24 78 7d 0a 2b  x {error G:$x}.+
29e0: 20 20 20 20 63 61 74 63 68 20 7b 66 20 31 32 7d      catch {f 12}
29f0: 0a 2b 20 20 20 20 69 6e 66 6f 20 65 72 72 6f 72  .+    info error
2a00: 73 74 61 63 6b 0a 2b 7d 20 2d 6d 61 74 63 68 20  stack.+} -match 
2a10: 67 6c 6f 62 20 2d 72 65 73 75 6c 74 20 7b 7b 67  glob -result {{g
2a20: 20 31 32 31 32 7d 20 7b 66 20 31 32 7d 20 7b 6e   1212} {f 12} {n
2a30: 61 6d 65 73 70 61 63 65 20 65 76 61 6c 20 2a 7d  amespace eval *}
2a40: 7d 0a 2b 74 65 73 74 20 65 72 72 6f 72 2d 34 2e  }.+test error-4.
2a50: 37 20 7b 65 72 72 6f 72 73 74 61 63 6b 20 76 69  7 {errorstack vi
2a60: 61 20 6f 70 74 69 6f 6e 73 20 64 69 63 74 20 7d  a options dict }
2a70: 20 2d 62 6f 64 79 20 7b 0a 2b 20 20 20 20 70 72   -body {.+    pr
2a80: 6f 63 20 66 20 78 20 7b 67 20 24 78 24 78 7d 0a  oc f x {g $x$x}.
2a90: 2b 20 20 20 20 70 72 6f 63 20 67 20 78 20 7b 65  +    proc g x {e
2aa0: 72 72 6f 72 20 47 3a 24 78 7d 0a 2b 20 20 20 20  rror G:$x}.+    
2ab0: 63 61 74 63 68 20 7b 66 20 31 32 7d 20 6d 20 64  catch {f 12} m d
2ac0: 0a 2b 20 20 20 20 64 69 63 74 20 67 65 74 20 24  .+    dict get $
2ad0: 64 20 2d 65 72 72 6f 72 73 74 61 63 6b 0a 2b 7d  d -errorstack.+}
2ae0: 20 2d 6d 61 74 63 68 20 67 6c 6f 62 20 2d 72 65   -match glob -re
2af0: 73 75 6c 74 20 7b 7b 67 20 31 32 31 32 7d 20 7b  sult {{g 1212} {
2b00: 66 20 31 32 7d 20 7b 6e 61 6d 65 73 70 61 63 65  f 12} {namespace
2b10: 20 65 76 61 6c 20 2a 7d 7d 0a 2b 0a 20 23 20 45   eval *}}.+. # E
2b20: 72 72 6f 72 73 20 69 6e 20 65 72 72 6f 72 20 63  rrors in error c
2b30: 6f 6d 6d 61 6e 64 20 69 74 73 65 6c 66 0a 20 0a  ommand itself. .
2b40: 20 74 65 73 74 20 65 72 72 6f 72 2d 35 2e 31 20   test error-5.1 
2b50: 7b 65 72 72 6f 72 73 20 69 6e 20 65 72 72 6f 72  {errors in error
2b60: 20 63 6f 6d 6d 61 6e 64 7d 20 7b 0a 40 40 20 2d   command} {.@@ -
2b70: 32 30 37 2c 36 20 2b 32 32 30 2c 31 35 20 40 40  207,6 +220,15 @@
2b80: 0a 20 20 20 20 20 63 61 74 63 68 20 66 6f 6f 0a  .     catch foo.
2b90: 20 20 20 20 20 6c 69 73 74 20 24 3a 3a 65 72 72       list $::err
2ba0: 6f 72 43 6f 64 65 0a 20 7d 20 7b 4e 4f 4e 45 7d  orCode. } {NONE}
2bb0: 0a 2b 74 65 73 74 20 65 72 72 6f 72 2d 36 2e 31  .+test error-6.1
2bc0: 30 20 7b 63 61 74 63 68 20 6d 75 73 74 20 72 65  0 {catch must re
2bd0: 73 65 74 20 65 72 72 6f 72 53 74 61 63 6b 7d 20  set errorStack} 
2be0: 2d 62 6f 64 79 20 7b 0a 2b 09 70 72 6f 63 20 66  -body {.+.proc f
2bf0: 20 78 20 7b 67 20 24 78 24 78 7d 0a 2b 09 70 72   x {g $x$x}.+.pr
2c00: 6f 63 20 67 20 78 20 7b 65 72 72 6f 72 20 47 3a  oc g x {error G:
2c10: 24 78 7d 0a 2b 09 63 61 74 63 68 20 7b 66 20 31  $x}.+.catch {f 1
2c20: 32 7d 0a 2b 09 73 65 74 20 65 31 20 5b 69 6e 66  2}.+.set e1 [inf
2c30: 6f 20 65 72 72 6f 72 73 74 61 63 6b 5d 0a 2b 09  o errorstack].+.
2c40: 63 61 74 63 68 20 7b 66 20 31 33 7d 0a 2b 09 73  catch {f 13}.+.s
2c50: 65 74 20 65 32 20 5b 69 6e 66 6f 20 65 72 72 6f  et e2 [info erro
2c60: 72 73 74 61 63 6b 5d 0a 2b 09 6c 69 73 74 20 24  rstack].+.list $
2c70: 65 31 20 24 65 32 0a 2b 7d 20 2d 6d 61 74 63 68  e1 $e2.+} -match
2c80: 20 67 6c 6f 62 20 2d 72 65 73 75 6c 74 20 7b 7b   glob -result {{
2c90: 7b 67 20 31 32 31 32 7d 20 7b 66 20 31 32 7d 20  {g 1212} {f 12} 
2ca0: 7b 6e 61 6d 65 73 70 61 63 65 20 65 76 61 6c 20  {namespace eval 
2cb0: 2a 7d 7d 20 7b 7b 67 20 31 33 31 33 7d 20 7b 66  *}} {{g 1313} {f
2cc0: 20 31 33 7d 20 7b 6e 61 6d 65 73 70 61 63 65 20   13} {namespace 
2cd0: 65 76 61 6c 20 2a 7d 7d 7d 0a 20 0a 20 74 65 73  eval *}}}. . tes
2ce0: 74 20 65 72 72 6f 72 2d 37 2e 31 20 7b 42 75 67  t error-7.1 {Bug
2cf0: 20 31 33 39 37 38 34 33 7d 20 2d 62 6f 64 79 20   1397843} -body 
2d00: 7b 0a 20 20 20 20 20 76 61 72 69 61 62 6c 65 20  {.     variable 
2d10: 63 6d 64 73 0a 49 6e 64 65 78 3a 20 74 65 73 74  cmds.Index: test
2d20: 73 2f 65 78 65 63 75 74 65 2e 74 65 73 74 0a 3d  s/execute.test.=
2d30: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
2d40: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
2d50: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
2d60: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
2d70: 3d 3d 0a 52 43 53 20 66 69 6c 65 3a 20 2f 63 76  ==.RCS file: /cv
2d80: 73 72 6f 6f 74 2f 74 63 6c 2f 74 63 6c 2f 74 65  sroot/tcl/tcl/te
2d90: 73 74 73 2f 65 78 65 63 75 74 65 2e 74 65 73 74  sts/execute.test
2da0: 2c 76 0a 72 65 74 72 69 65 76 69 6e 67 20 72 65  ,v.retrieving re
2db0: 76 69 73 69 6f 6e 20 31 2e 33 32 0a 64 69 66 66  vision 1.32.diff
2dc0: 20 2d 75 20 2d 72 31 2e 33 32 20 65 78 65 63 75   -u -r1.32 execu
2dd0: 74 65 2e 74 65 73 74 0a 2d 2d 2d 20 74 65 73 74  te.test.--- test
2de0: 73 2f 65 78 65 63 75 74 65 2e 74 65 73 74 09 32  s/execute.test.2
2df0: 34 20 4a 75 6e 20 32 30 30 39 20 31 33 3a 35 31  4 Jun 2009 13:51
2e00: 3a 33 36 20 2d 30 30 30 30 09 31 2e 33 32 0a 2b  :36 -0000.1.32.+
2e10: 2b 2b 20 74 65 73 74 73 2f 65 78 65 63 75 74 65  ++ tests/execute
2e20: 2e 74 65 73 74 09 33 31 20 4f 63 74 20 32 30 30  .test.31 Oct 200
2e30: 39 20 31 36 3a 33 33 3a 34 32 20 2d 30 30 30 30  9 16:33:42 -0000
2e40: 0a 40 40 20 2d 39 35 36 2c 31 31 20 2b 39 35 36  .@@ -956,11 +956
2e50: 2c 31 31 20 40 40 0a 20 20 20 20 20 64 65 6d 6f  ,11 @@.     demo
2e60: 0a 20 7d 20 2d 63 6c 65 61 6e 75 70 20 7b 0a 20  . } -cleanup {. 
2e70: 20 20 20 20 72 65 6e 61 6d 65 20 64 65 6d 6f 20      rename demo 
2e80: 7b 7d 0a 2d 7d 20 2d 72 65 73 75 6c 74 20 7b 2d  {}.-} -result {-
2e90: 63 6f 64 65 20 31 20 2d 6c 65 76 65 6c 20 30 20  code 1 -level 0 
2ea0: 2d 65 72 72 6f 72 63 6f 64 65 20 4e 4f 4e 45 20  -errorcode NONE 
2eb0: 2d 65 72 72 6f 72 69 6e 66 6f 20 7b 46 4f 4f 0a  -errorinfo {FOO.
2ec0: 2b 7d 20 2d 6d 61 74 63 68 20 67 6c 6f 62 20 2d  +} -match glob -
2ed0: 72 65 73 75 6c 74 20 7b 2d 63 6f 64 65 20 31 20  result {-code 1 
2ee0: 2d 6c 65 76 65 6c 20 30 20 2d 65 72 72 6f 72 63  -level 0 -errorc
2ef0: 6f 64 65 20 4e 4f 4e 45 20 2d 65 72 72 6f 72 69  ode NONE -errori
2f00: 6e 66 6f 20 7b 46 4f 4f 0a 20 20 20 20 20 77 68  nfo {FOO.     wh
2f10: 69 6c 65 20 65 78 65 63 75 74 69 6e 67 0a 20 22  ile executing. "
2f20: 65 72 72 6f 72 20 46 4f 4f 22 0a 20 20 20 20 20  error FOO".     
2f30: 69 6e 76 6f 6b 65 64 20 66 72 6f 6d 20 77 69 74  invoked from wit
2f40: 68 69 6e 0a 2d 22 63 61 74 63 68 20 5b 6c 69 73  hin.-"catch [lis
2f50: 74 20 65 72 72 6f 72 20 46 4f 4f 5d 20 6d 20 6f  t error FOO] m o
2f60: 22 7d 20 2d 65 72 72 6f 72 6c 69 6e 65 20 32 7d  "} -errorline 2}
2f70: 0a 2b 22 63 61 74 63 68 20 5c 5b 6c 69 73 74 20  .+"catch \[list 
2f80: 65 72 72 6f 72 20 46 4f 4f 5c 5d 20 6d 20 6f 22  error FOO\] m o"
2f90: 7d 20 2d 65 72 72 6f 72 6c 69 6e 65 20 32 20 2d  } -errorline 2 -
2fa0: 65 72 72 6f 72 73 74 61 63 6b 20 2a 7d 0a 20 0a  errorstack *}. .
2fb0: 20 74 65 73 74 20 65 78 65 63 75 74 65 2d 39 2e   test execute-9.
2fc0: 31 20 7b 49 6e 74 65 72 70 20 72 65 73 75 6c 74  1 {Interp result
2fd0: 20 72 65 73 65 74 74 69 6e 67 20 5b 42 75 67 20   resetting [Bug 
2fe0: 31 35 32 32 38 30 33 5d 7d 20 7b 0a 20 20 20 20  1522803]} {.    
2ff0: 20 73 65 74 20 63 20 30 0a 49 6e 64 65 78 3a 20   set c 0.Index: 
3000: 74 65 73 74 73 2f 69 6e 66 6f 2e 74 65 73 74 0a  tests/info.test.
3010: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
3020: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
3030: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
3040: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
3050: 3d 3d 3d 0a 52 43 53 20 66 69 6c 65 3a 20 2f 63  ===.RCS file: /c
3060: 76 73 72 6f 6f 74 2f 74 63 6c 2f 74 63 6c 2f 74  vsroot/tcl/tcl/t
3070: 65 73 74 73 2f 69 6e 66 6f 2e 74 65 73 74 2c 76  ests/info.test,v
3080: 0a 72 65 74 72 69 65 76 69 6e 67 20 72 65 76 69  .retrieving revi
3090: 73 69 6f 6e 20 31 2e 36 39 0a 64 69 66 66 20 2d  sion 1.69.diff -
30a0: 75 20 2d 72 31 2e 36 39 20 69 6e 66 6f 2e 74 65  u -r1.69 info.te
30b0: 73 74 0a 2d 2d 2d 20 74 65 73 74 73 2f 69 6e 66  st.--- tests/inf
30c0: 6f 2e 74 65 73 74 09 32 39 20 4f 63 74 20 32 30  o.test.29 Oct 20
30d0: 30 39 20 32 32 3a 32 30 3a 31 32 20 2d 30 30 30  09 22:20:12 -000
30e0: 30 09 31 2e 36 39 0a 2b 2b 2b 20 74 65 73 74 73  0.1.69.+++ tests
30f0: 2f 69 6e 66 6f 2e 74 65 73 74 09 33 31 20 4f 63  /info.test.31 Oc
3100: 74 20 32 30 30 39 20 31 36 3a 33 33 3a 34 35 20  t 2009 16:33:45 
3110: 2d 30 30 30 30 0a 40 40 20 2d 36 37 36 2c 31 36  -0000.@@ -676,16
3120: 20 2b 36 37 36 2c 31 36 20 40 40 0a 20 7d 20 2d   +676,16 @@. } -
3130: 72 65 73 75 6c 74 20 7b 77 72 6f 6e 67 20 23 20  result {wrong # 
3140: 61 72 67 73 3a 20 73 68 6f 75 6c 64 20 62 65 20  args: should be 
3150: 22 69 6e 66 6f 20 73 75 62 63 6f 6d 6d 61 6e 64  "info subcommand
3160: 20 3f 61 72 67 20 2e 2e 2e 3f 22 7d 0a 20 74 65   ?arg ...?"}. te
3170: 73 74 20 69 6e 66 6f 2d 32 31 2e 32 20 7b 6d 69  st info-21.2 {mi
3180: 73 63 65 6c 6c 61 6e 65 6f 75 73 20 65 72 72 6f  scellaneous erro
3190: 72 20 63 6f 6e 64 69 74 69 6f 6e 73 7d 20 2d 72  r conditions} -r
31a0: 65 74 75 72 6e 43 6f 64 65 73 20 65 72 72 6f 72  eturnCodes error
31b0: 20 2d 62 6f 64 79 20 7b 0a 20 20 20 20 20 69 6e   -body {.     in
31c0: 66 6f 20 67 6f 72 70 0a 2d 7d 20 2d 72 65 73 75  fo gorp.-} -resu
31d0: 6c 74 20 7b 75 6e 6b 6e 6f 77 6e 20 6f 72 20 61  lt {unknown or a
31e0: 6d 62 69 67 75 6f 75 73 20 73 75 62 63 6f 6d 6d  mbiguous subcomm
31f0: 61 6e 64 20 22 67 6f 72 70 22 3a 20 6d 75 73 74  and "gorp": must
3200: 20 62 65 20 61 72 67 73 2c 20 62 6f 64 79 2c 20   be args, body, 
3210: 63 6c 61 73 73 2c 20 63 6d 64 63 6f 75 6e 74 2c  class, cmdcount,
3220: 20 63 6f 6d 6d 61 6e 64 73 2c 20 63 6f 6d 70 6c   commands, compl
3230: 65 74 65 2c 20 63 6f 72 6f 75 74 69 6e 65 2c 20  ete, coroutine, 
3240: 64 65 66 61 75 6c 74 2c 20 65 78 69 73 74 73 2c  default, exists,
3250: 20 66 72 61 6d 65 2c 20 66 75 6e 63 74 69 6f 6e   frame, function
3260: 73 2c 20 67 6c 6f 62 61 6c 73 2c 20 68 6f 73 74  s, globals, host
3270: 6e 61 6d 65 2c 20 6c 65 76 65 6c 2c 20 6c 69 62  name, level, lib
3280: 72 61 72 79 2c 20 6c 6f 61 64 65 64 2c 20 6c 6f  rary, loaded, lo
3290: 63 61 6c 73 2c 20 6e 61 6d 65 6f 66 65 78 65 63  cals, nameofexec
32a0: 75 74 61 62 6c 65 2c 20 6f 62 6a 65 63 74 2c 20  utable, object, 
32b0: 70 61 74 63 68 6c 65 76 65 6c 2c 20 70 72 6f 63  patchlevel, proc
32c0: 73 2c 20 73 63 72 69 70 74 2c 20 73 68 61 72 65  s, script, share
32d0: 64 6c 69 62 65 78 74 65 6e 73 69 6f 6e 2c 20 74  dlibextension, t
32e0: 63 6c 76 65 72 73 69 6f 6e 2c 20 6f 72 20 76 61  clversion, or va
32f0: 72 73 7d 0a 2b 7d 20 2d 72 65 73 75 6c 74 20 7b  rs}.+} -result {
3300: 75 6e 6b 6e 6f 77 6e 20 6f 72 20 61 6d 62 69 67  unknown or ambig
3310: 75 6f 75 73 20 73 75 62 63 6f 6d 6d 61 6e 64 20  uous subcommand 
3320: 22 67 6f 72 70 22 3a 20 6d 75 73 74 20 62 65 20  "gorp": must be 
3330: 61 72 67 73 2c 20 62 6f 64 79 2c 20 63 6c 61 73  args, body, clas
3340: 73 2c 20 63 6d 64 63 6f 75 6e 74 2c 20 63 6f 6d  s, cmdcount, com
3350: 6d 61 6e 64 73 2c 20 63 6f 6d 70 6c 65 74 65 2c  mands, complete,
3360: 20 63 6f 72 6f 75 74 69 6e 65 2c 20 64 65 66 61   coroutine, defa
3370: 75 6c 74 2c 20 65 72 72 6f 72 73 74 61 63 6b 2c  ult, errorstack,
3380: 20 65 78 69 73 74 73 2c 20 66 72 61 6d 65 2c 20   exists, frame, 
3390: 66 75 6e 63 74 69 6f 6e 73 2c 20 67 6c 6f 62 61  functions, globa
33a0: 6c 73 2c 20 68 6f 73 74 6e 61 6d 65 2c 20 6c 65  ls, hostname, le
33b0: 76 65 6c 2c 20 6c 69 62 72 61 72 79 2c 20 6c 6f  vel, library, lo
33c0: 61 64 65 64 2c 20 6c 6f 63 61 6c 73 2c 20 6e 61  aded, locals, na
33d0: 6d 65 6f 66 65 78 65 63 75 74 61 62 6c 65 2c 20  meofexecutable, 
33e0: 6f 62 6a 65 63 74 2c 20 70 61 74 63 68 6c 65 76  object, patchlev
33f0: 65 6c 2c 20 70 72 6f 63 73 2c 20 73 63 72 69 70  el, procs, scrip
3400: 74 2c 20 73 68 61 72 65 64 6c 69 62 65 78 74 65  t, sharedlibexte
3410: 6e 73 69 6f 6e 2c 20 74 63 6c 76 65 72 73 69 6f  nsion, tclversio
3420: 6e 2c 20 6f 72 20 76 61 72 73 7d 0a 20 74 65 73  n, or vars}. tes
3430: 74 20 69 6e 66 6f 2d 32 31 2e 33 20 7b 6d 69 73  t info-21.3 {mis
3440: 63 65 6c 6c 61 6e 65 6f 75 73 20 65 72 72 6f 72  cellaneous error
3450: 20 63 6f 6e 64 69 74 69 6f 6e 73 7d 20 2d 72 65   conditions} -re
3460: 74 75 72 6e 43 6f 64 65 73 20 65 72 72 6f 72 20  turnCodes error 
3470: 2d 62 6f 64 79 20 7b 0a 20 20 20 20 20 69 6e 66  -body {.     inf
3480: 6f 20 63 0a 2d 7d 20 2d 72 65 73 75 6c 74 20 7b  o c.-} -result {
3490: 75 6e 6b 6e 6f 77 6e 20 6f 72 20 61 6d 62 69 67  unknown or ambig
34a0: 75 6f 75 73 20 73 75 62 63 6f 6d 6d 61 6e 64 20  uous subcommand 
34b0: 22 63 22 3a 20 6d 75 73 74 20 62 65 20 61 72 67  "c": must be arg
34c0: 73 2c 20 62 6f 64 79 2c 20 63 6c 61 73 73 2c 20  s, body, class, 
34d0: 63 6d 64 63 6f 75 6e 74 2c 20 63 6f 6d 6d 61 6e  cmdcount, comman
34e0: 64 73 2c 20 63 6f 6d 70 6c 65 74 65 2c 20 63 6f  ds, complete, co
34f0: 72 6f 75 74 69 6e 65 2c 20 64 65 66 61 75 6c 74  routine, default
3500: 2c 20 65 78 69 73 74 73 2c 20 66 72 61 6d 65 2c  , exists, frame,
3510: 20 66 75 6e 63 74 69 6f 6e 73 2c 20 67 6c 6f 62   functions, glob
3520: 61 6c 73 2c 20 68 6f 73 74 6e 61 6d 65 2c 20 6c  als, hostname, l
3530: 65 76 65 6c 2c 20 6c 69 62 72 61 72 79 2c 20 6c  evel, library, l
3540: 6f 61 64 65 64 2c 20 6c 6f 63 61 6c 73 2c 20 6e  oaded, locals, n
3550: 61 6d 65 6f 66 65 78 65 63 75 74 61 62 6c 65 2c  ameofexecutable,
3560: 20 6f 62 6a 65 63 74 2c 20 70 61 74 63 68 6c 65   object, patchle
3570: 76 65 6c 2c 20 70 72 6f 63 73 2c 20 73 63 72 69  vel, procs, scri
3580: 70 74 2c 20 73 68 61 72 65 64 6c 69 62 65 78 74  pt, sharedlibext
3590: 65 6e 73 69 6f 6e 2c 20 74 63 6c 76 65 72 73 69  ension, tclversi
35a0: 6f 6e 2c 20 6f 72 20 76 61 72 73 7d 0a 2b 7d 20  on, or vars}.+} 
35b0: 2d 72 65 73 75 6c 74 20 7b 75 6e 6b 6e 6f 77 6e  -result {unknown
35c0: 20 6f 72 20 61 6d 62 69 67 75 6f 75 73 20 73 75   or ambiguous su
35d0: 62 63 6f 6d 6d 61 6e 64 20 22 63 22 3a 20 6d 75  bcommand "c": mu
35e0: 73 74 20 62 65 20 61 72 67 73 2c 20 62 6f 64 79  st be args, body
35f0: 2c 20 63 6c 61 73 73 2c 20 63 6d 64 63 6f 75 6e  , class, cmdcoun
3600: 74 2c 20 63 6f 6d 6d 61 6e 64 73 2c 20 63 6f 6d  t, commands, com
3610: 70 6c 65 74 65 2c 20 63 6f 72 6f 75 74 69 6e 65  plete, coroutine
3620: 2c 20 64 65 66 61 75 6c 74 2c 20 65 72 72 6f 72  , default, error
3630: 73 74 61 63 6b 2c 20 65 78 69 73 74 73 2c 20 66  stack, exists, f
3640: 72 61 6d 65 2c 20 66 75 6e 63 74 69 6f 6e 73 2c  rame, functions,
3650: 20 67 6c 6f 62 61 6c 73 2c 20 68 6f 73 74 6e 61   globals, hostna
3660: 6d 65 2c 20 6c 65 76 65 6c 2c 20 6c 69 62 72 61  me, level, libra
3670: 72 79 2c 20 6c 6f 61 64 65 64 2c 20 6c 6f 63 61  ry, loaded, loca
3680: 6c 73 2c 20 6e 61 6d 65 6f 66 65 78 65 63 75 74  ls, nameofexecut
3690: 61 62 6c 65 2c 20 6f 62 6a 65 63 74 2c 20 70 61  able, object, pa
36a0: 74 63 68 6c 65 76 65 6c 2c 20 70 72 6f 63 73 2c  tchlevel, procs,
36b0: 20 73 63 72 69 70 74 2c 20 73 68 61 72 65 64 6c   script, sharedl
36c0: 69 62 65 78 74 65 6e 73 69 6f 6e 2c 20 74 63 6c  ibextension, tcl
36d0: 76 65 72 73 69 6f 6e 2c 20 6f 72 20 76 61 72 73  version, or vars
36e0: 7d 0a 20 74 65 73 74 20 69 6e 66 6f 2d 32 31 2e  }. test info-21.
36f0: 34 20 7b 6d 69 73 63 65 6c 6c 61 6e 65 6f 75 73  4 {miscellaneous
3700: 20 65 72 72 6f 72 20 63 6f 6e 64 69 74 69 6f 6e   error condition
3710: 73 7d 20 2d 72 65 74 75 72 6e 43 6f 64 65 73 20  s} -returnCodes 
3720: 65 72 72 6f 72 20 2d 62 6f 64 79 20 7b 0a 20 20  error -body {.  
3730: 20 20 20 69 6e 66 6f 20 6c 0a 2d 7d 20 2d 72 65     info l.-} -re
3740: 73 75 6c 74 20 7b 75 6e 6b 6e 6f 77 6e 20 6f 72  sult {unknown or
3750: 20 61 6d 62 69 67 75 6f 75 73 20 73 75 62 63 6f   ambiguous subco
3760: 6d 6d 61 6e 64 20 22 6c 22 3a 20 6d 75 73 74 20  mmand "l": must 
3770: 62 65 20 61 72 67 73 2c 20 62 6f 64 79 2c 20 63  be args, body, c
3780: 6c 61 73 73 2c 20 63 6d 64 63 6f 75 6e 74 2c 20  lass, cmdcount, 
3790: 63 6f 6d 6d 61 6e 64 73 2c 20 63 6f 6d 70 6c 65  commands, comple
37a0: 74 65 2c 20 63 6f 72 6f 75 74 69 6e 65 2c 20 64  te, coroutine, d
37b0: 65 66 61 75 6c 74 2c 20 65 78 69 73 74 73 2c 20  efault, exists, 
37c0: 66 72 61 6d 65 2c 20 66 75 6e 63 74 69 6f 6e 73  frame, functions
37d0: 2c 20 67 6c 6f 62 61 6c 73 2c 20 68 6f 73 74 6e  , globals, hostn
37e0: 61 6d 65 2c 20 6c 65 76 65 6c 2c 20 6c 69 62 72  ame, level, libr
37f0: 61 72 79 2c 20 6c 6f 61 64 65 64 2c 20 6c 6f 63  ary, loaded, loc
3800: 61 6c 73 2c 20 6e 61 6d 65 6f 66 65 78 65 63 75  als, nameofexecu
3810: 74 61 62 6c 65 2c 20 6f 62 6a 65 63 74 2c 20 70  table, object, p
3820: 61 74 63 68 6c 65 76 65 6c 2c 20 70 72 6f 63 73  atchlevel, procs
3830: 2c 20 73 63 72 69 70 74 2c 20 73 68 61 72 65 64  , script, shared
3840: 6c 69 62 65 78 74 65 6e 73 69 6f 6e 2c 20 74 63  libextension, tc
3850: 6c 76 65 72 73 69 6f 6e 2c 20 6f 72 20 76 61 72  lversion, or var
3860: 73 7d 0a 2b 7d 20 2d 72 65 73 75 6c 74 20 7b 75  s}.+} -result {u
3870: 6e 6b 6e 6f 77 6e 20 6f 72 20 61 6d 62 69 67 75  nknown or ambigu
3880: 6f 75 73 20 73 75 62 63 6f 6d 6d 61 6e 64 20 22  ous subcommand "
3890: 6c 22 3a 20 6d 75 73 74 20 62 65 20 61 72 67 73  l": must be args
38a0: 2c 20 62 6f 64 79 2c 20 63 6c 61 73 73 2c 20 63  , body, class, c
38b0: 6d 64 63 6f 75 6e 74 2c 20 63 6f 6d 6d 61 6e 64  mdcount, command
38c0: 73 2c 20 63 6f 6d 70 6c 65 74 65 2c 20 63 6f 72  s, complete, cor
38d0: 6f 75 74 69 6e 65 2c 20 64 65 66 61 75 6c 74 2c  outine, default,
38e0: 20 65 72 72 6f 72 73 74 61 63 6b 2c 20 65 78 69   errorstack, exi
38f0: 73 74 73 2c 20 66 72 61 6d 65 2c 20 66 75 6e 63  sts, frame, func
3900: 74 69 6f 6e 73 2c 20 67 6c 6f 62 61 6c 73 2c 20  tions, globals, 
3910: 68 6f 73 74 6e 61 6d 65 2c 20 6c 65 76 65 6c 2c  hostname, level,
3920: 20 6c 69 62 72 61 72 79 2c 20 6c 6f 61 64 65 64   library, loaded
3930: 2c 20 6c 6f 63 61 6c 73 2c 20 6e 61 6d 65 6f 66  , locals, nameof
3940: 65 78 65 63 75 74 61 62 6c 65 2c 20 6f 62 6a 65  executable, obje
3950: 63 74 2c 20 70 61 74 63 68 6c 65 76 65 6c 2c 20  ct, patchlevel, 
3960: 70 72 6f 63 73 2c 20 73 63 72 69 70 74 2c 20 73  procs, script, s
3970: 68 61 72 65 64 6c 69 62 65 78 74 65 6e 73 69 6f  haredlibextensio
3980: 6e 2c 20 74 63 6c 76 65 72 73 69 6f 6e 2c 20 6f  n, tclversion, o
3990: 72 20 76 61 72 73 7d 0a 20 74 65 73 74 20 69 6e  r vars}. test in
39a0: 66 6f 2d 32 31 2e 35 20 7b 6d 69 73 63 65 6c 6c  fo-21.5 {miscell
39b0: 61 6e 65 6f 75 73 20 65 72 72 6f 72 20 63 6f 6e  aneous error con
39c0: 64 69 74 69 6f 6e 73 7d 20 2d 72 65 74 75 72 6e  ditions} -return
39d0: 43 6f 64 65 73 20 65 72 72 6f 72 20 2d 62 6f 64  Codes error -bod
39e0: 79 20 7b 0a 20 20 20 20 20 69 6e 66 6f 20 73 0a  y {.     info s.
39f0: 2d 7d 20 2d 72 65 73 75 6c 74 20 7b 75 6e 6b 6e  -} -result {unkn
3a00: 6f 77 6e 20 6f 72 20 61 6d 62 69 67 75 6f 75 73  own or ambiguous
3a10: 20 73 75 62 63 6f 6d 6d 61 6e 64 20 22 73 22 3a   subcommand "s":
3a20: 20 6d 75 73 74 20 62 65 20 61 72 67 73 2c 20 62   must be args, b
3a30: 6f 64 79 2c 20 63 6c 61 73 73 2c 20 63 6d 64 63  ody, class, cmdc
3a40: 6f 75 6e 74 2c 20 63 6f 6d 6d 61 6e 64 73 2c 20  ount, commands, 
3a50: 63 6f 6d 70 6c 65 74 65 2c 20 63 6f 72 6f 75 74  complete, corout
3a60: 69 6e 65 2c 20 64 65 66 61 75 6c 74 2c 20 65 78  ine, default, ex
3a70: 69 73 74 73 2c 20 66 72 61 6d 65 2c 20 66 75 6e  ists, frame, fun
3a80: 63 74 69 6f 6e 73 2c 20 67 6c 6f 62 61 6c 73 2c  ctions, globals,
3a90: 20 68 6f 73 74 6e 61 6d 65 2c 20 6c 65 76 65 6c   hostname, level
3aa0: 2c 20 6c 69 62 72 61 72 79 2c 20 6c 6f 61 64 65  , library, loade
3ab0: 64 2c 20 6c 6f 63 61 6c 73 2c 20 6e 61 6d 65 6f  d, locals, nameo
3ac0: 66 65 78 65 63 75 74 61 62 6c 65 2c 20 6f 62 6a  fexecutable, obj
3ad0: 65 63 74 2c 20 70 61 74 63 68 6c 65 76 65 6c 2c  ect, patchlevel,
3ae0: 20 70 72 6f 63 73 2c 20 73 63 72 69 70 74 2c 20   procs, script, 
3af0: 73 68 61 72 65 64 6c 69 62 65 78 74 65 6e 73 69  sharedlibextensi
3b00: 6f 6e 2c 20 74 63 6c 76 65 72 73 69 6f 6e 2c 20  on, tclversion, 
3b10: 6f 72 20 76 61 72 73 7d 0a 2b 7d 20 2d 72 65 73  or vars}.+} -res
3b20: 75 6c 74 20 7b 75 6e 6b 6e 6f 77 6e 20 6f 72 20  ult {unknown or 
3b30: 61 6d 62 69 67 75 6f 75 73 20 73 75 62 63 6f 6d  ambiguous subcom
3b40: 6d 61 6e 64 20 22 73 22 3a 20 6d 75 73 74 20 62  mand "s": must b
3b50: 65 20 61 72 67 73 2c 20 62 6f 64 79 2c 20 63 6c  e args, body, cl
3b60: 61 73 73 2c 20 63 6d 64 63 6f 75 6e 74 2c 20 63  ass, cmdcount, c
3b70: 6f 6d 6d 61 6e 64 73 2c 20 63 6f 6d 70 6c 65 74  ommands, complet
3b80: 65 2c 20 63 6f 72 6f 75 74 69 6e 65 2c 20 64 65  e, coroutine, de
3b90: 66 61 75 6c 74 2c 20 65 72 72 6f 72 73 74 61 63  fault, errorstac
3ba0: 6b 2c 20 65 78 69 73 74 73 2c 20 66 72 61 6d 65  k, exists, frame
3bb0: 2c 20 66 75 6e 63 74 69 6f 6e 73 2c 20 67 6c 6f  , functions, glo
3bc0: 62 61 6c 73 2c 20 68 6f 73 74 6e 61 6d 65 2c 20  bals, hostname, 
3bd0: 6c 65 76 65 6c 2c 20 6c 69 62 72 61 72 79 2c 20  level, library, 
3be0: 6c 6f 61 64 65 64 2c 20 6c 6f 63 61 6c 73 2c 20  loaded, locals, 
3bf0: 6e 61 6d 65 6f 66 65 78 65 63 75 74 61 62 6c 65  nameofexecutable
3c00: 2c 20 6f 62 6a 65 63 74 2c 20 70 61 74 63 68 6c  , object, patchl
3c10: 65 76 65 6c 2c 20 70 72 6f 63 73 2c 20 73 63 72  evel, procs, scr
3c20: 69 70 74 2c 20 73 68 61 72 65 64 6c 69 62 65 78  ipt, sharedlibex
3c30: 74 65 6e 73 69 6f 6e 2c 20 74 63 6c 76 65 72 73  tension, tclvers
3c40: 69 6f 6e 2c 20 6f 72 20 76 61 72 73 7d 0a 20 0a  ion, or vars}. .
3c50: 20 23 23 0a 20 23 20 23 23 23 20 23 23 23 20 23   ##. # ### ### #
3c60: 23 23 20 23 23 23 23 23 23 23 23 23 20 23 23 23  ## ######### ###
3c70: 23 23 23 23 23 23 20 23 23 23 23 23 23 23 23 23  ###### #########
3c80: 0a 49 6e 64 65 78 3a 20 74 65 73 74 73 2f 69 6e  .Index: tests/in
3c90: 69 74 2e 74 65 73 74 0a 3d 3d 3d 3d 3d 3d 3d 3d  it.test.========
3ca0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
3cb0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
3cc0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
3cd0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 0a 52 43 53 20  ===========.RCS 
3ce0: 66 69 6c 65 3a 20 2f 63 76 73 72 6f 6f 74 2f 74  file: /cvsroot/t
3cf0: 63 6c 2f 74 63 6c 2f 74 65 73 74 73 2f 69 6e 69  cl/tcl/tests/ini
3d00: 74 2e 74 65 73 74 2c 76 0a 72 65 74 72 69 65 76  t.test,v.retriev
3d10: 69 6e 67 20 72 65 76 69 73 69 6f 6e 20 31 2e 31  ing revision 1.1
3d20: 39 0a 64 69 66 66 20 2d 75 20 2d 72 31 2e 31 39  9.diff -u -r1.19
3d30: 20 69 6e 69 74 2e 74 65 73 74 0a 2d 2d 2d 20 74   init.test.--- t
3d40: 65 73 74 73 2f 69 6e 69 74 2e 74 65 73 74 09 32  ests/init.test.2
3d50: 35 20 4a 75 6c 20 32 30 30 39 20 32 32 3a 30 30  5 Jul 2009 22:00
3d60: 3a 31 30 20 2d 30 30 30 30 09 31 2e 31 39 0a 2b  :10 -0000.1.19.+
3d70: 2b 2b 20 74 65 73 74 73 2f 69 6e 69 74 2e 74 65  ++ tests/init.te
3d80: 73 74 09 33 31 20 4f 63 74 20 32 30 30 39 20 31  st.31 Oct 2009 1
3d90: 36 3a 33 33 3a 34 35 20 2d 30 30 30 30 0a 40 40  6:33:45 -0000.@@
3da0: 20 2d 31 38 31 2c 37 20 2b 31 38 31 2c 37 20 40   -181,7 +181,7 @
3db0: 40 0a 20 20 20 20 20 6c 69 73 74 20 24 63 6f 64  @.     list $cod
3dc0: 65 20 24 66 6f 6f 20 24 62 61 72 20 24 63 6f 64  e $foo $bar $cod
3dd0: 65 32 20 24 66 6f 6f 32 20 24 62 61 72 32 0a 20  e2 $foo2 $bar2. 
3de0: 7d 20 2d 63 6c 65 61 6e 75 70 20 7b 0a 20 20 20  } -cleanup {.   
3df0: 20 20 75 6e 73 65 74 20 3a 3a 61 75 74 6f 5f 69    unset ::auto_i
3e00: 6e 64 65 78 28 3a 3a 78 78 78 29 0a 2d 7d 20 2d  ndex(::xxx).-} -
3e10: 72 65 73 75 6c 74 20 7b 32 20 78 78 78 20 7b 2d  result {2 xxx {-
3e20: 65 72 72 6f 72 63 6f 64 65 20 4e 4f 4e 45 20 2d  errorcode NONE -
3e30: 63 6f 64 65 20 31 20 2d 6c 65 76 65 6c 20 31 7d  code 1 -level 1}
3e40: 20 32 20 78 78 78 20 7b 2d 63 6f 64 65 20 31 20   2 xxx {-code 1 
3e50: 2d 6c 65 76 65 6c 20 31 20 2d 65 72 72 6f 72 63  -level 1 -errorc
3e60: 6f 64 65 20 4e 4f 4e 45 7d 7d 0a 2b 7d 20 2d 6d  ode NONE}}.+} -m
3e70: 61 74 63 68 20 67 6c 6f 62 20 2d 72 65 73 75 6c  atch glob -resul
3e80: 74 20 7b 32 20 78 78 78 20 7b 2d 65 72 72 6f 72  t {2 xxx {-error
3e90: 63 6f 64 65 20 4e 4f 4e 45 20 2d 65 72 72 6f 72  code NONE -error
3ea0: 73 74 61 63 6b 20 2a 20 2d 63 6f 64 65 20 31 20  stack * -code 1 
3eb0: 2d 6c 65 76 65 6c 20 31 7d 20 32 20 78 78 78 20  -level 1} 2 xxx 
3ec0: 7b 2d 63 6f 64 65 20 31 20 2d 6c 65 76 65 6c 20  {-code 1 -level 
3ed0: 31 20 2d 65 72 72 6f 72 63 6f 64 65 20 4e 4f 4e  1 -errorcode NON
3ee0: 45 20 2d 65 72 72 6f 72 73 74 61 63 6b 20 2a 7d  E -errorstack *}
3ef0: 7d 0a 20 0c 0a 20 63 6c 65 61 6e 75 70 54 65 73  }. .. cleanupTes
3f00: 74 73 0a 20 7d 09 3b 23 20 20 45 6e 64 20 6f 66  ts. }.;#  End of
3f10: 20 5b 69 6e 74 65 72 70 20 65 76 61 6c 20 24 74   [interp eval $t
3f20: 65 73 74 49 6e 74 65 72 70 5d 0a                 estInterp].