[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-123-gd5d1a98)
The branch, master has been updated
via d5d1a98f0e95589c33bff881198cca01a1b08c7e (commit)
via 00d62470ba44f61364ff4d6572ce1a31d051b22c (commit)
via cb7a91bc125926f13c23fdfe67fc26e992015a95 (commit)
from b6bc950edee6e2e3baa7906f75ebb29c08dac2c8 (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 +-----
gnetlist/scheme/gnet-vams.scm | 38 ++++++++++++++-----
gnetlist/tests/common/inputs/TwoStageAmp.sch | 2 +-
.../common/outputs/spice-sdb/cascade-output.net | 4 +-
.../outputs/spice-sdb/stack-torture-output.net | 2 +-
symbols/analog/jj-1.sym | 4 +-
symbols/micro/M41T00-SO8-1.sym | 2 +-
symbols/misc/ADG601-1.sym | 2 +-
symbols/misc/ADG602-1.sym | 2 +-
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 +-
21 files changed, 55 insertions(+), 45 deletions(-)
=================
Commit Messages
=================
commit d5d1a98f0e95589c33bff881198cca01a1b08c7e
Author: Clif Cox <clif@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Updated the problematic name attributes in some symbols
In some gnetlist backends the name=? attributes cause problems because
they look like valid attribute values. eg file=? may be mistaken for a
valid filepath, and value=? for an actual value. Changing them to
name=unknown is one way to solve this problem in the interim. It's now
safe to remove the special checks for these "?" like the one in
spice-sdb. This patch updates these problematic name=? attributes in
some symbols to name=unknown, and removes FIXME code snipit that
checked for the ? value in spice-sdb.
It also updates gnetlist tests to reflect these changes. Turns out
that the test input file TwoStageAmp.sch had a ? in it, which of couse
caused problems. Then when it was removed vams's output changed so it
had to be fixed, which wasn't a very clever fix but seems to work.
Closes-bug: lp-698741
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
:100644 100644 6d0453a... d6b93d9... M gnetlist/scheme/gnet-spice-sdb.scm
:100644 100644 04c3910... 1ab6d2b... M gnetlist/scheme/gnet-vams.scm
:100644 100644 473a990... 347d348... M gnetlist/tests/common/inputs/TwoStageAmp.sch
:100644 100644 5064ee0... ef9b7ff... M symbols/analog/jj-1.sym
:100644 100644 c18b175... d9df5fe... M symbols/misc/interpage_bidir-1.sym
:100644 100644 51bfdba... afcdd10... M symbols/misc/interpage_from-1.sym
:100644 100644 3d1e00b... 2f0c2ba... M symbols/misc/interpage_to-1.sym
:100644 100644 a64d7c0... 4f936b7... M symbols/spice/gnucap-directive-1.sym
:100644 100644 b679302... 3162318... M symbols/spice/gnucap-include-1.sym
:100644 100644 3e9421e... 07643ed... M symbols/spice/gnucap-model-1.sym
:100644 100644 bf4a144... b9bfa61... M symbols/spice/gnucap-options-1.sym
:100644 100644 b633a02... ad4202c... M symbols/spice/spice-directive-1.sym
:100644 100644 f803583... 100a068... M symbols/spice/spice-include-1.sym
:100644 100644 40a1201... 9622825... M symbols/spice/spice-model-1.sym
:100644 100644 bb711f9... 6398b7e... M symbols/spice/spice-options-1.sym
:100644 100644 66c7f6e... 7759f45... M symbols/spice/spice-subcircuit-LL-1.sym
commit 00d62470ba44f61364ff4d6572ce1a31d051b22c
Author: Clif Cox <clif@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
symbols: Misc attribute encoding errors.
Affects-bug: lp-698741
:100644 100644 75c0b05... b02ffbf... M symbols/micro/M41T00-SO8-1.sym
:100644 100644 105740f... f7abfb2... M symbols/misc/ADG601-1.sym
:100644 100644 16e7ecc... 751f37c... M symbols/misc/ADG602-1.sym
commit cb7a91bc125926f13c23fdfe67fc26e992015a95
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Update golden files.
:100644 100644 56db97e... 7f232fb... M gnetlist/tests/common/outputs/spice-sdb/cascade-output.net
:100644 100644 994fb63... 9dac04e... M gnetlist/tests/common/outputs/spice-sdb/stack-torture-output.net
=========
Changes
=========
commit d5d1a98f0e95589c33bff881198cca01a1b08c7e
Author: Clif Cox <clif@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Updated the problematic name attributes in some symbols
In some gnetlist backends the name=? attributes cause problems because
they look like valid attribute values. eg file=? may be mistaken for a
valid filepath, and value=? for an actual value. Changing them to
name=unknown is one way to solve this problem in the interim. It's now
safe to remove the special checks for these "?" like the one in
spice-sdb. This patch updates these problematic name=? attributes in
some symbols to name=unknown, and removes FIXME code snipit that
checked for the ? value in spice-sdb.
It also updates gnetlist tests to reflect these changes. Turns out
that the test input file TwoStageAmp.sch had a ? in it, which of couse
caused problems. Then when it was removed vams's output changed so it
had to be fixed, which wasn't a very clever fix but seems to work.
Closes-bug: lp-698741
Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>
diff --git a/gnetlist/scheme/gnet-spice-sdb.scm b/gnetlist/scheme/gnet-spice-sdb.scm
index 6d0453a..d6b93d9 100644
--- a/gnetlist/scheme/gnet-spice-sdb.scm
+++ b/gnetlist/scheme/gnet-spice-sdb.scm
@@ -95,6 +95,8 @@
;; a range utility function. CC
;; 1.13.2011 -- Add four lines of code (and some comments) that allow formaitting strings
;; to be used for netlisting NGspice device models. CC
+;; 6.12.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
;;
;;**********************************************************************************
;;
@@ -1654,16 +1656,6 @@
(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/gnetlist/scheme/gnet-vams.scm b/gnetlist/scheme/gnet-vams.scm
index 04c3910..1ab6d2b 100644
--- a/gnetlist/scheme/gnet-vams.scm
+++ b/gnetlist/scheme/gnet-vams.scm
@@ -777,17 +777,35 @@
(define vams:write-component-attributes
(lambda (port uref generic-list)
(if (not (null? generic-list))
- (let ((attrib (car generic-list)))
+ (let ((attrib (car generic-list))
+ (value (gnetlist:get-package-attribute uref (car generic-list))))
(begin
- (display "\t\t\t" port)
- (display attrib port)
- (display " => " port)
- (display (gnetlist:get-package-attribute uref attrib) port)
- (if (not (null? (cdr generic-list)))
- (begin
- (display ", " port)
- (newline port)
- (vams:write-component-attributes port uref (cdr generic-list)))))))))
+
+ (if (string=? value "unknown")
+ (vams:write-component-attributes port uref (cdr generic-list))
+ (begin
+ (display "\t\t\t" port)
+ (display attrib port)
+ (display " => " port)
+ (display value port)
+ (vams:write-component-attributes-helper port uref (cdr generic-list)))))))))
+
+(define vams:write-component-attributes-helper
+ (lambda (port uref generic-list)
+ (if (not (null? generic-list))
+ (let ((attrib (car generic-list))
+ (value (gnetlist:get-package-attribute uref (car generic-list))))
+ (begin
+
+ (if (not (string=? value "unknown"))
+ (begin
+ (display ", " port)
+ (newline port)
+ (display "\t\t\t" port)
+ (display attrib port)
+ (display " => " port)
+ (display value port)
+ (vams:write-component-attributes-helper port uref (cdr generic-list)))))))))
;;; ARCHITECTURE GENERATING PART
diff --git a/gnetlist/tests/common/inputs/TwoStageAmp.sch b/gnetlist/tests/common/inputs/TwoStageAmp.sch
index 473a990..347d348 100644
--- a/gnetlist/tests/common/inputs/TwoStageAmp.sch
+++ b/gnetlist/tests/common/inputs/TwoStageAmp.sch
@@ -166,7 +166,7 @@ value=.options TEMP=25
T 26600 54000 5 10 0 1 0 0 1
device=directive
T 26600 53800 5 10 1 1 0 0 1
-file=?
+file=unknown
}
N 27000 49700 28100 49700 4
{
diff --git a/symbols/analog/jj-1.sym b/symbols/analog/jj-1.sym
index 5064ee0..ef9b7ff 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=?
+model-name=unknown
T 400 100 8 10 1 0 0 0 1
-area=?
+area=unknown
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 c18b175..d9df5fe 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=?
+pages=unknown
diff --git a/symbols/misc/interpage_from-1.sym b/symbols/misc/interpage_from-1.sym
index 51bfdba..afcdd10 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=?
+pages=unknown
diff --git a/symbols/misc/interpage_to-1.sym b/symbols/misc/interpage_to-1.sym
index 3d1e00b..2f0c2ba 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=?
+pages=unknown
diff --git a/symbols/spice/gnucap-directive-1.sym b/symbols/spice/gnucap-directive-1.sym
index a64d7c0..4f936b7 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=?
+file=unknown
T 100 0 8 10 1 1 0 0 1
-value=?
+value=unknown
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 b679302..3162318 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=?
+file=unknown
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 3e9421e..07643ed 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=?
+model-name=unknown
T 500 0 8 10 1 1 0 0 1
-file=?
+file=unknown
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 bf4a144..b9bfa61 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=?
+value=unknown
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 b633a02..ad4202c 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=?
+file=unknown
T 100 100 8 10 1 1 0 0 1
-value=?
+value=unknown
diff --git a/symbols/spice/spice-include-1.sym b/symbols/spice/spice-include-1.sym
index f803583..100a068 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=?
+file=unknown
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 40a1201..9622825 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=?
+model-name=unknown
T 500 100 8 10 1 1 0 0 1
-file=?
+file=unknown
diff --git a/symbols/spice/spice-options-1.sym b/symbols/spice/spice-options-1.sym
index bb711f9..6398b7e 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=?
+value=unknown
diff --git a/symbols/spice/spice-subcircuit-LL-1.sym b/symbols/spice/spice-subcircuit-LL-1.sym
index 66c7f6e..7759f45 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=?
+model-name=unknown
commit 00d62470ba44f61364ff4d6572ce1a31d051b22c
Author: Clif Cox <clif@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
symbols: Misc attribute encoding errors.
Affects-bug: lp-698741
diff --git a/symbols/micro/M41T00-SO8-1.sym b/symbols/micro/M41T00-SO8-1.sym
index 75c0b05..b02ffbf 100644
--- a/symbols/micro/M41T00-SO8-1.sym
+++ b/symbols/micro/M41T00-SO8-1.sym
@@ -75,7 +75,7 @@ footprint=SO8
T 300 2950 5 10 0 0 0 0 1
description=Serial RTC (Real Time Clock)
T 300 2720 5 10 0 0 0 0 1
-author=Bjørnar Ness bjornar.nessATsubdimension.com
+author=Bjørnar Ness bjornar.nessATsubdimension.com
T 310 3374 5 10 0 0 0 0 1
net=GND:4
T 310 3174 5 10 0 0 0 0 1
diff --git a/symbols/misc/ADG601-1.sym b/symbols/misc/ADG601-1.sym
index 105740f..f7abfb2 100644
--- a/symbols/misc/ADG601-1.sym
+++ b/symbols/misc/ADG601-1.sym
@@ -97,7 +97,7 @@ refdes=U?
T 300 2150 5 10 0 0 0 0 1
footprint=MSOP8
T 300 2350 5 10 0 0 0 0 1
-description= 2.2 CMOS ± 5 V/5V, SPST Switch
+description= 2.2 CMOS ± 5 V/5V, SPST Switch
T 300 2550 5 10 0 0 0 0 1
net=Vcc:4
T 300 2750 5 10 0 0 0 0 1
diff --git a/symbols/misc/ADG602-1.sym b/symbols/misc/ADG602-1.sym
index 16e7ecc..751f37c 100644
--- a/symbols/misc/ADG602-1.sym
+++ b/symbols/misc/ADG602-1.sym
@@ -97,7 +97,7 @@ refdes=U?
T 300 2650 5 10 0 0 0 0 1
footprint=MSOP8
T 300 2850 5 10 0 0 0 0 1
-description= 2.2 CMOS ± 5 V/5V, SPST Switch
+description= 2.2 CMOS ± 5 V/5V, SPST Switch
T 300 3050 5 10 0 0 0 0 1
net=Vcc:4
T 300 3250 5 10 0 0 0 0 1
commit cb7a91bc125926f13c23fdfe67fc26e992015a95
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Update golden files.
diff --git a/gnetlist/tests/common/outputs/spice-sdb/cascade-output.net b/gnetlist/tests/common/outputs/spice-sdb/cascade-output.net
index 56db97e..7f232fb 100644
--- a/gnetlist/tests/common/outputs/spice-sdb/cascade-output.net
+++ b/gnetlist/tests/common/outputs/spice-sdb/cascade-output.net
@@ -6,12 +6,12 @@
* Documentation at http://www.brorson.com/gEDA/SPICE/ *
*********************************************************
*============== Begin SPICE netlist of main design ============
-AMP2 6 unconnected_pin-1 <No valid value attribute found>
+AMP2 6 unconnected_pin-1 unknown
T1 5 6 <No valid value attribute found>
MX1 4 5 unknown
FL1 3 4 <No valid value attribute found>
DEF1 2 3 unknown
-AMP1 1 2 <No valid value attribute found>
+AMP1 1 2 unknown
SOURCE 1 <No valid value attribute found>
DEFAULTS unknown
.end
diff --git a/gnetlist/tests/common/outputs/spice-sdb/stack-torture-output.net b/gnetlist/tests/common/outputs/spice-sdb/stack-torture-output.net
index 994fb63..9dac04e 100644
--- a/gnetlist/tests/common/outputs/spice-sdb/stack-torture-output.net
+++ b/gnetlist/tests/common/outputs/spice-sdb/stack-torture-output.net
@@ -6,5 +6,5 @@
* Documentation at http://www.brorson.com/gEDA/SPICE/ *
*********************************************************
*============== Begin SPICE netlist of main design ============
-C? 1024 1025
+C? 1024 1025
.end
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs