From 32c134f481d6f1d445e04e7ae952eac0d57dd4a4 Mon Sep 17 00:00:00 2001 From: h_vogt Date: Fri, 15 Oct 2010 21:04:44 +0000 Subject: [PATCH] #include "../misc/tilde.h" --- ChangeLog | 4 ++++ src/ciderlib/input/output.c | 2 +- src/frontend/inpcom.c | 11 ++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63374f04f..44845b355 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 , diff --git a/src/ciderlib/input/output.c b/src/ciderlib/input/output.c index 9bc697870..1bd1c0b99 100644 --- a/src/ciderlib/input/output.c +++ b/src/ciderlib/input/output.c @@ -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*); diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index a479e3968..3fda28975 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -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