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

cmutil: NaN, inpcom: nested (

This commit is contained in:
h_vogt 2011-07-27 20:08:36 +00:00
parent 8bfc98d008
commit ede2daf1f6
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-07-27 Robert Larice
* inpcom.c: nested parens, line 2963 ff
* cmutil.c: inlude ngspice.h for NaN
2011-07-26 Robert Larice 2011-07-26 Robert Larice
* src/spicelib/devices/adms/admst/ngspice.xml : * src/spicelib/devices/adms/admst/ngspice.xml :
lower-case the first string in an IOP("HuGo",...) incantation lower-case the first string in an IOP("HuGo",...) incantation

10
src/frontend/inpcom.c
View File

@ -2780,8 +2780,9 @@ inp_fix_param_values( struct line *deck )
struct line *c = deck; struct line *c = deck;
char *line, *beg_of_str, *end_of_str, *old_str, *equal_ptr, *new_str; char *line, *beg_of_str, *end_of_str, *old_str, *equal_ptr, *new_str;
char *vec_str, *natok, *buffer, *newvec, *whereisgt; char *vec_str, *natok, *buffer, *newvec, *whereisgt;
bool control_section = FALSE, has_paren = FALSE; bool control_section = FALSE;
wordlist *wl, *nwl; wordlist *wl, *nwl;
int parens;
while ( c != NULL ) { while ( c != NULL ) {
line = c->li_line; line = c->li_line;
@ -2957,9 +2958,10 @@ inp_fix_param_values( struct line *deck )
} else { } else {
/* put {} around token to be accepted as numparam */ /* put {} around token to be accepted as numparam */
end_of_str = beg_of_str; end_of_str = beg_of_str;
while ( *end_of_str != '\0' && (!isspace(*end_of_str) || has_paren) ) { parens = 0;
if ( *end_of_str == '(' ) has_paren = TRUE; while ( *end_of_str != '\0' && (!isspace(*end_of_str) || (parens > 0)) ) {
if ( *end_of_str == ')' ) has_paren = FALSE; if ( *end_of_str == '(' ) parens++;
if ( *end_of_str == ')' ) parens--;
end_of_str++; end_of_str++;
} }

1
src/xspice/cm/cmutil.c
View File

@ -51,6 +51,7 @@ NON-STANDARD FEATURES
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include "cm.h" #include "cm.h"
#include "ngspice.h" /* for NaN */
/* Corner Smoothing Function ************************************ /* Corner Smoothing Function ************************************
* * * *