Corrected issue from github issue tracker #297, where "Import SPICE"

RTimothyEdwards · RTimothyEdwards · commit d0f6dab896e8 · 2024-04-01T16:42:10.000-04:00
fails on instances with names containing brackets.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.3.466
+8.3.467
diff --git a/tcltk/toolkit.tcl b/tcltk/toolkit.tcl
@@ -334,7 +334,9 @@ proc magic::generate_layout_add {subname subpins complist library} {
 	}
 
 	set outparts {}
-	lappend outparts "magic::gencell $libdev $instname"
+	# Escape any brackets in the instance name, since it gets passed to "eval"
+	set minstname [string map {[ \\\[ ] \\\]} $instname]
+	lappend outparts "magic::gencell $libdev $minstname"
 
 	# Output all parameters.  Parameters not used by the toolkit are
 	# ignored by the toolkit.

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,9 @@ proc magic::generate_layout_add {subname subpins complist library} {`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`set outparts {}`
`337`		`- lappend outparts "magic::gencell $libdev $instname"`
	`337`	`+ # Escape any brackets in the instance name, since it gets passed to "eval"`
	`338`	`+ set minstname [string map {[ \\\[ ] \\\]} $instname]`
	`339`	`+ lappend outparts "magic::gencell $libdev $minstname"`
`338`	`340`
`339`	`341`	`# Output all parameters. Parameters not used by the toolkit are`
`340`	`342`	`# ignored by the toolkit.`