From 6777b43be57da8c0b29d99dcf2e3ce63fd36cf3e Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 13 May 2017 16:12:04 +0200
Subject: [PATCH] fix $given and $param_given

---
 .../devices/adms/admst/ngspiceMODULE.hxx.xml      | 15 +++++++--------
 .../adms/admst/ngspiceMODULEguesstopology.c.xml   | 12 +++---------
 .../devices/adms/admst/ngspiceVersion.xml         | 14 ++++----------
 src/spicelib/devices/adms/ex-1/admsva/r2_cmc.va   |  4 ++++
 4 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml b/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml
index 0988da6d3..f66514ecb 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml
@@ -1877,19 +1877,18 @@ inline double _d1_pow(double x,double y)   { return (x==0.0)?0.0:((log(x)/exp(0.
       <admst:variable name="xpq" select="$epq"/>
       <admst:variable name="e" select="_DDT($x)"/>
     </admst:when>
-    <admst:when test="[name='\$given']">
+    <admst:when test="[name='\$given' or name='\$param_given']">
       <admst:variable name="arg1" select="%(arguments[1])"/>
-      <admst:assert test="$arg1/adms[datatypename='variable']" format="\$given: argument is not a variable\n"/>
-      <admst:assert test="$arg1/[input='yes']" format="\$given(%(name)): argument is not a parameter\n"/>
+      <admst:assert test="$arg1/[datatypename='variable' and input='yes']" format="%(name): argument is not a parameter\n"/>
       <admst:choose>
         <admst:when test="$arg1/[parametertype='model']">
-          <admst:variable name="e" select="_mpg(%(name),%(name)Given)"/>
+          <admst:variable name="e" select="(model->%(arguments[1])_Given)"/>
         </admst:when>
         <admst:when test="$arg1/[parametertype='instance']">
-          <admst:variable name="e" select="_ipg(%(name),%(name)Given)"/>
+          <admst:variable name="e" select="(here->%(arguments[1])_Given)"/>
         </admst:when>
         <admst:otherwise>
-          <admst:fatal format="$given(): should not be reached\n"/>
+          <admst:fatal format="%(name): should not be reached\n"/>
         </admst:otherwise>
       </admst:choose>
     </admst:when>
@@ -2005,7 +2004,7 @@ inline double _d1_pow(double x,double y)   { return (x==0.0)?0.0:((log(x)/exp(0.
   <admst:choose>
     <admst:when test="[name='absdelay']">
     </admst:when>
-    <admst:when test="[name='\$given']">
+    <admst:when test="[name='\$given' or name='\$param_given']">
     </admst:when>
     <admst:when test="[name='\$temperature']">
     </admst:when>
@@ -2074,7 +2073,7 @@ inline double _d1_pow(double x,double y)   { return (x==0.0)?0.0:((log(x)/exp(0.
   <admst:choose>
     <admst:when test="[name='absdelay']">
     </admst:when>
-    <admst:when test="[name='\$given']">
+    <admst:when test="[name='\$given' or name='\$param_given']">
     </admst:when>
     <admst:when test="[name='\$temperature']">
     </admst:when>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
index 0b96cf071..64fbf49a3 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
@@ -56,15 +56,9 @@
     <admst:when test="[name='analysis']">
       <admst:apply-templates select="." match="function:analysis"/>
     </admst:when>
-    <admst:when test="[name='\$given']">
+    <admst:when test="[name='\$given' or name='\$param_given']">
       <admst:for-each select="arguments[position(.)=1]">
-        <admst:if test="[datatypename!='variable']">
-          <admst:error format="$given: argument is not a variable\n"/>
-        </admst:if>
-        <admst:if test="[input='no']">
-          <admst:value-of select="name"/>
-          <admst:error format="$given(%s): argument is not a parameter\n"/>
-        </admst:if>
+        <admst:assert test="[datatypename='variable' and input='yes']" format="%(../name)(%(../arguments[1])): argument is not a parameter\n"/>
         <admst:choose>
           <admst:when test="[parametertype='model']">
             <admst:value-of select="name"/>
@@ -75,7 +69,7 @@
             <admst:value-to select="/simulator/tmp" value="here->%s_Given"/>
           </admst:when>
           <admst:otherwise>
-            <admst:error format="$given(%s): should not be reached\n"/>
+            <admst:error format="%(../name)(%(../arguments[1])): should not be reached\n"/>
           </admst:otherwise>
         </admst:choose>
       </admst:for-each>
diff --git a/src/spicelib/devices/adms/admst/ngspiceVersion.xml b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
index 13bf7b604..0558cbc36 100644
--- a/src/spicelib/devices/adms/admst/ngspiceVersion.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
@@ -609,15 +609,9 @@
         <admst:value-to select="/simulator/tmp" value="%s"/>
       </admst:for-each>
     </admst:when>
-    <admst:when test="[name='\$given']">
+    <admst:when test="[name='\$given' or name='\$param_given']">
       <admst:for-each select="arguments[position(.)=1]">
-        <admst:if test="adms[datatypename!='variable']">
-          <admst:error format="$given: argument is not a variable\n"/>
-        </admst:if>
-        <admst:if test="[input='no']">
-          <admst:value-of select="name"/>
-          <admst:error format="$given(%s): argument is not a parameter\n"/>
-        </admst:if>
+        <admst:assert test="[datatypename='variable' and input='yes']" format="%(../name)(%(../arguments[1])): argument is not a parameter\n"/>
         <admst:choose>
           <admst:when test="[parametertype='model']">
             <admst:value-of select="name"/>
@@ -628,7 +622,7 @@
             <admst:value-to select="/simulator/tmp" value="here->%s_Given"/>
           </admst:when>
           <admst:otherwise>
-            <admst:error format="$given(%s): should not be reached\n"/>
+            <admst:error format="%(../name)(%(../arguments[1])): should not be reached\n"/>
           </admst:otherwise>
         </admst:choose>
       </admst:for-each>
@@ -707,7 +701,7 @@
     <admst:when test="[name='\$options']">
       <admst:for-each select="arguments[position(.)=1]">
         <admst:if test="adms[datatypename!='string']">
-          <admst:error format="$given: argument is not a string\n"/>
+          <admst:error format="$options: argument is not a string\n"/>
         </admst:if>
         <admst:choose>
           <admst:when test="[value='OPTm_hier']">
diff --git a/src/spicelib/devices/adms/ex-1/admsva/r2_cmc.va b/src/spicelib/devices/adms/ex-1/admsva/r2_cmc.va
index ca0213cfb..bee853ea8 100644
--- a/src/spicelib/devices/adms/ex-1/admsva/r2_cmc.va
+++ b/src/spicelib/devices/adms/ex-1/admsva/r2_cmc.va
@@ -27,6 +27,10 @@ module r2_cmc(t, b);
    parameter real type = 0; // 0=n, 1=p
    analog begin : L
        real dT, rsh_t, c, r, Ir, Qc, Ceff, pwrR;
+       if ($param_given(tcr))
+          $finish(4);
+       if ($param_given(tcr))
+          $finish(4);
        if (nc > 2)
           $finish(0);
        begin : initializeModel