From 729ab44bd5f62bded2dee060de046d27e4b46a90 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 13 May 2017 12:50:12 +0200
Subject: [PATCH] ngspiceMODULE.hxx.xml, $finish and test with r2_cmc.va

---
 .../devices/adms/admst/ngspiceMODULE.hxx.xml  | 30 ++++++++++++-------
 .../devices/adms/ex-1/admsva/r2_cmc.va        |  2 ++
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml b/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml
index c4b4837a8..ebfc032d6 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULE.hxx.xml
@@ -2623,20 +2623,28 @@ inline double _d1_pow(double x,double y)   { return (x==0.0)?0.0:((log(x)/exp(0.
 <!-- analog//callfunctions -->
 <admst:template match="callfunction">
   <admst:choose>
-    <admst:when test="function[name='\$strobe']">printf(</admst:when>
-    <admst:when test="function[name='\$warning']">_warning(</admst:when>
-    <admst:when test="function[name='\$error']">_error(</admst:when>
-    <admst:when test="function[name='\$finish']">_finish(</admst:when>
-    <admst:when test="function[name='\$stop']">_stop(</admst:when>
+    <admst:when test="function[name='\$finish']">
+      <admst:text format="_finish("/>
+      <admst:join select="function/arguments" separator=",">%(e(tree))</admst:join>
+      <admst:text format=");\n"/>
+    </admst:when>
     <admst:otherwise>
-      <admst:fatal format="function not supported: %(function/name)\n"/>
+      <admst:choose>
+        <admst:when test="function[name='\$strobe']">printf(</admst:when>
+        <admst:when test="function[name='\$warning']">_warning(</admst:when>
+        <admst:when test="function[name='\$error']">_error(</admst:when>
+        <admst:when test="function[name='\$stop']">_stop(</admst:when>
+        <admst:otherwise>
+          <admst:fatal format="function not supported: %(function/name)\n"/>
+        </admst:otherwise>
+      </admst:choose>
+      <admst:join select="function/arguments" separator=",">
+        %(e(tree))
+        <admst:if test="[position(.)=1]">&quot;\\n&quot;</admst:if>
+      </admst:join>
+      <admst:text format="); fflush(stdout);\n"/>
     </admst:otherwise>
   </admst:choose>
-  <admst:join select="function/arguments" separator=",">
-    %(e(tree))
-    <admst:if test="[position(.)=1]">&quot;\\n&quot;</admst:if>
-  </admst:join>
-  <admst:text format="); fflush(stdout);\n"/>
 </admst:template>
 
 <!-- analog/code -->
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 4bdf94da2..ca0213cfb 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,8 @@ 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 (nc > 2)
+          $finish(0);
        begin : initializeModel
           dT = $temperature - `TNOM;
           rsh_t = rsh*(1.0+tcr*dT);