diff --git a/configure.in b/configure.in index a55a67fba..bf9382957 100644 --- 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 \ diff --git a/src/ChangeLog b/src/ChangeLog index 9917de57b..de4ffaa52 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2000-07-20 Arno W. Peters + + * 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 * main.c: Added the call to the initialization function of the diff --git a/src/Makefile.am b/src/Makefile.am index 53ab54b13..02553287b 100644 --- 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 diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am index 3e6c6c143..b4d7684fd 100644 --- 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 diff --git a/src/circuit/.cvsignore b/src/spicelib/devices/parser/.cvsignore similarity index 81% rename from src/circuit/.cvsignore rename to src/spicelib/devices/parser/.cvsignore index e440fafda..8cb5c0556 100644 --- a/src/circuit/.cvsignore +++ b/src/spicelib/devices/parser/.cvsignore @@ -1,3 +1,4 @@ Makefile.in Makefile .deps +.libs diff --git a/src/circuit/ChangeLog b/src/spicelib/devices/parser/ChangeLog similarity index 100% rename from src/circuit/ChangeLog rename to src/spicelib/devices/parser/ChangeLog diff --git a/src/circuit/Makefile.am b/src/spicelib/devices/parser/Makefile.am similarity index 100% rename from src/circuit/Makefile.am rename to src/spicelib/devices/parser/Makefile.am diff --git a/src/circuit/ifeval.c b/src/spicelib/devices/parser/ifeval.c similarity index 100% rename from src/circuit/ifeval.c rename to src/spicelib/devices/parser/ifeval.c diff --git a/src/circuit/ifnewuid.c b/src/spicelib/devices/parser/ifnewuid.c similarity index 100% rename from src/circuit/ifnewuid.c rename to src/spicelib/devices/parser/ifnewuid.c diff --git a/src/circuit/inp.h b/src/spicelib/devices/parser/inp.h similarity index 100% rename from src/circuit/inp.h rename to src/spicelib/devices/parser/inp.h diff --git a/src/circuit/inp2b.c b/src/spicelib/devices/parser/inp2b.c similarity index 100% rename from src/circuit/inp2b.c rename to src/spicelib/devices/parser/inp2b.c diff --git a/src/circuit/inp2c.c b/src/spicelib/devices/parser/inp2c.c similarity index 100% rename from src/circuit/inp2c.c rename to src/spicelib/devices/parser/inp2c.c diff --git a/src/circuit/inp2d.c b/src/spicelib/devices/parser/inp2d.c similarity index 100% rename from src/circuit/inp2d.c rename to src/spicelib/devices/parser/inp2d.c diff --git a/src/circuit/inp2dot.c b/src/spicelib/devices/parser/inp2dot.c similarity index 100% rename from src/circuit/inp2dot.c rename to src/spicelib/devices/parser/inp2dot.c diff --git a/src/circuit/inp2e.c b/src/spicelib/devices/parser/inp2e.c similarity index 100% rename from src/circuit/inp2e.c rename to src/spicelib/devices/parser/inp2e.c diff --git a/src/circuit/inp2f.c b/src/spicelib/devices/parser/inp2f.c similarity index 100% rename from src/circuit/inp2f.c rename to src/spicelib/devices/parser/inp2f.c diff --git a/src/circuit/inp2g.c b/src/spicelib/devices/parser/inp2g.c similarity index 100% rename from src/circuit/inp2g.c rename to src/spicelib/devices/parser/inp2g.c diff --git a/src/circuit/inp2h.c b/src/spicelib/devices/parser/inp2h.c similarity index 100% rename from src/circuit/inp2h.c rename to src/spicelib/devices/parser/inp2h.c diff --git a/src/circuit/inp2i.c b/src/spicelib/devices/parser/inp2i.c similarity index 100% rename from src/circuit/inp2i.c rename to src/spicelib/devices/parser/inp2i.c diff --git a/src/circuit/inp2j.c b/src/spicelib/devices/parser/inp2j.c similarity index 100% rename from src/circuit/inp2j.c rename to src/spicelib/devices/parser/inp2j.c diff --git a/src/circuit/inp2k.c b/src/spicelib/devices/parser/inp2k.c similarity index 100% rename from src/circuit/inp2k.c rename to src/spicelib/devices/parser/inp2k.c diff --git a/src/circuit/inp2l.c b/src/spicelib/devices/parser/inp2l.c similarity index 100% rename from src/circuit/inp2l.c rename to src/spicelib/devices/parser/inp2l.c diff --git a/src/circuit/inp2m.c b/src/spicelib/devices/parser/inp2m.c similarity index 100% rename from src/circuit/inp2m.c rename to src/spicelib/devices/parser/inp2m.c diff --git a/src/circuit/inp2o.c b/src/spicelib/devices/parser/inp2o.c similarity index 100% rename from src/circuit/inp2o.c rename to src/spicelib/devices/parser/inp2o.c diff --git a/src/circuit/inp2q.c b/src/spicelib/devices/parser/inp2q.c similarity index 100% rename from src/circuit/inp2q.c rename to src/spicelib/devices/parser/inp2q.c diff --git a/src/circuit/inp2r.c b/src/spicelib/devices/parser/inp2r.c similarity index 100% rename from src/circuit/inp2r.c rename to src/spicelib/devices/parser/inp2r.c diff --git a/src/circuit/inp2s.c b/src/spicelib/devices/parser/inp2s.c similarity index 100% rename from src/circuit/inp2s.c rename to src/spicelib/devices/parser/inp2s.c diff --git a/src/circuit/inp2t.c b/src/spicelib/devices/parser/inp2t.c similarity index 100% rename from src/circuit/inp2t.c rename to src/spicelib/devices/parser/inp2t.c diff --git a/src/circuit/inp2u.c b/src/spicelib/devices/parser/inp2u.c similarity index 100% rename from src/circuit/inp2u.c rename to src/spicelib/devices/parser/inp2u.c diff --git a/src/circuit/inp2v.c b/src/spicelib/devices/parser/inp2v.c similarity index 100% rename from src/circuit/inp2v.c rename to src/spicelib/devices/parser/inp2v.c diff --git a/src/circuit/inp2w.c b/src/spicelib/devices/parser/inp2w.c similarity index 100% rename from src/circuit/inp2w.c rename to src/spicelib/devices/parser/inp2w.c diff --git a/src/circuit/inp2z.c b/src/spicelib/devices/parser/inp2z.c similarity index 100% rename from src/circuit/inp2z.c rename to src/spicelib/devices/parser/inp2z.c diff --git a/src/circuit/inpaname.c b/src/spicelib/devices/parser/inpaname.c similarity index 100% rename from src/circuit/inpaname.c rename to src/spicelib/devices/parser/inpaname.c diff --git a/src/circuit/inpapnam.c b/src/spicelib/devices/parser/inpapnam.c similarity index 100% rename from src/circuit/inpapnam.c rename to src/spicelib/devices/parser/inpapnam.c diff --git a/src/circuit/inpcfix.c b/src/spicelib/devices/parser/inpcfix.c similarity index 100% rename from src/circuit/inpcfix.c rename to src/spicelib/devices/parser/inpcfix.c diff --git a/src/circuit/inpdomod.c b/src/spicelib/devices/parser/inpdomod.c similarity index 100% rename from src/circuit/inpdomod.c rename to src/spicelib/devices/parser/inpdomod.c diff --git a/src/circuit/inpdpar.c b/src/spicelib/devices/parser/inpdpar.c similarity index 100% rename from src/circuit/inpdpar.c rename to src/spicelib/devices/parser/inpdpar.c diff --git a/src/circuit/inperrc.c b/src/spicelib/devices/parser/inperrc.c similarity index 100% rename from src/circuit/inperrc.c rename to src/spicelib/devices/parser/inperrc.c diff --git a/src/circuit/inperror.c b/src/spicelib/devices/parser/inperror.c similarity index 100% rename from src/circuit/inperror.c rename to src/spicelib/devices/parser/inperror.c diff --git a/src/circuit/inpeval.c b/src/spicelib/devices/parser/inpeval.c similarity index 100% rename from src/circuit/inpeval.c rename to src/spicelib/devices/parser/inpeval.c diff --git a/src/circuit/inpfindl.c b/src/spicelib/devices/parser/inpfindl.c similarity index 100% rename from src/circuit/inpfindl.c rename to src/spicelib/devices/parser/inpfindl.c diff --git a/src/circuit/inpgmod.c b/src/spicelib/devices/parser/inpgmod.c similarity index 100% rename from src/circuit/inpgmod.c rename to src/spicelib/devices/parser/inpgmod.c diff --git a/src/circuit/inpgstr.c b/src/spicelib/devices/parser/inpgstr.c similarity index 100% rename from src/circuit/inpgstr.c rename to src/spicelib/devices/parser/inpgstr.c diff --git a/src/circuit/inpgtitl.c b/src/spicelib/devices/parser/inpgtitl.c similarity index 100% rename from src/circuit/inpgtitl.c rename to src/spicelib/devices/parser/inpgtitl.c diff --git a/src/circuit/inpgtok.c b/src/spicelib/devices/parser/inpgtok.c similarity index 100% rename from src/circuit/inpgtok.c rename to src/spicelib/devices/parser/inpgtok.c diff --git a/src/circuit/inpgval.c b/src/spicelib/devices/parser/inpgval.c similarity index 100% rename from src/circuit/inpgval.c rename to src/spicelib/devices/parser/inpgval.c diff --git a/src/circuit/inpkmods.c b/src/spicelib/devices/parser/inpkmods.c similarity index 100% rename from src/circuit/inpkmods.c rename to src/spicelib/devices/parser/inpkmods.c diff --git a/src/circuit/inplist.c b/src/spicelib/devices/parser/inplist.c similarity index 100% rename from src/circuit/inplist.c rename to src/spicelib/devices/parser/inplist.c diff --git a/src/circuit/inplkmod.c b/src/spicelib/devices/parser/inplkmod.c similarity index 100% rename from src/circuit/inplkmod.c rename to src/spicelib/devices/parser/inplkmod.c diff --git a/src/circuit/inpmkmod.c b/src/spicelib/devices/parser/inpmkmod.c similarity index 100% rename from src/circuit/inpmkmod.c rename to src/spicelib/devices/parser/inpmkmod.c diff --git a/src/circuit/inpmktmp.c b/src/spicelib/devices/parser/inpmktmp.c similarity index 100% rename from src/circuit/inpmktmp.c rename to src/spicelib/devices/parser/inpmktmp.c diff --git a/src/circuit/inppas1.c b/src/spicelib/devices/parser/inppas1.c similarity index 100% rename from src/circuit/inppas1.c rename to src/spicelib/devices/parser/inppas1.c diff --git a/src/circuit/inppas1.h b/src/spicelib/devices/parser/inppas1.h similarity index 100% rename from src/circuit/inppas1.h rename to src/spicelib/devices/parser/inppas1.h diff --git a/src/circuit/inppas2.c b/src/spicelib/devices/parser/inppas2.c similarity index 100% rename from src/circuit/inppas2.c rename to src/spicelib/devices/parser/inppas2.c diff --git a/src/circuit/inppas2.h b/src/spicelib/devices/parser/inppas2.h similarity index 100% rename from src/circuit/inppas2.h rename to src/spicelib/devices/parser/inppas2.h diff --git a/src/circuit/inppname.c b/src/spicelib/devices/parser/inppname.c similarity index 100% rename from src/circuit/inppname.c rename to src/spicelib/devices/parser/inppname.c diff --git a/src/circuit/inpptree.c b/src/spicelib/devices/parser/inpptree.c similarity index 100% rename from src/circuit/inpptree.c rename to src/spicelib/devices/parser/inpptree.c diff --git a/src/circuit/inpsymt.c b/src/spicelib/devices/parser/inpsymt.c similarity index 100% rename from src/circuit/inpsymt.c rename to src/spicelib/devices/parser/inpsymt.c diff --git a/src/circuit/inptyplk.c b/src/spicelib/devices/parser/inptyplk.c similarity index 100% rename from src/circuit/inptyplk.c rename to src/spicelib/devices/parser/inptyplk.c diff --git a/src/circuit/ptfuncs.c b/src/spicelib/devices/parser/ptfuncs.c similarity index 100% rename from src/circuit/ptfuncs.c rename to src/spicelib/devices/parser/ptfuncs.c diff --git a/src/circuit/sperror.c b/src/spicelib/devices/parser/sperror.c similarity index 100% rename from src/circuit/sperror.c rename to src/spicelib/devices/parser/sperror.c