diff options
| -rw-r--r-- | library/init.tcl | 653 | ||||
| -rw-r--r-- | library/ldAout.tcl | 34 | ||||
| -rw-r--r-- | library/safe.tcl | 8 |
3 files changed, 337 insertions, 358 deletions
diff --git a/library/init.tcl b/library/init.tcl index ba06988..8b0f5e5 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -3,7 +3,7 @@ # Default system startup file for Tcl-based applications. Defines # "unknown" procedure and auto-load facilities. # -# RCS: @(#) $Id: init.tcl,v 1.20 1998/11/02 23:03:34 stanton Exp $ +# RCS: @(#) $Id: init.tcl,v 1.21 1998/11/11 02:39:29 welch Exp $ # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -686,97 +686,101 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { # special parser and mess with its commands. If this is a safe # interpreter, we simply clip these procs out. -if {[interp issafe]} { - proc auto_mkindex {dir args} { - error "can't generate index within safe interpreter" - } - proc tcl_nonsafe {args} {} -} else { - proc tcl_nonsafe {args} {eval $args} -} +if {! [interp issafe]} { -# auto_mkindex -- -# Regenerate a tclIndex file from Tcl source files. Takes as argument -# the name of the directory in which the tclIndex file is to be placed, -# followed by any number of glob patterns to use in that directory to -# locate all of the relevant files. -# -# Arguments: -# dir - Name of the directory in which to create an index. -# args - Any number of additional arguments giving the -# names of files within dir. If no additional -# are given auto_mkindex will look for *.tcl. + # auto_mkindex -- + # Regenerate a tclIndex file from Tcl source files. Takes as argument + # the name of the directory in which the tclIndex file is to be placed, + # followed by any number of glob patterns to use in that directory to + # locate all of the relevant files. + # + # Arguments: + # dir - Name of the directory in which to create an index. + # args - Any number of additional arguments giving the + # names of files within dir. If no additional + # are given auto_mkindex will look for *.tcl. -tcl_nonsafe proc auto_mkindex {dir args} { - global errorCode errorInfo + proc auto_mkindex {dir args} { + global errorCode errorInfo - if {[interp issafe]} { - error "can't generate index within safe interpreter" - } + set oldDir [pwd] + cd $dir + set dir [pwd] + + append index "# Tcl autoload index file, version 2.0\n" + append index "# This file is generated by the \"auto_mkindex\" command\n" + append index "# and sourced to set up indexing information for one or\n" + append index "# more commands. Typically each line is a command that\n" + append index "# sets an element in the auto_index array, where the\n" + append index "# element name is the name of a command and the value is\n" + append index "# a script that loads the command.\n\n" + if {$args == ""} { + set args *.tcl + } + auto_mkindex_parser::init + foreach file [eval glob $args] { + if {[catch {auto_mkindex_parser::mkindex $file} msg] == 0} { + append index $msg + } else { + set code $errorCode + set info $errorInfo + cd $oldDir + error $msg $info $code + } + } + auto_mkindex_parser::cleanup - set oldDir [pwd] - cd $dir - set dir [pwd] - - append index "# Tcl autoload index file, version 2.0\n" - append index "# This file is generated by the \"auto_mkindex\" command\n" - append index "# and sourced to set up indexing information for one or\n" - append index "# more commands. Typically each line is a command that\n" - append index "# sets an element in the auto_index array, where the\n" - append index "# element name is the name of a command and the value is\n" - append index "# a script that loads the command.\n\n" - if {$args == ""} { - set args *.tcl - } - auto_mkindex_parser::init - foreach file [eval glob $args] { - if {[catch {auto_mkindex_parser::mkindex $file} msg] == 0} { - append index $msg - } else { - set code $errorCode - set info $errorInfo - cd $oldDir - error $msg $info $code - } + set fid [open "tclIndex" w] + puts $fid $index nonewline + close $fid + cd $oldDir } - auto_mkindex_parser::cleanup - - set fid [open "tclIndex" w] - puts $fid $index nonewline - close $fid - cd $oldDir -} -# Original version of auto_mkindex that just searches the source -# code for "proc" at the beginning of the line. + # Original version of auto_mkindex that just searches the source + # code for "proc" at the beginning of the line. -proc auto_mkindex_old {dir args} { - global errorCode errorInfo - set oldDir [pwd] - cd $dir - set dir [pwd] - append index "# Tcl autoload index file, version 2.0\n" - append index "# This file is generated by the \"auto_mkindex\" command\n" - append index "# and sourced to set up indexing information for one or\n" - append index "# more commands. Typically each line is a command that\n" - append index "# sets an element in the auto_index array, where the\n" - append index "# element name is the name of a command and the value is\n" - append index "# a script that loads the command.\n\n" - if {$args == ""} { - set args *.tcl - } - foreach file [eval glob $args] { - set f "" - set error [catch { - set f [open $file] - while {[gets $f line] >= 0} { - if {[regexp {^proc[ ]+([^ ]*)} $line match procName]} { - set procName [lindex [auto_qualify $procName "::"] 0] - append index "set [list auto_index($procName)]" - append index " \[list source \[file join \$dir [list $file]\]\]\n" + proc auto_mkindex_old {dir args} { + global errorCode errorInfo + set oldDir [pwd] + cd $dir + set dir [pwd] + append index "# Tcl autoload index file, version 2.0\n" + append index "# This file is generated by the \"auto_mkindex\" command\n" + append index "# and sourced to set up indexing information for one or\n" + append index "# more commands. Typically each line is a command that\n" + append index "# sets an element in the auto_index array, where the\n" + append index "# element name is the name of a command and the value is\n" + append index "# a script that loads the command.\n\n" + if {$args == ""} { + set args *.tcl + } + foreach file [eval glob $args] { + set f "" + set error [catch { + set f [open $file] + while {[gets $f line] >= 0} { + if {[regexp {^proc[ ]+([^ ]*)} $line match procName]} { + set procName [lindex [auto_qualify $procName "::"] 0] + append index "set [list auto_index($procName)]" + append index " \[list source \[file join \$dir [list $file]\]\]\n" + } } + close $f + } msg] + if {$error} { + set code $errorCode + set info $errorInfo + catch {close $f} + cd $oldDir + error $msg $info $code } + } + set f "" + set error [catch { + set f [open tclIndex w] + puts $f $index nonewline close $f + cd $oldDir } msg] if {$error} { set code $errorCode @@ -786,287 +790,272 @@ proc auto_mkindex_old {dir args} { error $msg $info $code } } - set f "" - set error [catch { - set f [open tclIndex w] - puts $f $index nonewline - close $f - cd $oldDir - } msg] - if {$error} { - set code $errorCode - set info $errorInfo - catch {close $f} - cd $oldDir - error $msg $info $code - } -} -# Create a safe interpreter that can be used to parse Tcl source files -# generate a tclIndex file for autoloading. This interp contains -# commands for things that need index entries. Each time a command -# is executed, it writes an entry out to the index file. - -namespace eval auto_mkindex_parser { - variable parser "" ;# parser used to build index - variable index "" ;# maintains index as it is built - variable scriptFile "" ;# name of file being processed - variable contextStack "" ;# stack of namespace scopes - variable imports "" ;# keeps track of all imported cmds - variable initCommands "" ;# list of commands that create aliases - proc init {} { - variable parser - variable initCommands - if {![interp issafe]} { - set parser [interp create -safe] - $parser hide info - $parser hide rename - $parser hide proc - $parser hide namespace - $parser hide eval - $parser hide puts - $parser invokehidden namespace delete :: - $parser invokehidden proc unknown {args} {} - - # - # We'll need access to the "namespace" command within the - # interp. Put it back, but move it out of the way. - # - $parser expose namespace - $parser invokehidden rename namespace _%@namespace - $parser expose eval - $parser invokehidden rename eval _%@eval - - # Install all the registered psuedo-command implementations - - foreach cmd $initCommands { - eval $cmd + # Create a safe interpreter that can be used to parse Tcl source files + # generate a tclIndex file for autoloading. This interp contains + # commands for things that need index entries. Each time a command + # is executed, it writes an entry out to the index file. + + namespace eval auto_mkindex_parser { + variable parser "" ;# parser used to build index + variable index "" ;# maintains index as it is built + variable scriptFile "" ;# name of file being processed + variable contextStack "" ;# stack of namespace scopes + variable imports "" ;# keeps track of all imported cmds + variable initCommands "" ;# list of commands that create aliases + proc init {} { + variable parser + variable initCommands + if {![interp issafe]} { + set parser [interp create -safe] + $parser hide info + $parser hide rename + $parser hide proc + $parser hide namespace + $parser hide eval + $parser hide puts + $parser invokehidden namespace delete :: + $parser invokehidden proc unknown {args} {} + + # + # We'll need access to the "namespace" command within the + # interp. Put it back, but move it out of the way. + # + $parser expose namespace + $parser invokehidden rename namespace _%@namespace + $parser expose eval + $parser invokehidden rename eval _%@eval + + # Install all the registered psuedo-command implementations + + foreach cmd $initCommands { + eval $cmd + } } } + proc cleanup {} { + variable parser + interp delete $parser + unset parser + } } - proc cleanup {} { - variable parser - interp delete $parser - unset parser - } -} -# auto_mkindex_parser::mkindex -- -# Used by the "auto_mkindex" command to create a "tclIndex" file for -# the given Tcl source file. Executes the commands in the file, and -# handles things like the "proc" command by adding an entry for the -# index file. Returns a string that represents the index file. -# -# Arguments: -# file - Name of Tcl source file to be indexed. + # auto_mkindex_parser::mkindex -- + # Used by the "auto_mkindex" command to create a "tclIndex" file for + # the given Tcl source file. Executes the commands in the file, and + # handles things like the "proc" command by adding an entry for the + # index file. Returns a string that represents the index file. + # + # Arguments: + # file - Name of Tcl source file to be indexed. -tcl_nonsafe proc auto_mkindex_parser::mkindex {file} { - variable parser - variable index - variable scriptFile - variable contextStack - variable imports + proc auto_mkindex_parser::mkindex {file} { + variable parser + variable index + variable scriptFile + variable contextStack + variable imports - set scriptFile $file + set scriptFile $file - set fid [open $file] - set contents [read $fid] - close $fid + set fid [open $file] + set contents [read $fid] + close $fid - # There is one problem with sourcing files into the safe - # interpreter: references like "$x" will fail since code is not - # really being executed and variables do not really exist. - # Be careful to escape all naked "$" before evaluating. + # There is one problem with sourcing files into the safe + # interpreter: references like "$x" will fail since code is not + # really being executed and variables do not really exist. + # Be careful to escape all naked "$" before evaluating. - regsub -all {([^\$])\$([^\$])} $contents {\1\\$\2} contents + regsub -all {([^\$])\$([^\$])} $contents {\1\\$\2} contents - set index "" - set contextStack "" - set imports "" + set index "" + set contextStack "" + set imports "" - $parser eval $contents + $parser eval $contents - foreach name $imports { - catch {$parser eval [list _%@namespace forget $name]} + foreach name $imports { + catch {$parser eval [list _%@namespace forget $name]} + } + return $index } - return $index -} -# auto_mkindex_parser::hook command -# Registers a Tcl command to evaluate when initializing the -# slave interpreter used by the mkindex parser. -# The command is evaluated in the master interpreter, and can -# use the variable auto_mkindex_parser::parser to get to the slave + # auto_mkindex_parser::hook command + # Registers a Tcl command to evaluate when initializing the + # slave interpreter used by the mkindex parser. + # The command is evaluated in the master interpreter, and can + # use the variable auto_mkindex_parser::parser to get to the slave -tcl_nonsafe proc auto_mkindex_parser::hook {cmd} { - variable initCommands + proc auto_mkindex_parser::hook {cmd} { + variable initCommands - lappend initCommands $cmd -} + lappend initCommands $cmd + } -# auto_mkindex_parser::slavehook command -# Registers a Tcl command to evaluate when initializing the -# slave interpreter used by the mkindex parser. -# The command is evaluated in the slave interpreter. + # auto_mkindex_parser::slavehook command + # Registers a Tcl command to evaluate when initializing the + # slave interpreter used by the mkindex parser. + # The command is evaluated in the slave interpreter. -tcl_nonsafe proc auto_mkindex_parser::slavehook {cmd} { - variable initCommands + proc auto_mkindex_parser::slavehook {cmd} { + variable initCommands - lappend initCommands "\$parser eval [list $cmd]" -} + lappend initCommands "\$parser eval [list $cmd]" + } -# auto_mkindex_parser::command -- -# Registers a new command with the "auto_mkindex_parser" interpreter -# that parses Tcl files. These commands are fake versions of things -# like the "proc" command. When you execute them, they simply write -# out an entry to a "tclIndex" file for auto-loading. -# -# This procedure allows extensions to register their own commands -# with the auto_mkindex facility. For example, a package like -# [incr Tcl] might register a "class" command so that class definitions -# could be added to a "tclIndex" file for auto-loading. -# -# Arguments: -# name - Name of command recognized in Tcl files. -# arglist - Argument list for command. -# body - Implementation of command to handle indexing. + # auto_mkindex_parser::command -- + # Registers a new command with the "auto_mkindex_parser" interpreter + # that parses Tcl files. These commands are fake versions of things + # like the "proc" command. When you execute them, they simply write + # out an entry to a "tclIndex" file for auto-loading. + # + # This procedure allows extensions to register their own commands + # with the auto_mkindex facility. For example, a package like + # [incr Tcl] might register a "class" command so that class definitions + # could be added to a "tclIndex" file for auto-loading. + # + # Arguments: + # name - Name of command recognized in Tcl files. + # arglist - Argument list for command. + # body - Implementation of command to handle indexing. -tcl_nonsafe proc auto_mkindex_parser::command {name arglist body} { - hook [list auto_mkindex_parser::commandInit $name $arglist $body] -} + proc auto_mkindex_parser::command {name arglist body} { + hook [list auto_mkindex_parser::commandInit $name $arglist $body] + } -# auto_mkindex_parser::commandInit -- -# This does the actual work set up by auto_mkindex_parser::command -# This is called when the interpreter used by the parser is created. + # auto_mkindex_parser::commandInit -- + # This does the actual work set up by auto_mkindex_parser::command + # This is called when the interpreter used by the parser is created. -tcl_nonsafe proc auto_mkindex_parser::commandInit {name arglist body} { - variable parser + proc auto_mkindex_parser::commandInit {name arglist body} { + variable parser - set ns [namespace qualifiers $name] - set tail [namespace tail $name] - if {$ns == ""} { - set fakeName "[namespace current]::_%@fake_$tail" - } else { - set fakeName "_%@fake_$name" - regsub -all {::} $fakeName "_" fakeName - set fakeName "[namespace current]::$fakeName" - } - proc $fakeName $arglist $body + set ns [namespace qualifiers $name] + set tail [namespace tail $name] + if {$ns == ""} { + set fakeName "[namespace current]::_%@fake_$tail" + } else { + set fakeName "_%@fake_$name" + regsub -all {::} $fakeName "_" fakeName + set fakeName "[namespace current]::$fakeName" + } + proc $fakeName $arglist $body - # - # YUK! Tcl won't let us alias fully qualified command names, - # so we can't handle names like "::itcl::class". Instead, - # we have to build procs with the fully qualified names, and - # have the procs point to the aliases. - # - if {[regexp {::} $name]} { - set exportCmd [list _%@namespace export [namespace tail $name]] - $parser eval [list _%@namespace eval $ns $exportCmd] - set alias [namespace tail $fakeName] - $parser invokehidden proc $name {args} "_%@eval $alias \$args" - $parser alias $alias $fakeName - } else { - $parser alias $name $fakeName + # + # YUK! Tcl won't let us alias fully qualified command names, + # so we can't handle names like "::itcl::class". Instead, + # we have to build procs with the fully qualified names, and + # have the procs point to the aliases. + # + if {[regexp {::} $name]} { + set exportCmd [list _%@namespace export [namespace tail $name]] + $parser eval [list _%@namespace eval $ns $exportCmd] + set alias [namespace tail $fakeName] + $parser invokehidden proc $name {args} "_%@eval $alias \$args" + $parser alias $alias $fakeName + } else { + $parser alias $name $fakeName + } + return } - return -} -# auto_mkindex_parser::fullname -- -# Used by commands like "proc" within the auto_mkindex parser. -# Returns the qualified namespace name for the "name" argument. -# If the "name" does not start with "::", elements are added from -# the current namespace stack to produce a qualified name. Then, -# the name is examined to see whether or not it should really be -# qualified. If the name has more than the leading "::", it is -# returned as a fully qualified name. Otherwise, it is returned -# as a simple name. That way, the Tcl autoloader will recognize -# it properly. -# -# Arguments: -# name - Name that is being added to index. + # auto_mkindex_parser::fullname -- + # Used by commands like "proc" within the auto_mkindex parser. + # Returns the qualified namespace name for the "name" argument. + # If the "name" does not start with "::", elements are added from + # the current namespace stack to produce a qualified name. Then, + # the name is examined to see whether or not it should really be + # qualified. If the name has more than the leading "::", it is + # returned as a fully qualified name. Otherwise, it is returned + # as a simple name. That way, the Tcl autoloader will recognize + # it properly. + # + # Arguments: + # name - Name that is being added to index. -tcl_nonsafe proc auto_mkindex_parser::fullname {name} { - variable contextStack + proc auto_mkindex_parser::fullname {name} { + variable contextStack - if {![string match ::* $name]} { - foreach ns $contextStack { - set name "${ns}::$name" - if {[string match ::* $name]} { - break - } - } - } + if {![string match ::* $name]} { + foreach ns $contextStack { + set name "${ns}::$name" + if {[string match ::* $name]} { + break + } + } + } - if {[namespace qualifiers $name] == ""} { - return [namespace tail $name] - } elseif {![string match ::* $name]} { - return "::$name" + if {[namespace qualifiers $name] == ""} { + return [namespace tail $name] + } elseif {![string match ::* $name]} { + return "::$name" + } + return $name } - return $name -} -# Register all of the procedures for the auto_mkindex parser that -# will build the "tclIndex" file. + # Register all of the procedures for the auto_mkindex parser that + # will build the "tclIndex" file. -# AUTO MKINDEX: proc name arglist body -# Adds an entry to the auto index list for the given procedure name. + # AUTO MKINDEX: proc name arglist body + # Adds an entry to the auto index list for the given procedure name. -tcl_nonsafe auto_mkindex_parser::command proc {name args} { - variable index - variable scriptFile - append index "set [list auto_index([fullname $name])]" - append index " \[list source \[file join \$dir [list $scriptFile]\]\]\n" -} + auto_mkindex_parser::command proc {name args} { + variable index + variable scriptFile + append index "set [list auto_index([fullname $name])]" + append index " \[list source \[file join \$dir [list $scriptFile]\]\]\n" + } -# AUTO MKINDEX: namespace eval name command ?arg arg...? -# Adds the namespace name onto the context stack and evaluates the -# associated body of commands. -# -# AUTO MKINDEX: namespace import ?-force? pattern ?pattern...? -# Performs the "import" action in the parser interpreter. This is -# important for any commands contained in a namespace that affect -# the index. For example, a script may say "itcl::class ...", -# or it may import "itcl::*" and then say "class ...". This -# procedure does the import operation, but keeps track of imported -# patterns so we can remove the imports later. - -tcl_nonsafe auto_mkindex_parser::command namespace {op args} { - switch -- $op { - eval { - variable parser - variable contextStack - - set name [lindex $args 0] - set args [lrange $args 1 end] - - set contextStack [linsert $contextStack 0 $name] - if {[llength $args] == 1} { - $parser eval [lindex $args 0] - } else { - eval $parser eval $args - } - set contextStack [lrange $contextStack 1 end] - } - import { - variable parser - variable imports - foreach pattern $args { - if {$pattern != "-force"} { - lappend imports $pattern - } - } - catch {$parser eval "_%@namespace import $args"} - } + # AUTO MKINDEX: namespace eval name command ?arg arg...? + # Adds the namespace name onto the context stack and evaluates the + # associated body of commands. + # + # AUTO MKINDEX: namespace import ?-force? pattern ?pattern...? + # Performs the "import" action in the parser interpreter. This is + # important for any commands contained in a namespace that affect + # the index. For example, a script may say "itcl::class ...", + # or it may import "itcl::*" and then say "class ...". This + # procedure does the import operation, but keeps track of imported + # patterns so we can remove the imports later. + + auto_mkindex_parser::command namespace {op args} { + switch -- $op { + eval { + variable parser + variable contextStack + + set name [lindex $args 0] + set args [lrange $args 1 end] + + set contextStack [linsert $contextStack 0 $name] + if {[llength $args] == 1} { + $parser eval [lindex $args 0] + } else { + eval $parser eval $args + } + set contextStack [lrange $contextStack 1 end] + } + import { + variable parser + variable imports + foreach pattern $args { + if {$pattern != "-force"} { + lappend imports $pattern + } + } + catch {$parser eval "_%@namespace import $args"} + } + } } -} -rename tcl_nonsafe "" +# Close of the if ![interp issafe] block +} # pkg_compareExtension -- # # Used internally by pkg_mkIndex to compare the extension of a file to -# a given extension. On Windows, it uses a case-insensitive comparison -# because the file system can be file insensitive. +# a given extension. On Windows, it uses a case-insensitive comparison. # # Arguments: # fileName name of a file whose extension is compared @@ -1077,20 +1066,16 @@ rename tcl_nonsafe "" # Results: # Returns 1 if the extension matches, 0 otherwise -if {$::tcl_platform(platform) == "windows"} { - proc pkg_compareExtension { fileName {ext {}} } { - if {[string compare $ext {}] == 0} { - set ext [info sharedlibextension] - } - return [expr {[string compare \ - [string tolower [file extension $fileName]] \ - [string tolower $ext]] == 0}] +proc pkg_compareExtension { fileName {ext {}} } { + global tcl_platform + if {[string length $ext] == 0} { + set ext [info sharedlibextension] } -} else { - proc pkg_compareExtension { fileName {ext {}} } { - if {[string compare $ext {}] == 0} { - set ext [info sharedlibextension] - } + if {[string compare $tcl_platform(platform) "windows"] == 0} { + return [expr {[string compare \ + [string tolower [file extension $fileName]] \ + [string tolower $ext]] == 0}] + } else { return [expr {[string compare [file extension $fileName] $ext] == 0}] } } diff --git a/library/ldAout.tcl b/library/ldAout.tcl index 11d301e..ad12624 100644 --- a/library/ldAout.tcl +++ b/library/ldAout.tcl @@ -18,7 +18,7 @@ # its .o file placed before all others in the command; then # "ld" is executed to bind the objects together. # -# RCS: @(#) $Id: ldAout.tcl,v 1.2 1998/09/14 18:40:03 stanton Exp $ +# RCS: @(#) $Id: ldAout.tcl,v 1.3 1998/11/11 02:39:31 welch Exp $ # # Copyright (c) 1995, by General Electric Company. All rights reserved. # @@ -98,9 +98,9 @@ proc tclLdAout {{cc {}} {shlib_suffix {}} {shlib_cflags none}} { } elseif {![string compare $a -o]} { set minusO 1 } - if [regexp {^-[lL]} $a] { + if {[regexp {^-[lL]} $a]} { lappend libraries $a - if [regexp {^-L} $a] { + if {[regexp {^-L} $a]} { lappend libdirs [string range $a 2 end] } } elseif {$seenDotO} { @@ -116,10 +116,10 @@ proc tclLdAout {{cc {}} {shlib_suffix {}} {shlib_cflags none}} { set libs {} foreach lib $libraries { - if [regexp {^-l} $lib] { + if {[regexp {^-l} $lib]} { set lname [string range $lib 2 end] foreach dir $libdirs { - if [file exists [file join $dir lib${lname}_G0.a]] { + if {[file exists [file join $dir lib${lname}_G0.a]]} { set lname ${lname}_G0 break } @@ -137,22 +137,22 @@ proc tclLdAout {{cc {}} {shlib_suffix {}} {shlib_cflags none}} { error "-o option must be supplied to link a Tcl load module" } set m [file tail $outputFile] - if [regexp {\.a$} $outputFile] { + if {[regexp {\.a$} $outputFile]} { set shlib_suffix .a } else { set shlib_suffix "" } - if [regexp {\..*$} $outputFile match] { - set l [expr [string length $m] - [string length $match]] + if {[regexp {\..*$} $outputFile match]} { + set l [expr {[string length $m] - [string length $match]}] } else { error "Output file does not appear to have a suffix" } - set modName [string tolower [string range $m 0 [expr $l-1]]] - if [regexp {^lib} $modName] { + set modName [string tolower [string range $m 0 [expr {$l-1}]]] + if {[regexp {^lib} $modName]} { set modName [string range $modName 3 end] } - if [regexp {[0-9\.]*(_g0)?$} $modName match] { - set modName [string range $modName 0 [expr [string length $modName]-[string length $match]-1]] + if {[regexp {[0-9\.]*(_g0)?$} $modName match]} { + set modName [string range $modName 0 [expr {[string length $modName]-[string length $match]-1}]] } set modName "[string toupper [string index $modName 0]][string range $modName 1 end]" @@ -160,7 +160,7 @@ proc tclLdAout {{cc {}} {shlib_suffix {}} {shlib_cflags none}} { set f [open $nmCommand r] while {[gets $f l] >= 0} { - if [regexp {T[ ]*_?([A-Z][a-z0-9_]*_(Safe)?Init(__FP10Tcl_Interp)?)$} $l trash symbol] { + if {[regexp {T[ ]*_?([A-Z][a-z0-9_]*_(Safe)?Init(__FP10Tcl_Interp)?)$} $l trash symbol]} { if {![regexp {_?([A-Z][a-z0-9_]*_(Safe)?Init)} $symbol trash s]} { set s $symbol } @@ -219,10 +219,10 @@ proc tclLdAout {{cc {}} {shlib_suffix {}} {shlib_cflags none}} { set ldCommand "ar cr $outputFile" regsub { -o} $tail {} tail } else { - set ldCommand ld - foreach item $head { - lappend ldCommand $item - } + set ldCommand ld + foreach item $head { + lappend ldCommand $item + } } lappend ldCommand tcl$modName.o foreach item $tail { diff --git a/library/safe.tcl b/library/safe.tcl index 1b84d61..44def92 100644 --- a/library/safe.tcl +++ b/library/safe.tcl @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: safe.tcl,v 1.3 1998/09/14 18:40:03 stanton Exp $ +# RCS: @(#) $Id: safe.tcl,v 1.4 1998/11/11 02:39:31 welch Exp $ # # The implementation is based on namespaces. These naming conventions @@ -32,12 +32,6 @@ namespace eval ::safe { interpAddToAccessPath interpFindInAccessPath \ setLogCmd ; -# Proto/dummy declarations for auto_mkIndex -proc ::safe::interpCreate {} {} -proc ::safe::interpInit {} {} -proc ::safe::interpConfigure {} {} - - #### # # Setup the arguments parsing |