luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New variable 'plainwrite' added. Allows 'write' with node names 

containing characters like + - /. Function are the disabled.
This replaces the automatic selection of this mode by compat flags,
which is not transparent enough to the user.
This commit is contained in:
Holger Vogt 2020-10-29 15:37:55 +01:00
parent 054f25b060
commit 8265d41f19
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontend/postcoms.c
View File

@ -435,7 +435,7 @@ com_write(wordlist *wl)
static wordlist all = { "all", NULL, NULL }; static wordlist all = { "all", NULL, NULL };
struct pnode *names = NULL; struct pnode *names = NULL;
bool ascii = AsciiRawFile; bool ascii = AsciiRawFile;
bool scalefound, appendwrite; bool scalefound, appendwrite, plainwrite = FALSE;
struct plot *tpl, newplot; struct plot *tpl, newplot;
if (wl) { if (wl) {
@ -455,9 +455,11 @@ com_write(wordlist *wl)
} }
appendwrite = cp_getvar("appendwrite", CP_BOOL, NULL, 0); appendwrite = cp_getvar("appendwrite", CP_BOOL, NULL, 0);
/* If use with EAGLE or KiCad compatibility, we do not expand equations, serve v vs vs etc. plainwrite = cp_getvar("plainwrite", CP_BOOL, NULL, 0);
/* If variable plainwrite is set, we do not expand equations, serve v vs vs etc.
We offer plain writing of the vectors. This enables node names containing +, -, / etc. */ We offer plain writing of the vectors. This enables node names containing +, -, / etc. */
if (!newcompat.eg && !newcompat.ki) { if (!plainwrite) {
if (wl) if (wl)
names = ft_getpnames(wl, TRUE); names = ft_getpnames(wl, TRUE);
else else
@ -485,8 +487,10 @@ com_write(wordlist *wl)
wl = &all; wl = &all;
for (wli = wl; wli; wli = wli->wl_next) { for (wli = wl; wli; wli = wli->wl_next) {
d = vec_get(wli->wl_word); d = vec_get(wli->wl_word);
if (!d) if (!d) {
fprintf(stderr, "Error during 'write': vector %s not found\n", wli->wl_word);
goto done; goto done;
}
if (vecs) if (vecs)
lv->v_link2 = d; lv->v_link2 = d;
else else