Complete shell.c maker's migration to TCL v.8.4

FossilOrigin-Name: e4b9b5b14bcb7b4c19ba47a7d5c74764b9122d36be82f52053cafcee144c581e

diff --git a/manifest b/manifest
index 8e9aaf466e344efd1da1081c9a7ea6970f07dbfb..700bfc8ba9f8431576d28ae28f462241d3597b1f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Get\sshell.c\smaker\sacceptable\sto\sTCL\sv8.4\sand\sminor\stweaks
-D 2021-09-02T16:29:53.220
+C Complete\sshell.c\smaker's\smigration\sto\sTCL\sv.8.4
+D 2021-09-05T18:45:38.604
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1854,7 +1854,7 @@ F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61
 F tool/mkopcodeh.tcl 130b88697da6ec5b89b41844d955d08fb62c2552e889dec8c7bcecb28d8f50bd
 F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
 F tool/mkpragmatab.tcl 7f6db47d1995bc08247255622524567b2ab8962d98063f8aef97e35c3c54e3b8
-F tool/mkshellc.tcl 03939222e3291b96cf1fffe989ce2425c0964e49ea5975c7dc7d3f8b6deadf6d
+F tool/mkshellc.tcl 411eec479747ed1ab3083cfb1f6ad5adc6e0513dbb43457d1ecbb38f185fb0f7
 F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
@@ -1920,7 +1920,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c7c84998dbec5dfd71d62e12cfa741edba4b6439cc384ab46b21199f290feedd
-R 6e2e47da720de4d046b66bea83d7e73e
+P c60f4f90c954eee6a2b644c50aca9a4ed7616d89177fd1c6acb997a362d9abff
+R f8fde1e6d9349d728c3d53f4be4fa502
 U larrybr
-Z fb4c46974e0f94bf6d79643019372d05
+Z 465b5f34f9ce5fabad331f9659d67e22

diff --git a/manifest.uuid b/manifest.uuid
index 9b150efcd7bb7b414203ffaa86b769741a819ccb..2e1cd96e0653c0f4fa023f1ca0e18b5bc39836eb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c60f4f90c954eee6a2b644c50aca9a4ed7616d89177fd1c6acb997a362d9abff
\ No newline at end of file
+e4b9b5b14bcb7b4c19ba47a7d5c74764b9122d36be82f52053cafcee144c581e
\ No newline at end of file

diff --git a/tool/mkshellc.tcl b/tool/mkshellc.tcl
index d8abac6c2fd6679a6ac3428ddc1efa9a904422ad..4ec2d86a9c164d5e56732902298cc885001445bc 100644 (file)
--- a/tool/mkshellc.tcl
+++ b/tool/mkshellc.tcl
@@ -39,7 +39,8 @@ set infiles {}
 array set ::incTypes [list "*" {}]
 
 while  {[llength $argv] > 0} {
-  set argv [lassign $argv opt]
+  set opt [lindex $argv 0]
+  set argv [lreplace $argv 0 0]
   if {[regexp {^-{1,2}((help)|(details)|(parameters))$} $opt ma ho]} {
     switch $ho {
       help {set customRun 2}
@@ -47,7 +48,8 @@ while  {[llength $argv] > 0} {
       parameters {set customRun 4}
     }
   } elseif {[regexp {^-it$} $opt]} {
-    set argv [lassign $argv nextOpt]
+    set nextOpt [lindex $argv 0]
+    set argv [lreplace $argv 0 0]
     if {![regexp {^(\w+)=(.+)$} $nextOpt ma k v]} {
       puts stderr "Get help with --help."
       exit 1 
@@ -65,12 +67,13 @@ while  {[llength $argv] > 0} {
   }
 }
 if {[llength $infiles] == 0} {
-  set in [open $topdir/src/shell.c.in]
+  set in [open $topdir/src/shell.c.in r]
 } else {
-  set infiles [lassign $infiles infile]
-  set in [open $infile]
+  set infile [lindex $infiles 0]
+  set infiles [lreplace $infiles 0 0]
+  set in [open $infile r]
 }
-fconfigure $in -translation binary
+fconfigure $in -translation auto
 
 array set ::cmd_help {}
 array set ::cmd_dispatch {}
@@ -314,7 +317,8 @@ proc DISPATCHABLE_COMMAND {hFile tailCapture ostrm} {
   # Generate and emit a function definition, maybe wrapped as set by
   # CONDITION_COMMAND(), and generate/collect its dispatch table entry,
   # as determined by its actual arguments and DISPATCH_CONFIG parameters.
-  lassign $tailCapture args tc
+  set args [lindex $tailCapture 0]
+  set tc [lindex $tailCapture 1]
   if {$tc ne $::lb} {
     yap_usage "DISPATCHABLE_COMMAND($args)$tc" DISPATCHABLE_COMMAND
     incr $::iShuffleErrors
@@ -501,7 +505,8 @@ while {1} {
     set cfile [lindex $lx 1]
     puts $out "/************************* Begin $cfile ******************/"
 #   puts $out "#line 1 \"$cfile\""
-    set in2 [open $topdir/src/$cfile rb]
+    set in2 [open $topdir/src/$cfile r]
+    fconfigure $in2 -translation auto
     while {![eof $in2]} {
       set lx [transform_line [gets $in2] 1]
       do_shuffle $in2 $lx $out