* com_set.h: New header file.

* com_state.c, com_state.h: Separated from debugcom.c.

        * com_dump.c, com_dump.h: Separated from debugcom.c.

        * debugcom.c, debugcom.h: Removed.

        * Makefile.am: Updates for added/removed files.

src/frontend/ChangeLog

@@ -1,31 +1,45 @@
+2000-07-16  Arno W. Peters  <A.W.Peters@ieee.org>
+
+	* com_set.h: New header file.
+
+	* com_state.c, com_state.h: Separated from debugcom.c.
+
+	* com_dump.c, com_dump.h: Separated from debugcom.c.
+
+	* debugcom.c, debugcom.h: Removed.
+
+	* Makefile.am: Updates for added/removed files.
+
 2000-03-22  Paolo Nenzi <p.nenzi@ieee.org>
 
-    * rawfile.c: Applied Michael Widlok patch.
+	* rawfile.c: Applied Michael Widlok patch.
-    
+
-    * spiceif.c: Applied Michael Widlok patch. 
+	* spiceif.c: Applied Michael Widlok patch. 
 
 2000-03-12  Paolo Nenzi <p.nenzi@ieee.org>
-   
+
-    * x11.c: Cleared the code. Rewmoved some empty return on void functions.
+	* x11.c: Cleared the code. Rewmoved some empty return on void
+	functions.
 
 1999-12-20  Paolo Nenzi <p.nenzi@ieee.org>
-            outif.c: 
+
-            To fix various "save"-related segmentation faults, make this one-line patch
+	* outif.c: To fix various "save"-related segmentation faults, make
-            to outitf.c: line 356, change
+	this one-line patch to outitf.c: line 356, change unique =
-            unique = devname; to unique = copy(devname);
+	devname; to unique = copy(devname);
 
 1999-12-20  Paolo Nenzi <p.nenzi@ieee.org>
-            subckt.c: 
+
-                     Bug: Current controlled switch subcircuit does not expand
+        * subckt.c: Bug: Current controlled switch subcircuit does not
-                     the controlling source correctly: vsrc expands to name:vsrc,
+	expand the controlling source correctly: vsrc expands to
-                     not to v:name:src.
+	name:vsrc, not to v:name:src.
-                     Fix: changed this file to indicate that w device has only 2
+
-                     not 3 nodes and 1 not zero controlling sources.
+	Fix: changed this file to indicate that w device has only 2 not 3
+	nodes and 1 not zero controlling sources.
 
 1999-09-07  Emmanuel Rouat  <emmanuel.rouat@wanadoo.fr>
 
