Match pre-master-47

src/frontend/inpcom.c

@@ -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))
         return;
 
-    if (newcompat.hs && cp_getvar("no_auto_braces", CP_BOOL, NULL, 0))
-        return;
-
     for (; c && c != end_c; c = c->nextcard) {
 
         int i, j, num_terminals;

src/frontend/numparam/xpressn.c

@@ -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));
 
-        /* c is a sign, + or - are allowed */
-        if (oldstate == S_binop && state == S_binop)
-            if (c == '-') {
-                ok = 1;
-                negate = 1;
-                continue;
-            }
-            else if (c == '+') {
-                ok = 1;
-                negate = 0;
-                continue;
-            }
+        if (oldstate == S_binop && state == S_binop && c == '-') {
+            ok = 1;
+            negate = 1;
+            continue;
+        }
 
         if (!ok)
             error = message(dico, " Misplaced operator\n");

src/include/ngspice/sharedspice.h

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

visualc/vngspice-fftw.vcxproj

@@ -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\inp.c" />
     <ClCompile Include="..\src\frontend\inpcom.c" />
-    <ClCompile Include="..\src\frontend\inpcompat.c" />
     <ClCompile Include="..\src\frontend\inpc_probe.c" />
     <ClCompile Include="..\src\frontend\inpcompat.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" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>