From 53260d50f9a1dbc03e418d48894bd96ddaf40c41 Mon Sep 17 00:00:00 2001 From: arno Date: Sun, 16 Jul 2000 13:24:58 +0000 Subject: [PATCH] * 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 | 86 +++++++++++++----------- src/frontend/Makefile.am | 3 + src/frontend/com_dump.c | 21 ++++++ src/frontend/com_dump.h | 6 ++ src/frontend/com_set.h | 6 ++ src/frontend/{debugcom.c => com_state.c} | 37 +++------- src/frontend/com_state.h | 7 ++ src/frontend/debugcom.h | 14 ---- 8 files changed, 97 insertions(+), 83 deletions(-) create mode 100644 src/frontend/com_dump.c create mode 100644 src/frontend/com_dump.h create mode 100644 src/frontend/com_set.h rename src/frontend/{debugcom.c => com_state.c} (50%) create mode 100644 src/frontend/com_state.h delete mode 100644 src/frontend/debugcom.h diff --git a/src/frontend/ChangeLog b/src/frontend/ChangeLog index 2c38e19e4..30566cb01 100644 --- a/src/frontend/ChangeLog +++ b/src/frontend/ChangeLog @@ -1,31 +1,45 @@ +2000-07-16 Arno W. Peters + + * 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 - * rawfile.c: Applied Michael Widlok patch. - - * spiceif.c: Applied Michael Widlok patch. + * rawfile.c: Applied Michael Widlok patch. + + * spiceif.c: Applied Michael Widlok patch. 2000-03-12 Paolo Nenzi - - * 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 - outif.c: - To fix various "save"-related segmentation faults, make this one-line patch - to outitf.c: line 356, change - unique = devname; to unique = copy(devname); + + * outif.c: To fix various "save"-related segmentation faults, make + this one-line patch to outitf.c: line 356, change unique = + devname; to unique = copy(devname); 1999-12-20 Paolo Nenzi - subckt.c: - Bug: Current controlled switch subcircuit does not expand - the controlling source correctly: vsrc expands to 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. + + * subckt.c: Bug: Current controlled switch subcircuit does not + expand the controlling source correctly: vsrc expands to + 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. 1999-09-07 Emmanuel Rouat - * *.c: put back static functions declarations back in the .c files (shouldn't - be in .h files!) + * *.c: put back static functions declarations back in the .c files + (shouldn't be in .h files!) 1999-09-07 Arno @@ -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 @@ -104,16 +118,14 @@ * resource.c: removed tests on HAS_UNIX_SEGMENT_HACK - * xgraph.c (ft_xgraph): - * options.c (cp_usrset): - * misccoms.c: removed tests on HAS_SYSTEM + * xgraph.c (ft_xgraph), options.c (cp_usrset), misccoms.c: removed + tests on HAS_SYSTEM - * nutinp.c: - * inp.c (com_source): - (doedit): removed tests on HAS_SYSTEM (always true?) + * nutinp.c, inp.c (com_source, doedit): removed tests on + HAS_SYSTEM (always true?) - * doplot.c (com_hardcopy): removed tests on HAS_UNLINK (always true) - (com_hardcopy): removed tests on HAS_SYSTEM (always true?) + * doplot.c (com_hardcopy): removed tests on HAS_UNLINK (always + 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: - * breakp.c: changed HAS_CTYPE into HAVE_CTYPE_H + * inpcom.c, breakp.c: changed HAS_CTYPE into HAVE_CTYPE_H 1999-08-03 Emmanuel Rouat - * signal.c: - * resource.c: - * evaluate.c: - * aspice.c: changed SIGNAL_TYPE into RETSIGTYPE + * signal.c, resource.c, evaluate.c, aspice.c: changed SIGNAL_TYPE + into RETSIGTYPE 1999-07-31 Emmanuel Rouat - * Makefile.am: added @X_CFLAGS@ (X11 header files) to INCLUDES and removed - unused LIBS list. + * Makefile.am: added @X_CFLAGS@ (X11 header files) to INCLUDES and + removed unused LIBS list. 28-07-1999 emmanuel.rouat@wanadoo.fr (Manu Rouat) - * graf.c: - * display.c: - * doplot.c: - * x11.c: changed HAS_X11 define to X_DISPLAY_MISSING, which is supplied - by autoconf in config.h + * graf.c, display.c, 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 diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index 53b2ba2be..8da69c4c3 100644 --- a/src/frontend/Makefile.am +++ b/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 \ diff --git a/src/frontend/com_dump.c b/src/frontend/com_dump.c new file mode 100644 index 000000000..d692a46b0 --- /dev/null +++ b/src/frontend/com_dump.c @@ -0,0 +1,21 @@ +#include +#include +#include +#include +#include + +#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; +} diff --git a/src/frontend/com_dump.h b/src/frontend/com_dump.h new file mode 100644 index 000000000..36441e406 --- /dev/null +++ b/src/frontend/com_dump.h @@ -0,0 +1,6 @@ +#ifndef _COM_DUMP_H +#define _COM_DUMP_H + +void com_dump(wordlist *wl); + +#endif diff --git a/src/frontend/com_set.h b/src/frontend/com_set.h new file mode 100644 index 000000000..00b929447 --- /dev/null +++ b/src/frontend/com_set.h @@ -0,0 +1,6 @@ +#ifndef _COM_SET_H +#define _COM_SET_H + +void com_set(wordlist *wl); + +#endif diff --git a/src/frontend/debugcom.c b/src/frontend/com_state.c similarity index 50% rename from src/frontend/debugcom.c rename to src/frontend/com_state.c index 07f045ee0..d420bda2f 100644 --- a/src/frontend/debugcom.c +++ b/src/frontend/com_state.c @@ -1,21 +1,13 @@ -/********** -Copyright 1990 Regents of the University of California. All rights reserved. -Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group -**********/ - -/* - * Circuit debugging commands. - */ - -#include "ngspice.h" -#include "cpdefs.h" -#include "ftedefs.h" -#include "ftedebug.h" -#include "dvec.h" -#include "fteinp.h" +#include +#include +#include +#include +#include #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; -} - diff --git a/src/frontend/com_state.h b/src/frontend/com_state.h new file mode 100644 index 000000000..08955a500 --- /dev/null +++ b/src/frontend/com_state.h @@ -0,0 +1,7 @@ +#ifndef _COM_STATE_H +#define _COM_STATE_H + +void com_state(wordlist *wl); + +#endif + diff --git a/src/frontend/debugcom.h b/src/frontend/debugcom.h deleted file mode 100644 index 54399ee4e..000000000 --- a/src/frontend/debugcom.h +++ /dev/null @@ -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