epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

inpcom.c, rewrite `append' of some decks

pre-master-46
rlar 13 years ago
parent
f6117a0cb8
commit
df00c189d1
1 changed files with 13 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      src/frontend/inpcom.c

36
src/frontend/inpcom.c
View File

@ -3917,7 +3917,7 @@ inp_reorder_params(struct names *subckt_w_params, struct line *deck, struct line
static int
inp_split_multi_param_lines(struct line *deck, int line_num)
{
struct line *card = deck, *param_end = NULL, *param_beg = NULL, *prev = NULL, *tmp_ptr;
struct line *card = deck, *param_end = NULL, *param_beg = NULL, *prev = NULL;
char *curr_line, *equal_ptr, *beg_param, *end_param, *new_line;
char *array[5000];
int counter = 0, i;
@ -4003,9 +4003,8 @@ inp_split_multi_param_lines(struct line *deck, int line_num)
// comment out current multi-param line
*(card->li_line) = '*';
// insert new param lines immediately after current line
tmp_ptr = card->li_next;
param_end->li_next = card->li_next;
card->li_next = param_beg;
param_end->li_next = tmp_ptr;
// point 'card' pointer to last in scalar list
card = param_end;
@ -4083,7 +4082,7 @@ inp_compat(struct line *card)
char *xline;
size_t xlen, i, pai = 0, paui = 0, ii;
char *ckt_array[100];
struct line *new_line, *tmp_ptr;
struct line *new_line;
struct line *param_end = NULL, *param_beg = NULL;
int skip_control = 0;
@ -4225,9 +4224,8 @@ inp_compat(struct line *card)
// comment out current variable e line
*(card->li_line) = '*';
// insert new param lines immediately after current line
tmp_ptr = card->li_next;
param_end->li_next = card->li_next;
card->li_next = param_beg;
param_end->li_next = tmp_ptr;
// point 'card' pointer to last in scalar list
card = param_end;
@ -4283,9 +4281,8 @@ inp_compat(struct line *card)
// comment out current variable e line
*(card->li_line) = '*';
// insert new param lines immediately after current line
tmp_ptr = card->li_next;
param_end->li_next = card->li_next;
card->li_next = param_beg;
param_end->li_next = tmp_ptr;
// point 'card' pointer to last in scalar list
card = param_end;
@ -4409,9 +4406,8 @@ inp_compat(struct line *card)
// comment out current variable e line
*(card->li_line) = '*';
// insert new param lines immediately after current line
tmp_ptr = card->li_next;
param_end->li_next = card->li_next;
card->li_next = param_beg;
param_end->li_next = tmp_ptr;
// point 'card' pointer to last in scalar list
card = param_end;
@ -4478,9 +4474,8 @@ inp_compat(struct line *card)
// comment out current variable g line
*(card->li_line) = '*';
// insert new param lines immediately after current line
tmp_ptr = card->li_next;
param_end->li_next = card->li_next;
card->li_next = param_beg;
param_end->li_next = tmp_ptr;
// point 'card' pointer to last in scalar list
card = param_end;
@ -4689,9 +4684,8 @@ inp_compat(struct line *card)
// comment out current variable capacitor line
*(card->li_line) = '*';
// insert new param lines immediately after current line
tmp_ptr = card->li_next;
param_end->li_next = card->li_next;
card->li_next = param_beg;
param_end->li_next = tmp_ptr;
// point 'card' pointer to last in scalar list
card = param_end;
@ -4800,9 +4794,8 @@ inp_compat(struct line *card)
// comment out current variable inductor line
*(card->li_line) = '*';
// insert new param lines immediately after current line
tmp_ptr = card->li_next;
param_end->li_next = card->li_next;
card->li_next = param_beg;
param_end->li_next = tmp_ptr;
// point 'card' pointer to last in scalar list
card = param_end;
@ -4969,9 +4962,8 @@ inp_compat(struct line *card)
}
// insert new param lines immediately after current line
tmp_ptr = card->li_next;
param_end->li_next = card->li_next;
card->li_next = param_beg;
param_end->li_next = tmp_ptr;
// point 'card' pointer to last in scalar list
card = param_end;
@ -5087,9 +5079,8 @@ inp_compat(struct line *card)
// comment out current variable capacitor line
// *(ckt_array[0]) = '*';
// insert new param lines immediately after current line
tmp_ptr = card->li_next;
param_end->li_next = card->li_next;
card->li_next = param_beg;
param_end->li_next = tmp_ptr;
// point 'card' pointer to last in scalar list
card = param_end;
@ -5483,7 +5474,7 @@ inp_add_series_resistor(struct line *deck)
struct line *card;
char *tmp_p, *title_tok, *node1, *node2, *rval = NULL;
char *ckt_array[10];
struct line *tmp_ptr, *param_end = NULL, *param_beg = NULL;
struct line *param_end = NULL, *param_beg = NULL;
for (card = deck; card; card = card->li_next) {
char *curr_line = card->li_line;
@ -5554,9 +5545,8 @@ inp_add_series_resistor(struct line *deck)
// comment out current L line
*(card->li_line) = '*';
// insert new new L and R lines immediately after current line
tmp_ptr = card->li_next;
param_end->li_next = card->li_next;
card->li_next = param_beg;
param_end->li_next = tmp_ptr;
// point 'card' pointer to last in scalar list
card = param_end;
param_beg = param_end = NULL;

Write Preview
Loading…
Cancel
Save