From b7089bcc123e52bbadd6e635c823d937e620b75b Mon Sep 17 00:00:00 2001 From: Ales Hvezda Date: Sat, 9 Jun 2007 18:29:22 +0000 Subject: [PATCH] Commited new version of gnet-calay from John with various fixes. --- gnetlist/ChangeLog | 5 +++++ gnetlist/scheme/gnet-calay.scm | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gnetlist/ChangeLog b/gnetlist/ChangeLog index ef1051b37..27413bb43 100644 --- a/gnetlist/ChangeLog +++ b/gnetlist/ChangeLog @@ -1,3 +1,8 @@ +2007-06-09 Ales Hvezda + + * scheme/scheme/gnet-calay.scm: Commited new version of gnet-calay + from John with various fixes. + 2007-06-09 Carlos Nieves Onega * utils/mk_verilog_syms.c: Avoid writting '\r' to files on MinGW. diff --git a/gnetlist/scheme/gnet-calay.scm b/gnetlist/scheme/gnet-calay.scm index 13a87bbb1..7bb4ac9d9 100644 --- a/gnetlist/scheme/gnet-calay.scm +++ b/gnetlist/scheme/gnet-calay.scm @@ -3,7 +3,7 @@ ;;; gEDA - GNU Electronic Design Automation ;;; gnetlist - GNU Netlist ;;; Copyright (C) 1998-2000 Ales V. Hvezda -;;; Copyright (C) 2006 John P. Doty +;;; Copyright (C) 2006,2007 John P. Doty ;;; ;;; This program is free software; you can redistribute it and/or modify ;;; it under the terms of the GNU General Public License as published by @@ -20,6 +20,7 @@ ;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;; Calay format (modified from Ales's gnet-PCB.scm by jpd) +;; Netname translation cleaned up at Dan McMahill'suggestion -jpd (define (calay:display-connections nets) (let ((k "")) @@ -59,7 +60,7 @@ (if (not (null? netnames)) (let ((netname (car netnames))) (display "/" port) - (display (calay:translate netname) port) + (display (gnetlist:alias-net netname) port) (display "\t" port) (display (calay:wrap (calay:display-connections (gnetlist:get-all-connections netname)) 66) port) @@ -68,6 +69,7 @@ (define (calay output-filename) (let ((port (open-output-file output-filename))) + (gnetlist:build-net-aliases calay:translate all-unique-nets) (calay:write-net (gnetlist:get-all-unique-nets "dummy") port) (close-output-port port))) -- 2.11.4.GIT