From fa1c710f685f0bbfb3792cfd2901701bf57c5ee4 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 25 Nov 2017 15:09:20 +0100
Subject: [PATCH] nupa_subcktcall(), move code down to a better place

---
 src/frontend/numparam/xpressn.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index ca511e8e0..4245d30c0 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -1508,13 +1508,6 @@ nupa_subcktcall(dico_t *dico, char *s, char *x, char *inst_name)
     spice_dstring_init(&vstr);
     spice_dstring_init(&idlist);
 
-    /*
-      skip over instance name -- fixes bug where instance 'x1' is
-      same name as subckt 'x1'
-    */
-    while (*x && *x != ' ')
-        x++;
-
     /***** first, analyze the subckt definition line */
     n = 0;                      /* number of parameters if any */
     ls = (int) strlen(s);
@@ -1585,6 +1578,12 @@ nupa_subcktcall(dico_t *dico, char *s, char *x, char *inst_name)
     /***** next, analyze the circuit call line */
     if (!err) {
 
+        /*
+          skip over instance name -- fixes bug where instance 'x1' is
+          same name as subckt 'x1'
+        */
+        while (*x && *x != ' ')
+            x++;
         scopy_up(&tstr, x);
         j = 0;