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

Gxxx n1 n2 value={equation}

This commit is contained in:
h_vogt 2011-12-17 15:22:20 +00:00
parent af03c472af
commit 33d8e0ce9d
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-12-17 Holger Vogt
* src/frontend/inpcom.c :
allow syntax Gxxx n1 n2 value={equation} or Exxx n1 n2 value={equation}
2011-12-17 Robert Larice
* src/spicelib/devices/dev.c ,
* src/spicelib/devices/adms/admst/ngspice.xml :

25
src/frontend/inpcom.c
View File

@ -3640,8 +3640,10 @@ inp_reorder_params( struct line *deck, struct line *list_head, struct line *end
}
/* check for an unexpected extra `.ends' deck */
if ( ciprefix( ".ends", curr_line ) )
if ( ciprefix( ".ends", curr_line ) ) {
fprintf(stderr, "Error: Unexpected extra .ends in line:\n %s.\n", curr_line);
controlled_exit(EXIT_FAILURE);
}
if ( ciprefix( ".param", curr_line ) ) {
if ( first_param_card )
@ -3913,6 +3915,17 @@ static void inp_compat(struct line *deck)
*(str_ptr + 3) = ' ';
}
/* Exxx n1 n2 value={equation}
-->
Exxx n1 n2 vol={equation} */
if ((str_ptr = strstr( curr_line, "value=" )) != NULL) {
*str_ptr = ' ';
*(str_ptr + 1) = ' ';
*(str_ptr + 2) = 'v';
*(str_ptr + 3) = 'o';
*(str_ptr + 4) = 'l';
}
/* Exxx n1 n2 VOL = {equation}
-->
Exxx n1 n2 int1 0 1
@ -3980,6 +3993,16 @@ static void inp_compat(struct line *deck)
*(str_ptr + 3) = ' ';
}
/* Gxxx n1 n2 value={equation}
-->
Gxxx n1 n2 cur={equation} */
if ((str_ptr = strstr( curr_line, "value=" )) != NULL) {
*str_ptr = ' ';
*(str_ptr + 1) = ' ';
*(str_ptr + 2) = 'c';
*(str_ptr + 3) = 'u';
*(str_ptr + 4) = 'r';
}
/*
Gxxx n1 n2 CUR = {equation}
-->