#include "../misc/tilde.h"

This commit is contained in:
h_vogt 2010-10-15 21:04:44 +00:00
parent 7f8ee8818e
commit 32c134f481
3 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,7 @@
2010-10-15 Holger Vogt
* src/ciderlib/input/output.c : #include "../misc/tilde.h"
* inpcom.c: line 2800ff, allow -.5 token
2010-10-15 Robert Larice
* src/include/ngspice.h ,
* src/main.c ,

View File

@ -12,7 +12,7 @@ Modified: 2001 Paolo Nenzi
#include "devdefs.h"
#include "sperror.h"
#include "suffix.h"
#include "src/misc/tilde.h"
#include "../misc/tilde.h"
extern int OUTPnewCard(void**,void*);
extern int OUTPparam(int,IFvalue*,void*);

View File

@ -2797,9 +2797,14 @@ inp_fix_param_values( struct line *deck )
beg_of_str = equal_ptr + 1;
while ( isspace(*beg_of_str) ) beg_of_str++;
/* all cases where no {} have to be put around selected token */
if ( isdigit(*beg_of_str) || *beg_of_str == '{' || *beg_of_str == '.' ||
*beg_of_str == '"' || ( *beg_of_str == '-' && isdigit(*(beg_of_str+1)) ) ||
ciprefix("true", beg_of_str) || ciprefix("false", beg_of_str) ) {
if ( isdigit(*beg_of_str)
|| *beg_of_str == '{'
|| *beg_of_str == '.'
|| *beg_of_str == '"'
|| ( *beg_of_str == '-' && isdigit(*(beg_of_str+1)) )
|| ( *beg_of_str == '-' && (*(beg_of_str+1) == '.') && isdigit(*(beg_of_str+2)) )
|| ciprefix("true", beg_of_str)
|| ciprefix("false", beg_of_str) ) {
line = equal_ptr + 1;
} else if (*beg_of_str == '[') {
/* A vector following the '=' token: code to put curly brackets around all params