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

mkfnode(), minor rewrite

This commit is contained in:
rlar 2012-04-07 19:06:10 +02:00
parent e889c821d1
commit d21b3a3cd5
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/spicelib/parser/inpptree.c
View File

@ -835,16 +835,8 @@ static INPparseNode *mkfnode(const char *fname, INPparseNode * arg)
if(!strcmp("ternary_fcn", buf)) { if(!strcmp("ternary_fcn", buf)) {
// extern void printTree(INPparseNode *); if(arg->type == PT_COMMA && arg->left->type == PT_COMMA) {
//
// printf("debug: %s ternary_fcn: ", __func__);
// printTree(arg);
// printf("\n");
if(arg->type != PT_COMMA || arg->left->type != PT_COMMA) {
fprintf(stderr, "Error: bogus ternary_fcn form\n");
return (NULL);
} else {
INPparseNode *arg1 = arg->left->left; INPparseNode *arg1 = arg->left->left;
INPparseNode *arg2 = arg->left->right; INPparseNode *arg2 = arg->left->right;
INPparseNode *arg3 = arg->right; INPparseNode *arg3 = arg->right;
@ -854,32 +846,35 @@ static INPparseNode *mkfnode(const char *fname, INPparseNode * arg)
p->type = PT_TERN; p->type = PT_TERN;
p->left = arg1; p->left = arg1;
p->right = mkb(PT_COMMA, arg2, arg3); p->right = mkb(PT_COMMA, arg2, arg3);
return (p);
} }
fprintf(stderr, "Error: bogus ternary_fcn form\n");
} else { return (NULL);
for (i = 0; i < NUM_FUNCS; i++)
if (!strcmp(funcs[i].name, buf))
break;
if (i == NUM_FUNCS) {
fprintf(stderr, "Error: no such function '%s'\n", buf);
return (NULL);
}
p = TMALLOC(INPparseNode, 1);
p->type = PT_FUNCTION;
p->left = arg;
p->funcname = funcs[i].name;
p->funcnum = funcs[i].number;
p->function = funcs[i].funcptr;
p->data = NULL;
if(p->funcnum == PTF_PWL)
p = prepare_PTF_PWL(p);
} }
for (i = 0; i < NUM_FUNCS; i++)
if (!strcmp(funcs[i].name, buf))
break;
if (i == NUM_FUNCS) {
fprintf(stderr, "Error: no such function '%s'\n", buf);
return (NULL);
}
p = TMALLOC(INPparseNode, 1);
p->type = PT_FUNCTION;
p->left = arg;
p->funcname = funcs[i].name;
p->funcnum = funcs[i].number;
p->function = funcs[i].funcptr;
p->data = NULL;
if(p->funcnum == PTF_PWL)
p = prepare_PTF_PWL(p);
return (p); return (p);
} }