Index: openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl,v diff -u -r1.3.10.1 -r1.3.10.2 --- openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl 29 Sep 2013 11:50:55 -0000 1.3.10.1 +++ openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl 29 Sep 2013 19:23:18 -0000 1.3.10.2 @@ -635,7 +635,7 @@ set attr {} set attlist {} } else { - eval lappend attlist $attr + lappend attlist {*}$attr } set attr $attlist @@ -1242,7 +1242,7 @@ if {$var($pos) == {}} { lappend U $accepting } else { - eval lappend U $var($pos) + lappend U {*}$var($pos) } } } @@ -1279,9 +1279,9 @@ :seq { for {set i 1} {$i < [llength [lindex $st 1]]} {incr i} { followpos $state [lindex [lindex $st 1] $i] \ - [lindex [lindex $firstpos 0] [expr {$i - 1}]] \ - [lindex [lindex $lastpos 0] [expr {$i - 1}]] - foreach pos [lindex [lindex [lindex $lastpos 0] [expr {$i - 1}]] 1] { + [lindex [lindex $firstpos 0] $i-1] \ + [lindex [lindex $lastpos 0] $i-1] + foreach pos [lindex [lindex [lindex $lastpos 0] $i-1] 1] { eval lappend var($pos) [lindex [lindex [lindex $firstpos 0] $i] 1] set var($pos) [makeSet $var($pos)] } @@ -1290,8 +1290,8 @@ :choice { for {set i 1} {$i < [llength [lindex $st 1]]} {incr i} { followpos $state [lindex [lindex $st 1] $i] \ - [lindex [lindex $firstpos 0] [expr {$i - 1}]] \ - [lindex [lindex $lastpos 0] [expr {$i - 1}]] + [lindex [lindex $firstpos 0] $i-1] \ + [lindex [lindex $lastpos 0] $i-1] } } default { @@ -1380,15 +1380,15 @@ set result [lindex [lindex $firstpos 0] 1] for {set i 0} {$i < [llength $nullable]} {incr i} { if {[lindex [lindex $nullable $i] 1]} { - eval lappend result [lindex [lindex $firstpos [expr {$i + 1}]] 1] + lappend result {*}[lindex [lindex $firstpos $i+1] 1] } else { break } } } :choice { foreach child $firstpos { - eval lappend result $child + lappend result {*}$child } } } @@ -1415,15 +1415,15 @@ set result [lindex [lindex $lastpos end] 1] for {set i [expr {[llength $nullable] - 1}]} {$i >= 0} {incr i -1} { if {[lindex [lindex $nullable $i] 1]} { - eval lappend result [lindex [lindex $lastpos $i] 1] + lappend result {*}[lindex [lindex $lastpos $i] 1] } else { break } } } :choice { foreach child $lastpos { - eval lappend result $child + lappend result {*}$child } } }