Changeset 6436

Timestamp:

Jul 22, 2016, 9:20:50 AM (8 years ago)

Author:

ldelgass

Message:

Don't use user-supplied style name as array name in parseStylesheet. Fixes
error if user's style name conflicts with an internal variable name.

File:

• trunk/gui/scripts/map.tcl (modified) (2 diffs)

trunk/gui/scripts/map.tcl

@@ -1278 +1278 @@
         #puts stderr "block: \"$block\""
         set lines [split $block ";"]
+        array unset styleArray
         foreach line $lines {
             set line [string trim $line]
@@ -1285 +1286 @@
             set prop [string trim [string range $line 0 [expr {$delim-1}]]]
             set val [string trim [string range $line [expr {$delim+1}] end]]
-            set ${styleName}($prop) $val
-        }
-        lappend styles $styleName [array get $styleName]
+            set styleArray($prop) $val
+        }
+        lappend styles $styleName [array get styleArray]
     }
     return $styles