Merge pull request #3 from ambaker1/performance

Slight performance boost for SingleMap case
ambaker1 · Sep 30, 2023 · f3b55c3 · f3b55c3
2 parents 6ea5ee4 + 1e8fdb0
commit f3b55c3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/build.tcl b/build.tcl
@@ -1,7 +1,7 @@
 package require tin 1.0
 tin import assert from tin
 tin import tcltest
-set version 0.2
+set version 0.2.1
 set vutil_version 1.1
 set config [dict create VERSION $version VUTIL_VERSION $vutil_version]
 tin bake src build $config

diff --git a/doc/ndlist.pdf b/doc/ndlist.pdf
diff --git a/doc/template/version.tex b/doc/template/version.tex
@@ -1 +1 @@
-\newcommand{\version}{0.2}
+\newcommand{\version}{0.2.1}
diff --git a/install.tcl b/install.tcl
@@ -1,4 +1,4 @@
 package require tin 1.0
 tin depend vutil 1.1
-set dir [tin mkdir -force ndlist 0.2]
+set dir [tin mkdir -force ndlist 0.2.1]
 file copy pkgIndex.tcl ndlist.tcl README.md LICENSE $dir
diff --git a/ndlist.tcl b/ndlist.tcl
@@ -1778,10 +1778,11 @@ proc ::ndlist::SingleMap {ndims ndlist body {axis 0}} {
     set nmap_i($axis) -1
     if {$ndims == 1} {
         # Base case
-        set result [uplevel 1 [list lmap x $ndlist "
+        upvar 1 x x
+        set result [lmap x $ndlist {
             incr nmap_i($axis)
-            uplevel 1 [list $body]
-        "]]
+            uplevel 2 $body
+        }]
         # Check for break
         if {$nmap_i($axis) != [llength $ndlist] - 1} {
             set nmap_break 1
@@ -1949,4 +1950,4 @@ proc ::ndlist::range {args} {
 ################################################################################
 
 # Finally, provide the package
-package provide ndlist 0.2
+package provide ndlist 0.2.1
diff --git a/pkgIndex.tcl b/pkgIndex.tcl
@@ -1,2 +1,2 @@
 if {![package vsatisfies [package provide Tcl] 8.6]} {return}
-package ifneeded ndlist 0.2 [list source [file join $dir ndlist.tcl]]
+package ifneeded ndlist 0.2.1 [list source [file join $dir ndlist.tcl]]
diff --git a/src/ndlist.tin b/src/ndlist.tin
@@ -1778,10 +1778,11 @@ proc ::ndlist::SingleMap {ndims ndlist body {axis 0}} {
     set nmap_i($axis) -1
     if {$ndims == 1} {
         # Base case
-        set result [uplevel 1 [list lmap x $ndlist "
+        upvar 1 x x
+        set result [lmap x $ndlist {
             incr nmap_i($axis)
-            uplevel 1 [list $body]
-        "]]
+            uplevel 2 $body
+        }]
         # Check for break
         if {$nmap_i($axis) != [llength $ndlist] - 1} {
             set nmap_break 1