[Pkg-electronics-commits] [gnucap] 31/47: subckt-1: d_subckt.cc back to lib. lang_* muntzing

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository gnucap.

commit ded6c1b9635440a62ac9bda616cef2f3b44aab44
Author: al davis <ad211 at freeelectron.net>
Date:   Mon Sep 19 16:58:48 2016 -0400

    subckt-1: d_subckt.cc back to lib.  lang_* muntzing
---
 apps/Make.depend          | 9 ---------
 apps/Make1                | 2 +-
 apps/lang_spectre.cc      | 4 +---
 apps/lang_spice.cc        | 4 +---
 apps/lang_verilog.cc      | 4 +---
 include/patchlev.h        | 2 +-
 lib/Make1                 | 2 +-
 {apps => lib}/d_subckt.cc | 0
 8 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/apps/Make.depend b/apps/Make.depend
index 389ecc2..5580ca4 100644
--- a/apps/Make.depend
+++ b/apps/Make.depend
@@ -244,15 +244,6 @@ d_res.o: d_res.cc ../include/globals.h ../include/l_dispatcher.h \
  ../include/u_time_pair.h ../include/u_parameter.h \
  ../include/m_expression.h ../include/m_base.h ../include/e_cardlist.h \
  ../include/e_card.h
-d_subckt.o: d_subckt.cc ../include/e_node.h ../include/u_sim_data.h \
- ../include/constant.h ../include/md.h ../include/io_trace.h \
- ../include/io_error.h ../include/l_compar.h ../include/u_opt.h \
- ../include/mode.h ../include/io_.h ../include/l_lib.h \
- ../include/m_matrix.h ../include/l_stlextra.h ../include/e_base.h \
- ../include/globals.h ../include/l_dispatcher.h ../include/ap.h \
- ../include/e_paramlist.h ../include/e_compon.h ../include/u_time_pair.h \
- ../include/u_parameter.h ../include/m_expression.h ../include/m_base.h \
- ../include/e_cardlist.h ../include/e_card.h ../include/e_subckt.h
 d_switch.o: d_switch.cc ../include/globals.h ../include/l_dispatcher.h \
  ../include/e_base.h ../include/md.h ../include/io_trace.h \
  ../include/io_error.h ../include/l_stlextra.h ../include/u_opt.h \
diff --git a/apps/Make1 b/apps/Make1
index 24adf00..9fb2456 100644
--- a/apps/Make1
+++ b/apps/Make1
@@ -38,7 +38,7 @@ d_bjt.model d_diode.model
 # device models hand coded in C++
 D_SRCS = \
 d_admit.cc d_cap.cc d_cccs.cc d_ccvs.cc d_coil.cc \
-d_cs.cc d_poly_g.cc d_poly_cap.cc d_res.cc d_subckt.cc d_switch.cc \
+d_cs.cc d_poly_g.cc d_poly_cap.cc d_res.cc d_switch.cc \
 d_trln.cc d_vcg.cc d_vcr.cc d_vcvs.cc d_vs.cc \
 d_meter.cc
 
diff --git a/apps/lang_spectre.cc b/apps/lang_spectre.cc
index 1c83803..b049f59 100644
--- a/apps/lang_spectre.cc
+++ b/apps/lang_spectre.cc
@@ -410,9 +410,7 @@ DISPATCHER<CMD>::INSTALL d1(&command_dispatcher, "model", &p1);
 class CMD_SUBCKT : public CMD {
   void do_it(CS& cmd, CARD_LIST* Scope)
   {
-    const CARD* s = device_dispatcher["subckt"];
-    assert(s); // for now
-    BASE_SUBCKT* new_module = dynamic_cast<BASE_SUBCKT*>(s->clone());
+    BASE_SUBCKT* new_module = dynamic_cast<BASE_SUBCKT*>(device_dispatcher.clone("subckt"));
     assert(new_module);
     assert(!new_module->owner());
     assert(new_module->subckt());
diff --git a/apps/lang_spice.cc b/apps/lang_spice.cc
index 9788f01..b4dba2b 100644
--- a/apps/lang_spice.cc
+++ b/apps/lang_spice.cc
@@ -861,9 +861,7 @@ DISPATCHER<CMD>::INSTALL d1(&command_dispatcher, ".model", &p1);
 class CMD_SUBCKT : public CMD {
   void do_it(CS& cmd, CARD_LIST* Scope)
   {
-    const CARD* s = device_dispatcher["subckt"];
-    assert(s); // for now
-    BASE_SUBCKT* new_module = dynamic_cast<BASE_SUBCKT*>(s->clone());
+    BASE_SUBCKT* new_module = dynamic_cast<BASE_SUBCKT*>(device_dispatcher.clone("subckt"));
     assert(new_module);
     assert(!new_module->owner());
     assert(new_module->subckt());
diff --git a/apps/lang_verilog.cc b/apps/lang_verilog.cc
index eec1d71..99b9547 100644
--- a/apps/lang_verilog.cc
+++ b/apps/lang_verilog.cc
@@ -490,9 +490,7 @@ DISPATCHER<CMD>::INSTALL d1(&command_dispatcher, "paramset", &p1);
 class CMD_MODULE : public CMD {
   void do_it(CS& cmd, CARD_LIST* Scope)
   {
-    CARD const* sckt = device_dispatcher["subckt"];
-    assert(sckt);
-    BASE_SUBCKT* new_module = dynamic_cast<BASE_SUBCKT*>(sckt->clone());
+    BASE_SUBCKT* new_module = dynamic_cast<BASE_SUBCKT*>(device_dispatcher.clone("subckt"));
     assert(new_module);
     assert(!new_module->owner());
     assert(new_module->subckt());
diff --git a/include/patchlev.h b/include/patchlev.h
index f9cfc5d..1e66f6f 100644
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@ -1 +1 @@
-#define PATCHLEVEL "subckt-1 2016.09.17"
+#define PATCHLEVEL "subckt-1 2016.09.19"
diff --git a/lib/Make1 b/lib/Make1
index e0f7347..f436434 100644
--- a/lib/Make1
+++ b/lib/Make1
@@ -36,7 +36,7 @@ l_ftos.cc l_pmatch.cc l_timer.cc l_trim.cc l_wmatch.cc \
 io.cc io_contr.cc io_error.cc io_findf.cc io_out.cc io_xopen.cc \
 u_lang.cc u_nodemap.cc u_opt1.cc u_opt2.cc \
 u_parameter.cc u_prblst.cc u_probe.cc u_sim_data.cc u_xprobe.cc \
-d_logic.cc d_logicmod.cc \
+d_subckt.cc d_logic.cc d_logicmod.cc \
 e_base.cc e_card.cc e_node.cc e_model.cc e_compon.cc \
 e_elemnt.cc e_ccsrc.cc e_storag.cc e_paramlist.cc e_cardlist.cc \
 bm_cond.cc bm_value.cc bm.cc \
diff --git a/apps/d_subckt.cc b/lib/d_subckt.cc
similarity index 100%
rename from apps/d_subckt.cc
rename to lib/d_subckt.cc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git