From 493e975d3520039e600983742a2026c4154271f8 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Tue, 11 Jul 2017 17:59:09 +0200
Subject: [PATCH] enforce compiler warning/error, when (*desc*) variable usage
 not anticipated

---
 src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml   | 4 ++--
 src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml  | 2 +-
 src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml b/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml
index 09acb35b6..cb7443102 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml
@@ -1148,7 +1148,7 @@ inline double _d1_pow(double x,double y)   { return (x==0.0)?0.0:((log(x)/exp(0.
       <admst:variable name="e" select="pInst-&gt;%(name)"/>
     </admst:when>
     <admst:when test="attribute[name='desc']">
-      <admst:variable name="e" select="ckt->CKTstate0[((GENinstance*)here)->GENstate + %(name)]"/>
+      <admst:variable name="e" select="ckt->CKTstate0[((GENinstance*)here)->GENstate + hide_%(name)]"/>
     </admst:when>
     <admst:otherwise>
       <admst:variable name="e" select="%(name)"/>
@@ -2368,7 +2368,7 @@ inline double _d1_pow(double x,double y)   { return (x==0.0)?0.0:((log(x)/exp(0.
       </admst:for-each>
       <admst:choose>
         <admst:when test="lhs/attribute[name='desc']">
-          <admst:text format="ckt->CKTstate0[((GENinstance*)here)->GENstate + %(lhs/name)]=$allep; /* indeed 3 */\n"/>
+          <admst:text format="ckt->CKTstate0[((GENinstance*)here)->GENstate + hide_%(lhs/name)]=$allep; /* indeed 3 */\n"/>
         </admst:when>
         <admst:otherwise>
           <admst:text format="%(lhs/name)=$allep; /* indeed 3 */\n"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
index d9bf9fb13..008f97bd5 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
@@ -68,7 +68,7 @@ int $(module)ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
         <admst:choose>
           <admst:when test="[type='real']">
   case  $(module)_ask_%(name) :
-    value->rValue = ckt->CKTstate0[inst->GENstate + %(name)];
+    value->rValue = ckt->CKTstate0[inst->GENstate + hide_%(name)];
     return OK;
           </admst:when>
           <admst:otherwise>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
index 9d85fbc8c..87157e943 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
@@ -259,7 +259,8 @@ enum {
 <admst:for-each select="variable">
   <admst:if test="attribute[name='desc']">
     <admst:if test="[not((input='yes' and (parametertype='model' or parametertype='instance')) or (input='np' and (scope='global_model' or scope='global_instance')))]">
-      %(name),
+      hide_%(name),
+#define %(name) ((struct hides *)hide_%(name))
     </admst:if>
   </admst:if>
 </admst:for-each>