* src/circuit/*: moved these files into src/devices/parser. The

files in this directory take a model line from the input file and add the corresponding element to the representation of the circuit in memory. * configure.in, src/Makefile.am, src/devices/Makefile.am: Files affected by the move.
26 years ago · df3cc8983d
61 changed files with 16 additions and 4 deletions
--- a/configure.in
+++ b/configure.in
@ -198,7 +198,6 @@ man/Makefile			\
 man/man1/Makefile		\
 src/Makefile			\
 src/analysis/Makefile		\
-src/circuit/Makefile		\
 src/devices/Makefile		\
 src/devices/asrc/Makefile	\
 src/devices/bjt/Makefile	\
@ -230,6 +229,7 @@ src/devices/urc/Makefile	\
 src/devices/vccs/Makefile	\
 src/devices/vcvs/Makefile	\
 src/devices/vsrc/Makefile	\
+src/devices/parser/Makefile	\
 src/frontend/Makefile		\
 src/frontend/plotting/Makefile	\
 src/hlp/Makefile		\
--- a/src/ChangeLog
+++ b/src/ChangeLog
@ -1,3 +1,13 @@
+2000-07-20  Arno W. Peters  <A.W.Peters@ieee.org>
+
+	* src/circuit/*: moved these files into src/devices/parser.  The
+	files in this directory take a model line from the input file and
+	add the corresponding element to the representation of
+	the circuit in memory.
+
+	* configure.in, src/Makefile.am, src/devices/Makefile.am: Files
+	affected by the move.
+
 2000-07-18  Arno W. Peters  <A.W.Peters@ieee.org>

 	* main.c: Added the call to the initialization function of the
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -61,7 +61,7 @@ ngspice_LDADD = \
 	devices/libdev.a \
 	parser/libparser.a \
 	hlp/libhlp.a \
-	circuit/libinp.a \
+	devices/parser/libinp.a \
 	maths/deriv/libderiv.a \
 	maths/cmaths/libcmaths.a \
 	maths/poly/libpoly.a \
@ -121,7 +121,7 @@ proc2mod_SOURCES = proc2mod.c

 proc2mod_LDADD =  \
 	parser/libparser.a \
-	circuit/libinp.a \
+	devices/parser/libinp.a \
 	misc/libmisc.a 


--- a/src/spicelib/devices/Makefile.am
+++ b/src/spicelib/devices/Makefile.am
@ -30,7 +30,8 @@ SUBDIRS = \
 	urc	\
 	vccs	\
 	vcvs	\
-	vsrc
+	vsrc	\
+	parser

 lib_LIBRARIES = libdev.a

--- a/src/spicelib/devices/parser/.cvsignore
+++ b/src/spicelib/devices/parser/.cvsignore
@ -1,3 +1,4 @@
 Makefile.in
 Makefile
 .deps
+.libs
--- a/src/spicelib/devices/parser/ChangeLog
+++ b/src/spicelib/devices/parser/ChangeLog
--- a/src/spicelib/devices/parser/Makefile.am
+++ b/src/spicelib/devices/parser/Makefile.am
--- a/src/spicelib/devices/parser/ifeval.c
+++ b/src/spicelib/devices/parser/ifeval.c
--- a/src/spicelib/devices/parser/ifnewuid.c
+++ b/src/spicelib/devices/parser/ifnewuid.c
--- a/src/spicelib/devices/parser/inp.h
+++ b/src/spicelib/devices/parser/inp.h
--- a/src/spicelib/devices/parser/inp2b.c
+++ b/src/spicelib/devices/parser/inp2b.c
--- a/src/spicelib/devices/parser/inp2c.c
+++ b/src/spicelib/devices/parser/inp2c.c
--- a/src/spicelib/devices/parser/inp2d.c
+++ b/src/spicelib/devices/parser/inp2d.c
--- a/src/spicelib/devices/parser/inp2dot.c
+++ b/src/spicelib/devices/parser/inp2dot.c
--- a/src/spicelib/devices/parser/inp2e.c
+++ b/src/spicelib/devices/parser/inp2e.c
--- a/src/spicelib/devices/parser/inp2f.c
+++ b/src/spicelib/devices/parser/inp2f.c
--- a/src/spicelib/devices/parser/inp2g.c
+++ b/src/spicelib/devices/parser/inp2g.c
--- a/src/spicelib/devices/parser/inp2h.c
+++ b/src/spicelib/devices/parser/inp2h.c
--- a/src/spicelib/devices/parser/inp2i.c
+++ b/src/spicelib/devices/parser/inp2i.c
--- a/src/spicelib/devices/parser/inp2j.c
+++ b/src/spicelib/devices/parser/inp2j.c
--- a/src/spicelib/devices/parser/inp2k.c
+++ b/src/spicelib/devices/parser/inp2k.c
--- a/src/spicelib/devices/parser/inp2l.c
+++ b/src/spicelib/devices/parser/inp2l.c
--- a/src/spicelib/devices/parser/inp2m.c
+++ b/src/spicelib/devices/parser/inp2m.c
--- a/src/spicelib/devices/parser/inp2o.c
+++ b/src/spicelib/devices/parser/inp2o.c
--- a/src/spicelib/devices/parser/inp2q.c
+++ b/src/spicelib/devices/parser/inp2q.c
--- a/src/spicelib/devices/parser/inp2r.c
+++ b/src/spicelib/devices/parser/inp2r.c
--- a/src/spicelib/devices/parser/inp2s.c
+++ b/src/spicelib/devices/parser/inp2s.c
--- a/src/spicelib/devices/parser/inp2t.c
+++ b/src/spicelib/devices/parser/inp2t.c
--- a/src/spicelib/devices/parser/inp2u.c
+++ b/src/spicelib/devices/parser/inp2u.c
--- a/src/spicelib/devices/parser/inp2v.c
+++ b/src/spicelib/devices/parser/inp2v.c
--- a/src/spicelib/devices/parser/inp2w.c
+++ b/src/spicelib/devices/parser/inp2w.c
--- a/src/spicelib/devices/parser/inp2z.c
+++ b/src/spicelib/devices/parser/inp2z.c
--- a/src/spicelib/devices/parser/inpaname.c
+++ b/src/spicelib/devices/parser/inpaname.c
--- a/src/spicelib/devices/parser/inpapnam.c
+++ b/src/spicelib/devices/parser/inpapnam.c
--- a/src/spicelib/devices/parser/inpcfix.c
+++ b/src/spicelib/devices/parser/inpcfix.c
--- a/src/spicelib/devices/parser/inpdomod.c
+++ b/src/spicelib/devices/parser/inpdomod.c
--- a/src/spicelib/devices/parser/inpdpar.c
+++ b/src/spicelib/devices/parser/inpdpar.c
--- a/src/spicelib/devices/parser/inperrc.c
+++ b/src/spicelib/devices/parser/inperrc.c
--- a/src/spicelib/devices/parser/inperror.c
+++ b/src/spicelib/devices/parser/inperror.c
--- a/src/spicelib/devices/parser/inpeval.c
+++ b/src/spicelib/devices/parser/inpeval.c
--- a/src/spicelib/devices/parser/inpfindl.c
+++ b/src/spicelib/devices/parser/inpfindl.c
--- a/src/spicelib/devices/parser/inpgmod.c
+++ b/src/spicelib/devices/parser/inpgmod.c
--- a/src/spicelib/devices/parser/inpgstr.c
+++ b/src/spicelib/devices/parser/inpgstr.c
--- a/src/spicelib/devices/parser/inpgtitl.c
+++ b/src/spicelib/devices/parser/inpgtitl.c
--- a/src/spicelib/devices/parser/inpgtok.c
+++ b/src/spicelib/devices/parser/inpgtok.c
--- a/src/spicelib/devices/parser/inpgval.c
+++ b/src/spicelib/devices/parser/inpgval.c
--- a/src/spicelib/devices/parser/inpkmods.c
+++ b/src/spicelib/devices/parser/inpkmods.c
--- a/src/spicelib/devices/parser/inplist.c
+++ b/src/spicelib/devices/parser/inplist.c
--- a/src/spicelib/devices/parser/inplkmod.c
+++ b/src/spicelib/devices/parser/inplkmod.c
--- a/src/spicelib/devices/parser/inpmkmod.c
+++ b/src/spicelib/devices/parser/inpmkmod.c
--- a/src/spicelib/devices/parser/inpmktmp.c
+++ b/src/spicelib/devices/parser/inpmktmp.c
--- a/src/spicelib/devices/parser/inppas1.c
+++ b/src/spicelib/devices/parser/inppas1.c
--- a/src/spicelib/devices/parser/inppas1.h
+++ b/src/spicelib/devices/parser/inppas1.h
--- a/src/spicelib/devices/parser/inppas2.c
+++ b/src/spicelib/devices/parser/inppas2.c
--- a/src/spicelib/devices/parser/inppas2.h
+++ b/src/spicelib/devices/parser/inppas2.h
--- a/src/spicelib/devices/parser/inppname.c
+++ b/src/spicelib/devices/parser/inppname.c
--- a/src/spicelib/devices/parser/inpptree.c
+++ b/src/spicelib/devices/parser/inpptree.c
--- a/src/spicelib/devices/parser/inpsymt.c
+++ b/src/spicelib/devices/parser/inpsymt.c
--- a/src/spicelib/devices/parser/inptyplk.c
+++ b/src/spicelib/devices/parser/inptyplk.c
--- a/src/spicelib/devices/parser/ptfuncs.c
+++ b/src/spicelib/devices/parser/ptfuncs.c
--- a/src/spicelib/devices/parser/sperror.c
+++ b/src/spicelib/devices/parser/sperror.c