From 714aae3d2fc93c56fee50f0bcbaf22fe92b0bafc Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Mon, 14 Mar 2022 10:56:16 +0100
Subject: [PATCH] .probe: replace (all) by alli (we only measure all currents)

---
 src/frontend/inpc_probe.c | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/frontend/inpc_probe.c b/src/frontend/inpc_probe.c
index f1447a48d..b6538d5e4 100644
--- a/src/frontend/inpc_probe.c
+++ b/src/frontend/inpc_probe.c
@@ -10,7 +10,7 @@
 #include "ngspice/hash.h"
 #include "ngspice/inpdefs.h"
 #include "ngspice/wordlist.h"
-
+#include "ngspice/stringskip.h"
 
 void inp_probe(struct card* card);
 void modprobenames(INPtables* tab);
@@ -18,6 +18,7 @@ void modprobenames(INPtables* tab);
 extern struct card* insert_new_line(
     struct card* card, char* line, int linenum, int linenum_orig);
 extern int get_number_terminals(char* c);
+extern char* search_plain_identifier(char* str, const char* identifier);
 
 static char* get_terminal_name(char* element, char* numberstr, NGHASHPTR instances);
 static char* get_terminal_number(char* element, char* numberstr);
@@ -68,20 +69,34 @@ void inp_probe(struct card* deck)
         char* tmpstr = wltmp->wl_word;
         /* skip *probe */
         tmpstr = nexttok(tmpstr);
-        if (*tmpstr == '\0')
-            continue;
-        if (ciprefix("(all)", tmpstr)) {
+
+        if (*tmpstr == '\0') {
+            fprintf(stderr, "Note: Empty .probe command, treated as .probe alli\n");
             haveall = TRUE;
+            continue;
+        }
+
+        /* set haveall and remove 'alli' token */
+        char *allistr = search_plain_identifier(tmpstr, "alli");
+        if (allistr) {
+            haveall = TRUE;
+            memcpy(allistr, "    ", 4);
+        }
+
+        tmpstr = skip_ws(tmpstr);
+        if (!strchr("vipVIP", *tmpstr)) {
+            fprintf(stderr, "Warning: Strange parameter in line %s, ingnored\n", wltmp->wl_word);
             tmpstr = nexttok(tmpstr);
         }
         nextnode = gettok_char(&tmpstr, ')', TRUE, FALSE);
+
+        if (haveall == FALSE && !nextnode) {
+            fprintf(stderr, "Warning: Strange parameter in line %s, ingnored\n", wltmp->wl_word);
+            continue;
+        }
+
         while (nextnode && (*nextnode != '\0')) {
-            if (cieq(nextnode, "(all)")) {
-                haveall = TRUE;
-            }
-            else {
-                probeparams = wl_cons(nextnode, probeparams);
-            }
+            probeparams = wl_cons(nextnode, probeparams);
 
             if (ciprefix("vd(", nextnode)) {
                 havedifferential = TRUE;