Also modified DEF reads to avoid letting instance names contain

either slash or comma.
This commit is contained in:
Tim Edwards 2021-02-24 14:51:46 -05:00
parent f2af326368
commit 2bb3580f3e
2 changed files with 12 additions and 16 deletions

View File

@ -1 +1 @@
8.3.132 8.3.133

View File

@ -1546,24 +1546,20 @@ DefReadComponents(f, rootDef, sname, oscale, total)
break; break;
} }
/* Does use name contain brackets? If so, this can */ /* Magic prohibits slashes and commas in use names */
/* interfere with magic's use of arrays. */ /* when using the "identify" command. Removing these */
/* NOTE: This has been commented out. I think */ /* restrictions (at least the slash) is quite complex, */
/* the only confusion is in ext2spice and can be */ /* but really should be taken care of, since no other */
/* avoided by allowing any bracket notation in an */ /* tools consider this an illegal use, that I'm aware */
/* instance name other than that used by the .ext */ /* of. */
/* file for dealing with arrays, which uses the */
/* specific syntax [xlo:xsep:xhi][ylo:ysep:yhi] and */
/* is easy enough to distinguish. */
/* for (dptr = usename; *dptr; dptr++)
dptr = strchr(usename, '['); if ((*dptr == '/') || (*dptr == ','))
if (dptr != NULL) { {
LefError(DEF_WARNING, "Character in instance name "
"converted to underscore.\n");
*dptr = '_'; *dptr = '_';
dptr = strchr(dptr + 1, ']');
if (dptr != NULL) *dptr = '_';
} }
*/
token = LefNextToken(f, TRUE); token = LefNextToken(f, TRUE);