-	* *.c: put back static functions declarations back in the .c files (shouldn't
+	* *.c: put back static functions declarations back in the .c files
-	be in .h files!)
+	(shouldn't be in .h files!)
 
 1999-09-07  Arno  <A.W.Peters@ieee.org>
 
@@ -34,7 +48,7 @@
 	* cmath1.c:
 
 	* cmath2.c: removed most warnings about possible use of
- 	uninitialized variables.  Only two remain in cx_sqrt().
+	uninitialized variables.  Only two remain in cx_sqrt().
 
 1999-09-06  Arno Peters <A.W.Peters@ieee.org>
 
@@ -104,16 +118,14 @@
 
 	* resource.c: removed tests on HAS_UNIX_SEGMENT_HACK
 
-	* xgraph.c (ft_xgraph): 
+	* xgraph.c (ft_xgraph), options.c (cp_usrset), misccoms.c: removed
-	* options.c (cp_usrset): 
+	tests on HAS_SYSTEM
-	* misccoms.c: removed tests on HAS_SYSTEM
 
-	* nutinp.c: 
+	* nutinp.c, inp.c (com_source, doedit): removed tests on
-	* inp.c (com_source): 
+	HAS_SYSTEM (always true?)
-	(doedit): removed tests on HAS_SYSTEM (always true?)
 
-	* doplot.c (com_hardcopy): removed tests on HAS_UNLINK (always true)
+	* doplot.c (com_hardcopy): removed tests on HAS_UNLINK (always
-	(com_hardcopy): removed tests on HAS_SYSTEM (always true?)
+	true), removed tests on HAS_SYSTEM (always true?)
 
 	* signal.c: 
 	* evaluate.c (doop): 
@@ -127,28 +139,22 @@
 
 	* aspice.c: changed HAS_WAIT into HAVE_SYS_WAIT_H
 
-	* inpcom.c:
+	* inpcom.c, breakp.c: changed HAS_CTYPE into HAVE_CTYPE_H
-	* breakp.c: changed HAS_CTYPE into HAVE_CTYPE_H
 
 1999-08-03  Emmanuel Rouat  <emmanuel.rouat@wanadoo.fr>
 
-	* signal.c:
+	* signal.c, resource.c, evaluate.c, aspice.c: changed SIGNAL_TYPE
-	* resource.c:
+	into RETSIGTYPE
-	* evaluate.c:
-	* aspice.c: changed SIGNAL_TYPE into RETSIGTYPE
 
 1999-07-31  Emmanuel Rouat  <emmanuel.rouat@wanadoo.fr>
 
-	* Makefile.am: added @X_CFLAGS@ (X11 header files) to INCLUDES and removed
+	* Makefile.am: added @X_CFLAGS@ (X11 header files) to INCLUDES and
-	unused LIBS list.
+	removed unused LIBS list.
 
 28-07-1999 emmanuel.rouat@wanadoo.fr (Manu Rouat)
 
-	* graf.c:
+	* graf.c, display.c, doplot.c, x11.c: changed HAS_X11 define
-	* display.c:
+	to X_DISPLAY_MISSING, which is supplied by autoconf in config.h
-	* doplot.c:
-	* x11.c: changed HAS_X11 define to X_DISPLAY_MISSING, which is supplied
-	by autoconf in config.h
 	
-	* removed -DWANT_X11 in Makefile.am
+	* Makefile.am: removed -DWANT_X11
 

src/frontend/Makefile.am

@@ -35,10 +35,13 @@ libfte_a_SOURCES = \
 	com_plot.h	\
 	com_rehash.c	\
 	com_set.c	\
+	com_set.h	\
 	com_setscale.c	\
 	com_setscale.h	\
 	com_shell.c	\
 	com_shift.c	\
+	com_state.c	\
+	com_state.h	\
 	com_strcmp.c	\
 	com_strcmp.h	\
 	com_unset.c	\

src/frontend/com_dump.c

@@ -0,0 +1,21 @@
+#include <config.h>
+#include <ngspice.h>
+#include <bool.h>
+#include <wordlist.h>
+#include <inpdefs.h>
+
+#include "circuits.h"
+#include "com_dump.h"
+#include "streams.h"
+
+
+void
+com_dump(wordlist *wl)
+{
+    if (!ft_curckt || !ft_curckt->ci_ckt) {
+        fprintf(cp_err, "Error: no circuit loaded.\n");
+        return;
+    }
+    if_dump(ft_curckt->ci_ckt, cp_out);
+    return;
+}

src/frontend/com_dump.h

@@ -0,0 +1,6 @@
+#ifndef _COM_DUMP_H
+#define _COM_DUMP_H
+
+void com_dump(wordlist *wl);
+
+#endif

src/frontend/com_set.h

@@ -0,0 +1,6 @@
+#ifndef _COM_SET_H
+#define _COM_SET_H
+
+void com_set(wordlist *wl);
+
+#endif

src/frontend/com_state.c

@@ -1,21 +1,13 @@
-/**********
+#include <config.h>
-Copyright 1990 Regents of the University of California.  All rights reserved.
+#include <ngspice.h>
-Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
+#include <bool.h>
-**********/
+#include <wordlist.h>
-
+#include <inpdefs.h>
-/*
- * Circuit debugging commands.
- */
-
-#include "ngspice.h"
-#include "cpdefs.h"
-#include "ftedefs.h"
-#include "ftedebug.h"
-#include "dvec.h"
-#include "fteinp.h"
 
 #include "circuits.h"
-#include "debugcom.h"
+#include "com_state.h"
+#include "streams.h"
+#include "plotting/plotting.h"
 
 
 void
@@ -36,16 +28,3 @@ com_state(wordlist *wl)
     fprintf(cp_out, "(That's all this command does so far)\n");
     return;
 }
-
-
-void
-com_dump(wordlist *wl)
-{
-    if (!ft_curckt || !ft_curckt->ci_ckt) {
-        fprintf(cp_err, "Error: no circuit loaded.\n");
-        return;
-    }
-    if_dump(ft_curckt->ci_ckt, cp_out);
-    return;
-}
-

src/frontend/com_state.h

@@ -0,0 +1,7 @@
+#ifndef _COM_STATE_H
+#define _COM_STATE_H
+
+void com_state(wordlist *wl);
+
+#endif
+

src/frontend/debugcom.h

@@ -1,14 +0,0 @@
-/*************
- * Header file for debugcom.c
- * 1999 E. Rouat
- ************/
-
-#ifndef DEBUGCOM_H_INCLUDED
-#define DEBUGCOM_H_INCLUDED
-
-void com_state(wordlist *wl);
-void com_dump(wordlist *wl);
-
-
-
-#endif