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

inpgmod.c, INPgetModBin(), use model_name_match()

This commit is contained in:
rlar 2014-08-09 15:35:31 +02:00
parent b663731379
commit f5d05af51d
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/ngspice/stringutil.h
View File

@ -26,7 +26,7 @@ char * stripWhiteSpacesInsideParens(char *str);
char * gettok(char **s); char * gettok(char **s);
char * gettok_instance(char **); char * gettok_instance(char **);
char * gettok_char(char **s, char p, bool inc_p, bool nested); char * gettok_char(char **s, char p, bool inc_p, bool nested);
bool model_name_match(const char *token, const char *model_name); int model_name_match(const char *token, const char *model_name);
extern char *tvprintf(const char *fmt, va_list args); extern char *tvprintf(const char *fmt, va_list args);

16
src/misc/string.c
View File

@ -685,37 +685,39 @@ get_comma_separated_values( char *values[], char *str ) {
/* /*
check if the given token matches a model name check if the given token matches a model name
either exact either exact
then return 1
or or
modulo a trailing model binning extension '\.[0-9]+' modulo a trailing model binning extension '\.[0-9]+'
then return 2
*/ */
bool int
model_name_match(const char *token, const char *model_name) model_name_match(const char *token, const char *model_name)
{ {
const char *p; const char *p;
size_t token_len = strlen(token); size_t token_len = strlen(token);
if (strncmp(token, model_name, token_len) != 0) if (strncmp(token, model_name, token_len) != 0)
return FALSE; return 0;
p = model_name + token_len; p = model_name + token_len;
// exact match // exact match
if (*p == '\0') if (*p == '\0')
return TRUE; return 1;
// check for . // check for .
if (*p++ != '.') if (*p++ != '.')
return FALSE; return 0;
// minimum one trailing char // minimum one trailing char
if (*p == '\0') if (*p == '\0')
return FALSE; return 0;
// all of them digits // all of them digits
for (; *p; p++) for (; *p; p++)
if (!isdigit(*p)) if (!isdigit(*p))
return FALSE; return 0;
return TRUE; return 2;
} }

7
src/spicelib/parser/inpgmod.c
View File

@ -212,6 +212,10 @@ INPgetModBin( CKTcircuit* ckt, char* name, INPmodel** model, INPtables* tab, cha
w = parse_values[1]*scale; w = parse_values[1]*scale;
for ( modtmp = modtab; modtmp != NULL; modtmp = modtmp->INPnextModel ) { for ( modtmp = modtab; modtmp != NULL; modtmp = modtmp->INPnextModel ) {
if ( model_name_match(name, modtmp->INPmodName) < 2 )
continue;
if ( /* This is the list of binable models */ if ( /* This is the list of binable models */
modtmp->INPmodType != INPtypelook ("BSIM3") modtmp->INPmodType != INPtypelook ("BSIM3")
&& modtmp->INPmodType != INPtypelook ("BSIM3v32") && modtmp->INPmodType != INPtypelook ("BSIM3v32")
@ -238,8 +242,7 @@ INPgetModBin( CKTcircuit* ckt, char* name, INPmodel** model, INPtables* tab, cha
lmin = parse_values[0]; lmax = parse_values[1]; lmin = parse_values[0]; lmax = parse_values[1];
wmin = parse_values[2]; wmax = parse_values[3]; wmin = parse_values[2]; wmax = parse_values[3];
if ( strncmp( modtmp->INPmodName, name, strlen( name ) ) == 0 && if ( in_range( l, lmin, lmax ) && in_range( w, wmin, wmax ) ) {
in_range( l, lmin, lmax ) && in_range( w, wmin, wmax ) ) {
if ( !modtmp->INPmodfast ) { if ( !modtmp->INPmodfast ) {
error = create_model( ckt, modtmp, tab ); error = create_model( ckt, modtmp, tab );
if ( error ) return NULL; if ( error ) return NULL;