From a38b19bc0ef44e17167147e4f624c97ea2cc9979 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 25 Nov 2017 18:36:50 +0100
Subject: [PATCH] nupa_subcktcall(), reintroduce search for last occurence of
 the subckt name

---
 src/frontend/numparam/xpressn.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index 765ca7880..c75fdc05c 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -1602,8 +1602,17 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
         scopy_up(&tstr, skip_non_ws(x));
 
         char * const t_p = spice_dstring_value(&tstr);
+        char *jp = NULL;
 
-        char *jp = search_isolated_identifier(t_p, spice_dstring_value(&subname));
+        /* search for the last occurence of `subname' in the given line */
+        for (;;) {
+            char *next_p =
+                search_isolated_identifier(jp ? jp + 1 : t_p,
+                                           spice_dstring_value(&subname));
+            if (!next_p)
+                break;
+            jp = next_p;
+        }
 
         if (jp) {