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

Match pre-master-47

This commit is contained in:
Brian Taylor 2026-04-02 12:30:02 -07:00
parent 13a3777aec
commit e628e92bc5
4 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontend/inpcom.c
View File

@ -8429,9 +8429,6 @@ static void inp_quote_params(struct card *c, struct card *end_c,
if (cp_getvar("no_auto_braces", CP_BOOL, NULL, 0)) if (cp_getvar("no_auto_braces", CP_BOOL, NULL, 0))
return; return;
if (newcompat.hs && cp_getvar("no_auto_braces", CP_BOOL, NULL, 0))
return;
for (; c && c != end_c; c = c->nextcard) { for (; c && c != end_c; c = c->nextcard) {
int i, j, num_terminals; int i, j, num_terminals;

17
src/frontend/numparam/xpressn.c
View File

@ -1055,18 +1055,11 @@ formula(dico_t *dico, const char *s, const char *s_end, bool *perror)
((oldstate == S_atom) && (state == S_binop)) || ((oldstate == S_atom) && (state == S_binop)) ||
((oldstate != S_atom) && (state != S_binop)); ((oldstate != S_atom) && (state != S_binop));
/* c is a sign, + or - are allowed */ if (oldstate == S_binop && state == S_binop && c == '-') {
if (oldstate == S_binop && state == S_binop) ok = 1;
if (c == '-') { negate = 1;
ok = 1; continue;
negate = 1; }
continue;
}
else if (c == '+') {
ok = 1;
negate = 0;
continue;
}
if (!ok) if (!ok)
error = message(dico, " Misplaced operator\n"); error = message(dico, " Misplaced operator\n");

4
src/include/ngspice/sharedspice.h
View File

@ -124,11 +124,7 @@ are of type bool if sharedspice.h is used externally.
*/ */
#ifndef NGSPICE_PACKAGE_VERSION #ifndef NGSPICE_PACKAGE_VERSION
<<<<<<< HEAD
#define NGSPICE_PACKAGE_VERSION "45+"
=======
#define NGSPICE_PACKAGE_VERSION "46+" #define NGSPICE_PACKAGE_VERSION "46+"
>>>>>>> pre-master-47
#endif #endif
/* we have NG_BOOL instead of BOOL */ /* we have NG_BOOL instead of BOOL */
#ifndef HAS_NG_BOOL #ifndef HAS_NG_BOOL

3
visualc/vngspice-fftw.vcxproj
View File

@ -1513,7 +1513,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
<ClCompile Include="..\src\frontend\init.c" /> <ClCompile Include="..\src\frontend\init.c" />
<ClCompile Include="..\src\frontend\inp.c" /> <ClCompile Include="..\src\frontend\inp.c" />
<ClCompile Include="..\src\frontend\inpcom.c" /> <ClCompile Include="..\src\frontend\inpcom.c" />
<ClCompile Include="..\src\frontend\inpcompat.c" />
<ClCompile Include="..\src\frontend\inpc_probe.c" /> <ClCompile Include="..\src\frontend\inpc_probe.c" />
<ClCompile Include="..\src\frontend\inpcompat.c" /> <ClCompile Include="..\src\frontend\inpcompat.c" />
<ClCompile Include="..\src\frontend\interp.c" /> <ClCompile Include="..\src\frontend\interp.c" />
@ -2872,4 +2871,4 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>