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

Fixed merge conflict. Also made readifile() static and removed an unnecessary string duplication there.

This commit is contained in:
Holger Vogt 2020-01-04 11:17:45 +01:00
parent 4081013b13
commit 9bbde919e3
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/frontend/com_set.c
View File

@ -6,7 +6,7 @@
#include "variable.h" #include "variable.h"
#include "com_set.h" #include "com_set.h"
wordlist* readifile(wordlist*); static wordlist* readifile(wordlist*);
/* The set command. /* The set command.
@ -37,7 +37,15 @@ void com_set(wordlist *wl)
return; return;
} }
struct variable *oldvar; /* Handle special case input redirection. The file contents is
* converted to a list that can be handled by cp_setparse(). */
{
const wordlist * const ww = wl->wl_next;
if (ww && eq(ww->wl_word, "<")) {
wl = readifile(wl);
}
}
struct variable *vars = cp_setparse(wl); struct variable *vars = cp_setparse(wl);
/* This is sort of a hassle... */ /* This is sort of a hassle... */
@ -63,7 +71,7 @@ void com_set(wordlist *wl)
s = NULL; s = NULL;
} }
cp_vset(vars->va_name, vars->va_type, s); cp_vset(vars->va_name, vars->va_type, s);
oldvar = vars; struct variable * const oldvar = vars;
vars = vars->va_next; vars = vars->va_next;
/* Free allocations associated with the current variable */ /* Free allocations associated with the current variable */
@ -74,12 +82,14 @@ void com_set(wordlist *wl)
/* don't free oldvar->va_list! This structure is used furthermore! */ /* don't free oldvar->va_list! This structure is used furthermore! */
txfree(oldvar); txfree(oldvar);
} }
} } /* end of function com_set */
/* read a file from cp_in, add the tokens to a wordlist and /* read a file from cp_in, add the tokens to a wordlist and
create an input for a string list like set ccc = ( 3 5 7 ). create an input for a string list like set ccc = ( 3 5 7 ).
Comment lines in input file (starting with '*') are ignored. */ Comment lines in input file (starting with '*') are ignored. */
wordlist* static wordlist*
readifile(wordlist* win) readifile(wordlist* win)
{ {
/* max file size */ /* max file size */
@ -93,17 +103,16 @@ readifile(wordlist* win)
wl_append_word(&win, &win, copy("=")); wl_append_word(&win, &win, copy("="));
wl_append_word(&win, &win, copy("(")); wl_append_word(&win, &win, copy("("));
/* read a line. If it starts with '*', ignore it */ /* read a line. If it starts with '*', ignore it */
while (fgets(intoken, 4096, cp_in) != NULL) { while (fgets(intoken, sizeof intoken, cp_in) != NULL) {
if (intoken[0] == '*') if (intoken[0] == '*') { /* skip comment lines */
continue; continue;
char* delstr; }
char* instr = delstr = copy(intoken); char *instr = intoken;
/* get all tokens, ignoring '\n' /* get all tokens, ignoring '\n'
and add to string list */ and add to string list */
while ((tmpstr = gettok(&instr)) != NULL) { while ((tmpstr = gettok(&instr)) != NULL) {
wl_append_word(&win, &win, tmpstr); wl_append_word(&win, &win, tmpstr);
} }
tfree(delstr);
} }
wl_append_word(&win, &win, copy(")")); wl_append_word(&win, &win, copy(")"));
/* close and reset cp_in /* close and reset cp_in