From 549e62497a2cb1fc28c30ee31835cda20901ce87 Mon Sep 17 00:00:00 2001
From: stefanjones <stefanjones>
Date: Wed, 27 Oct 2004 22:14:28 +0000
Subject: [PATCH] com_measure.c com_measure.h commands.c spiceif.c : Enable
 measure all the time Let new spicefile overwrite the tran struct

---
 src/frontend/com_measure.c |  3 ---
 src/frontend/com_measure.h |  3 +--
 src/frontend/commands.c    |  8 ++++----
 src/frontend/spiceif.c     | 27 ++++++++++++++++++---------
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/frontend/com_measure.c b/src/frontend/com_measure.c
index 13ed62b97..3468f15b1 100644
--- a/src/frontend/com_measure.c
+++ b/src/frontend/com_measure.c
@@ -7,8 +7,6 @@
 #include "vectors.h"
 #include <math.h>
 
-#ifdef TCL_MODULE
-
 typedef struct measure
 {
   char *result;
@@ -940,4 +938,3 @@ void com_measure(wordlist *wl) {
 	return;
 }
 
-#endif
diff --git a/src/frontend/com_measure.h b/src/frontend/com_measure.h
index 5c3605aec..7e7bad349 100644
--- a/src/frontend/com_measure.h
+++ b/src/frontend/com_measure.h
@@ -2,9 +2,8 @@
 #define _COM_MEASURE_H
 
 #include <config.h>
-#ifdef TCL_MODULE
+
 void com_measure(wordlist *wl);
 float get_measure(wordlist *wl);
-#endif
 
 #endif
diff --git a/src/frontend/commands.c b/src/frontend/commands.c
index c6f795e0f..83d15cc1f 100644
--- a/src/frontend/commands.c
+++ b/src/frontend/commands.c
@@ -112,15 +112,15 @@ struct comm spcp_coms[] = {
       { 0, 0, 0, 0 }, E_DEFHMASK, 3, LOTS,
       (void (*)()) NULL,
       "spec name pat ... : Redefine vector and plot types.\n" } ,
+    { "measure", com_measure, FALSE, FALSE, TRUE,
+      { 041000, 041000, 041000, 041000 }, E_BEGINNING | E_HASPLOTS, 1, LOTS,
+      arg_plot,
+      "measure..." },
 #ifdef TCL_MODULE
     { "bltplot", com_bltplot, FALSE, FALSE, TRUE,
       { 041000, 041000, 041000, 041000 }, E_BEGINNING | E_HASPLOTS, 1, LOTS,
       arg_plot,
       "expr ... [vs expr] [xl xlo xhi] [yl ylo yhi] : Plot things." },
-    { "measure", com_measure, FALSE, FALSE, TRUE,
-      { 041000, 041000, 041000, 041000 }, E_BEGINNING | E_HASPLOTS, 1, LOTS,
-      arg_plot,
-      "measure..." },
     { "plot", com_bltplot, FALSE, FALSE, TRUE,
       { 041000, 041000, 041000, 041000 }, E_BEGINNING | E_HASPLOTS, 1, LOTS,
       arg_plot,
diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c
index 0e9c2162a..f7dd40054 100644
--- a/src/frontend/spiceif.c
+++ b/src/frontend/spiceif.c
@@ -1167,23 +1167,32 @@ do {\
 
     _foo(ckt->CKTbreaks,double,ckt->CKTbreakSize);
     
-    _foo((TSKtask *)ft_curckt->ci_curTask,TSKtask,1);
+#if 0
+	_foo((TSKtask *)ft_curckt->ci_curTask,TSKtask,1);
 
-    /* To stop the Free */
     ((TSKtask *)ft_curckt->ci_curTask)->TSKname = NULL;
-    ((TSKtask *)ft_curckt->ci_curTask)->jobs = NULL;
-
     _foo(((TSKtask *)ft_curckt->ci_curTask)->TSKname,char,-1);
     
+    ((TSKtask *)ft_curckt->ci_curTask)->jobs = NULL;
     _foo(((TRANan *)((TSKtask *)ft_curckt->ci_curTask)->jobs),TRANan,1);
-    ((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBname = NULL;
-    ckt->CKTcurJob = (JOB *)((TSKtask *)ft_curckt->ci_curTask)->jobs;
-    
+	
+    ((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBname = NULL;    
     _foo(((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBname,char,-1);
+#else
+	{
+		void *tmp=NULL;
+  		_foo(tmp,TSKtask,1);
+		_foo(tmp,char,-1);
+		_foo(tmp,TRANan,1);
+		_foo(tmp,char,-1);
+		tfree(tmp);
+	}
+#endif    
+    ckt->CKTcurJob = (JOB *)((TSKtask *)ft_curckt->ci_curTask)->jobs;
 
-    ((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBnextJob = NULL;
+	((TRANan *)((TSKtask *)ft_curckt->ci_curTask)->jobs)->TRANplot = NULL;
     
-    ((TRANan *)((TSKtask *)ft_curckt->ci_curTask)->jobs)->TRANplot = NULL;
+	((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBnextJob = NULL;
 
     _foo(ckt->CKTstat,STATistics,1);