[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-4-g23383c5)
The branch, master has been updated
via 23383c5d04f17d5fd7491f2c631bfc1e3f15e96f (commit)
from 5b1ee0d69f2fad7400f34543c482d51a55ce08c3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gnetlist/scheme/gnet-spice-sdb.scm | 12 ++++++++++--
symbols/analog/jj-1.sym | 4 ++--
symbols/misc/interpage_bidir-1.sym | 2 +-
symbols/misc/interpage_from-1.sym | 2 +-
symbols/misc/interpage_to-1.sym | 2 +-
symbols/spice/gnucap-directive-1.sym | 4 ++--
symbols/spice/gnucap-include-1.sym | 2 +-
symbols/spice/gnucap-model-1.sym | 4 ++--
symbols/spice/gnucap-options-1.sym | 2 +-
symbols/spice/spice-directive-1.sym | 4 ++--
symbols/spice/spice-include-1.sym | 2 +-
symbols/spice/spice-model-1.sym | 4 ++--
symbols/spice/spice-options-1.sym | 2 +-
symbols/spice/spice-subcircuit-LL-1.sym | 2 +-
14 files changed, 28 insertions(+), 20 deletions(-)
=================
Commit Messages
=================
commit 23383c5d04f17d5fd7491f2c631bfc1e3f15e96f
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Revert "Updated the problematic name attribute in some symbols"
This reverts commit 5b1ee0d69f2fad7400f34543c482d51a55ce08c3.
This commit broke the gnetlist testsuite, and another approach will
need to be found.
:100644 100644 4d491d4... b355dd6... M gnetlist/scheme/gnet-spice-sdb.scm
:100644 100644 ef9b7ff... 5064ee0... M symbols/analog/jj-1.sym
:100644 100644 d9df5fe... c18b175... M symbols/misc/interpage_bidir-1.sym
:100644 100644 afcdd10... 51bfdba... M symbols/misc/interpage_from-1.sym
:100644 100644 2f0c2ba... 3d1e00b... M symbols/misc/interpage_to-1.sym
:100644 100644 4f936b7... a64d7c0... M symbols/spice/gnucap-directive-1.sym
:100644 100644 3162318... b679302... M symbols/spice/gnucap-include-1.sym
:100644 100644 07643ed... 3e9421e... M symbols/spice/gnucap-model-1.sym
:100644 100644 b9bfa61... bf4a144... M symbols/spice/gnucap-options-1.sym
:100644 100644 ad4202c... b633a02... M symbols/spice/spice-directive-1.sym
:100644 100644 100a068... f803583... M symbols/spice/spice-include-1.sym
:100644 100644 9622825... 40a1201... M symbols/spice/spice-model-1.sym
:100644 100644 6398b7e... bb711f9... M symbols/spice/spice-options-1.sym
:100644 100644 7759f45... 66c7f6e... M symbols/spice/spice-subcircuit-LL-1.sym
=========
Changes
=========
commit 23383c5d04f17d5fd7491f2c631bfc1e3f15e96f
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Revert "Updated the problematic name attribute in some symbols"
This reverts commit 5b1ee0d69f2fad7400f34543c482d51a55ce08c3.
This commit broke the gnetlist testsuite, and another approach will
need to be found.
diff --git a/gnetlist/scheme/gnet-spice-sdb.scm b/gnetlist/scheme/gnet-spice-sdb.scm
index 4d491d4..b355dd6 100644
--- a/gnetlist/scheme/gnet-spice-sdb.scm
+++ b/gnetlist/scheme/gnet-spice-sdb.scm
@@ -93,8 +93,6 @@
;; write-net-names-on-component to make it a bit more flexible.
;; Combine write-probe-item and write-net-names-on-component. Add
;; a range utility function. CC
-;; 1.3.2011 -- Updated the Problematci name=? symbols to name=unknown and removed the
-;; FIXME check for them. This should be a step closer to place holder consistancy. CC
;;
;;**********************************************************************************
;;
@@ -1644,6 +1642,16 @@
(set! value (gnetlist:get-package-attribute package "value") )
(set! model-file (gnetlist:get-package-attribute package "file") )
+ ;; Sometimes get-package-attribute returns "?" instead of "unknown".
+ ;; This is because some symbols use file=? as a place holder value to indicate that
+ ;; it needs to be filled in. It is simular other place holders like footprint=none, and refdes=R?.
+ ;; ? seems to be an ad hoc place holder for other attributes as well, like value for example.
+ ;; FIXME: Of couse there could be many other places that this problem occurs. An effort should be
+ ;; made to come up with a consistant way of representing place holders.
+
+ (if (string-ci=? model-file "?")
+ (set! model-file "unknown"))
+
;; Now run a series of checks to see if we should stick this file into the file-info-list
;; Check to see if "file" attribute is non-empty
(if (not (string-ci=? model-file "unknown"))
diff --git a/symbols/analog/jj-1.sym b/symbols/analog/jj-1.sym
index ef9b7ff..5064ee0 100644
--- a/symbols/analog/jj-1.sym
+++ b/symbols/analog/jj-1.sym
@@ -26,7 +26,7 @@ L 0 250 400 650 3 0 0 0 -1 -1
L 0 650 400 250 3 0 0 0 -1 -1
L 200 300 200 400 3 0 0 0 -1 -1
T 400 400 8 10 1 1 0 0 1
-model-name=unknown
+model-name=?
T 400 100 8 10 1 0 0 0 1
-area=unknown
+area=?
V 300 700 29 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
diff --git a/symbols/misc/interpage_bidir-1.sym b/symbols/misc/interpage_bidir-1.sym
index d9df5fe..c18b175 100644
--- a/symbols/misc/interpage_bidir-1.sym
+++ b/symbols/misc/interpage_bidir-1.sym
@@ -17,4 +17,4 @@ graphical=1
L 500 400 300 200 3 0 0 0 -1 -1
L 1100 0 1300 200 3 0 0 0 -1 -1
T 1500 200 5 10 1 1 0 0 1
-pages=unknown
+pages=?
diff --git a/symbols/misc/interpage_from-1.sym b/symbols/misc/interpage_from-1.sym
index afcdd10..51bfdba 100644
--- a/symbols/misc/interpage_from-1.sym
+++ b/symbols/misc/interpage_from-1.sym
@@ -16,4 +16,4 @@ T 300 800 5 10 0 0 0 0 1
graphical=1
L 500 400 300 200 3 0 0 0 -1 -1
T 1300 200 5 10 1 1 0 0 1
-pages=unknown
+pages=?
diff --git a/symbols/misc/interpage_to-1.sym b/symbols/misc/interpage_to-1.sym
index 2f0c2ba..3d1e00b 100644
--- a/symbols/misc/interpage_to-1.sym
+++ b/symbols/misc/interpage_to-1.sym
@@ -16,4 +16,4 @@ T 300 800 5 10 0 0 0 0 1
graphical=1
L 300 400 300 0 3 0 0 0 -1 -1
T 1300 200 5 10 1 1 0 0 1
-pages=unknown
+pages=?
diff --git a/symbols/spice/gnucap-directive-1.sym b/symbols/spice/gnucap-directive-1.sym
index 4f936b7..a64d7c0 100644
--- a/symbols/spice/gnucap-directive-1.sym
+++ b/symbols/spice/gnucap-directive-1.sym
@@ -7,8 +7,8 @@ refdes=A?
T 600 300 9 10 1 0 0 0 1
Gnucap directive
T 100 0 8 10 1 1 0 0 1
-file=unknown
+file=?
T 100 0 8 10 1 1 0 0 1
-value=unknown
+value=?
T 100 600 8 10 0 0 0 0 1
numslots=0
diff --git a/symbols/spice/gnucap-include-1.sym b/symbols/spice/gnucap-include-1.sym
index 3162318..b679302 100644
--- a/symbols/spice/gnucap-include-1.sym
+++ b/symbols/spice/gnucap-include-1.sym
@@ -7,7 +7,7 @@ refdes=A?
T 600 300 9 10 1 0 0 0 1
Gnucap include
T 500 0 8 10 1 1 0 0 1
-file=unknown
+file=?
T 100 0 9 10 1 0 0 0 1
File:
T 300 600 8 10 0 0 0 0 1
diff --git a/symbols/spice/gnucap-model-1.sym b/symbols/spice/gnucap-model-1.sym
index 07643ed..3e9421e 100644
--- a/symbols/spice/gnucap-model-1.sym
+++ b/symbols/spice/gnucap-model-1.sym
@@ -11,8 +11,8 @@ Model name:
T 100 0 9 10 1 0 0 0 1
File:
T 1300 200 8 10 1 1 0 0 1
-model-name=unknown
+model-name=?
T 500 0 8 10 1 1 0 0 1
-file=unknown
+file=?
T 100 800 8 10 0 0 0 0 1
numslots=0
diff --git a/symbols/spice/gnucap-options-1.sym b/symbols/spice/gnucap-options-1.sym
index b9bfa61..bf4a144 100644
--- a/symbols/spice/gnucap-options-1.sym
+++ b/symbols/spice/gnucap-options-1.sym
@@ -7,6 +7,6 @@ refdes=A?
T 500 300 9 10 1 0 0 0 1
Gnucap options
T 100 0 8 10 1 1 0 0 1
-value=unknown
+value=?
T 100 600 8 10 0 0 0 0 1
numslots=0
diff --git a/symbols/spice/spice-directive-1.sym b/symbols/spice/spice-directive-1.sym
index ad4202c..b633a02 100644
--- a/symbols/spice/spice-directive-1.sym
+++ b/symbols/spice/spice-directive-1.sym
@@ -7,6 +7,6 @@ refdes=A?
T 600 400 9 10 1 0 0 0 1
SPICE directive
T 100 100 8 10 1 1 0 0 1
-file=unknown
+file=?
T 100 100 8 10 1 1 0 0 1
-value=unknown
+value=?
diff --git a/symbols/spice/spice-include-1.sym b/symbols/spice/spice-include-1.sym
index 100a068..f803583 100644
--- a/symbols/spice/spice-include-1.sym
+++ b/symbols/spice/spice-include-1.sym
@@ -7,6 +7,6 @@ refdes=A?
T 600 400 9 10 1 0 0 0 1
SPICE include
T 500 100 8 10 1 1 0 0 1
-file=unknown
+file=?
T 100 100 9 10 1 0 0 0 1
File:
diff --git a/symbols/spice/spice-model-1.sym b/symbols/spice/spice-model-1.sym
index 9622825..40a1201 100644
--- a/symbols/spice/spice-model-1.sym
+++ b/symbols/spice/spice-model-1.sym
@@ -11,6 +11,6 @@ Model name:
T 100 100 9 10 1 0 0 0 1
File:
T 1300 300 8 10 1 1 0 0 1
-model-name=unknown
+model-name=?
T 500 100 8 10 1 1 0 0 1
-file=unknown
+file=?
diff --git a/symbols/spice/spice-options-1.sym b/symbols/spice/spice-options-1.sym
index 6398b7e..bb711f9 100644
--- a/symbols/spice/spice-options-1.sym
+++ b/symbols/spice/spice-options-1.sym
@@ -7,4 +7,4 @@ refdes=A?
T 500 400 9 10 1 0 0 0 1
SPICE options
T 100 100 8 10 1 1 0 0 1
-value=unknown
+value=?
diff --git a/symbols/spice/spice-subcircuit-LL-1.sym b/symbols/spice/spice-subcircuit-LL-1.sym
index 7759f45..66c7f6e 100644
--- a/symbols/spice/spice-subcircuit-LL-1.sym
+++ b/symbols/spice/spice-subcircuit-LL-1.sym
@@ -7,4 +7,4 @@ refdes=A?
T 600 400 9 10 1 0 0 0 1
SPICE .SUBCKT
T 100 100 8 10 1 1 0 0 1
-model-name=unknown
+model-name=?
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs