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 `inp_split_multi_param_lines()'

This commit is contained in:
rlar 2013-06-05 20:17:12 +02:00
parent 05c9cf1063
commit 8152a0b543
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/frontend/inpcom.c
View File

@ -3910,25 +3910,21 @@ inp_reorder_params(struct names *subckt_w_params, struct line *deck, struct line
// split line up into multiple lines and place those new lines immediately // split line up into multiple lines and place those new lines immediately
// afetr the current multi-param line in the deck // afetr the current multi-param line in the deck
static int static int
inp_split_multi_param_lines(struct line *deck, int line_num) inp_split_multi_param_lines(struct line *card, int line_num)
{ {
struct line *card = deck, *param_end = NULL, *param_beg = NULL, *prev = NULL; for (; card; card = card->li_next) {
char *curr_line, *equal_ptr, *beg_param, *end_param, *new_line;
char *array[5000];
int counter = 0, i;
bool get_expression = FALSE, get_paren_expression = FALSE;
char keep;
while (card != NULL) { char *curr_line = card->li_line;
curr_line = card->li_line;
if (*curr_line == '*') { if (*curr_line == '*')
card = card->li_next;
continue; continue;
}
if (ciprefix(".param", curr_line)) { if (ciprefix(".param", curr_line)) {
counter = 0;
struct line *param_end, *param_beg;
char *equal_ptr, *array[5000];
int i, counter = 0;
while ((equal_ptr = strchr(curr_line, '=')) != NULL) { while ((equal_ptr = strchr(curr_line, '=')) != NULL) {
// check for equality '==' // check for equality '=='
if (equal_ptr[1] == '=') { if (equal_ptr[1] == '=') {
@ -3943,20 +3939,26 @@ inp_split_multi_param_lines(struct line *deck, int line_num)
counter++; counter++;
curr_line = equal_ptr + 1; curr_line = equal_ptr + 1;
} }
if (counter <= 1) {
card = card->li_next; if (counter <= 1)
continue; continue;
}
// need to split multi param line // need to split multi param line
curr_line = card->li_line; curr_line = card->li_line;
counter = 0; counter = 0;
while (curr_line < card->li_line+strlen(card->li_line) && (equal_ptr = strchr(curr_line, '=')) != NULL) { while (curr_line < card->li_line+strlen(card->li_line) && (equal_ptr = strchr(curr_line, '=')) != NULL) {
char keep, *beg_param, *end_param, *new_line;
bool get_expression = FALSE;
bool get_paren_expression = FALSE;
// check for equality '==' // check for equality '=='
if (equal_ptr[1] == '=') { if (equal_ptr[1] == '=') {
curr_line = equal_ptr + 2; curr_line = equal_ptr + 2;
continue; continue;
} }
// check for '!=', '<=', '>=' // check for '!=', '<=', '>='
if (*(equal_ptr-1) == '!' || *(equal_ptr-1) == '<' || *(equal_ptr-1) == '>') { if (*(equal_ptr-1) == '!' || *(equal_ptr-1) == '<' || *(equal_ptr-1) == '>') {
curr_line = equal_ptr + 1; curr_line = equal_ptr + 1;
@ -3985,6 +3987,9 @@ inp_split_multi_param_lines(struct line *deck, int line_num)
*end_param = keep; *end_param = keep;
curr_line = end_param; curr_line = end_param;
} }
param_beg = param_end = NULL;
for (i = 0; i < counter; i++) { for (i = 0; i < counter; i++) {
struct line *x = xx_new_line(NULL, array[i], line_num++, 0); struct line *x = xx_new_line(NULL, array[i], line_num++, 0);
@ -3995,6 +4000,7 @@ inp_split_multi_param_lines(struct line *deck, int line_num)
param_end = x; param_end = x;
} }
// comment out current multi-param line // comment out current multi-param line
*(card->li_line) = '*'; *(card->li_line) = '*';
// insert new param lines immediately after current line // insert new param lines immediately after current line
@ -4002,16 +4008,9 @@ inp_split_multi_param_lines(struct line *deck, int line_num)
card->li_next = param_beg; card->li_next = param_beg;
// point 'card' pointer to last in scalar list // point 'card' pointer to last in scalar list
card = param_end; card = param_end;
}
param_beg = param_end = NULL;
} // if (ciprefix(".param", curr_line))
prev = card;
card = card->li_next;
} // while (card != NULL)
if (param_end) {
prev->li_next = param_beg;
prev = param_end;
} }
return line_num; return line_num;
} }