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

inpcom.c, cleanup some while(struct line * ...) loops

This commit is contained in:
rlar 2013-05-23 20:57:53 +02:00
parent 0a5ac78e8a
commit 4fee1ed6c1
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/frontend/inpcom.c
View File

@ -2865,16 +2865,15 @@ inp_get_func_from_line(char *line)
// only grab global functions; skip subckt functions // only grab global functions; skip subckt functions
// //
static void static void
inp_grab_func(struct line *deck) inp_grab_func(struct line *c)
{ {
struct line *c = deck;
bool is_subckt = FALSE; bool is_subckt = FALSE;
while (c != NULL) { for (; c; c = c->li_next) {
if (*c->li_line == '*') {
c = c->li_next; if (*c->li_line == '*')
continue; continue;
}
if (ciprefix(".subckt", c->li_line)) if (ciprefix(".subckt", c->li_line))
is_subckt = TRUE; is_subckt = TRUE;
if (ciprefix(".ends", c->li_line)) if (ciprefix(".ends", c->li_line))
@ -2884,22 +2883,20 @@ inp_grab_func(struct line *deck)
inp_get_func_from_line(c->li_line); inp_get_func_from_line(c->li_line);
*c->li_line = '*'; *c->li_line = '*';
} }
c = c->li_next;
} }
} }
static void static void
inp_grab_subckt_func(struct line *subckt) inp_grab_subckt_func(struct line *c)
{ {
struct line *c = subckt; for (; c; c = c->li_next) {
if (ciprefix(".ends", c->li_line))
while (!ciprefix(".ends", c->li_line)) { break;
if (ciprefix(".func", c->li_line)) { if (ciprefix(".func", c->li_line)) {
inp_get_func_from_line(c->li_line); inp_get_func_from_line(c->li_line);
*c->li_line = '*'; *c->li_line = '*';
} }
c = c->li_next;
} }
} }
@ -3103,22 +3100,22 @@ inp_expand_macros_in_func(void)
static void static void
inp_expand_macros_in_deck(struct line *deck) inp_expand_macros_in_deck(struct line *c)
{ {
struct line *c = deck;
int prev_num_functions = 0; int prev_num_functions = 0;
while (c != NULL) { for (; c; c = c->li_next) {
if (*c->li_line == '*') {
c = c->li_next; if (*c->li_line == '*')
continue; continue;
}
if (ciprefix(".subckt", c->li_line)) { if (ciprefix(".subckt", c->li_line)) {
prev_num_functions = num_functions; prev_num_functions = num_functions;
inp_grab_subckt_func(c); inp_grab_subckt_func(c);
if (prev_num_functions != num_functions) if (prev_num_functions != num_functions)
inp_expand_macros_in_func(); inp_expand_macros_in_func();
} }
if (ciprefix(".ends", c->li_line)) { if (ciprefix(".ends", c->li_line)) {
int i; int i;
for (i = prev_num_functions; i < num_functions; i++) for (i = prev_num_functions; i < num_functions; i++)
@ -3128,7 +3125,6 @@ inp_expand_macros_in_deck(struct line *deck)
if (*c->li_line != '*') if (*c->li_line != '*')
c->li_line = inp_expand_macro_in_str(c->li_line); c->li_line = inp_expand_macro_in_str(c->li_line);
c = c->li_next;
} }
} }