From a3062aaed0bb42f1bbbc7cf6d1a2cf14c277a712 Mon Sep 17 00:00:00 2001
From: Gary King <gwking@metabang.com>
Date: Tue, 10 Jun 2008 08:58:13 -0400
Subject: [PATCH] Remove uses of anaphora
darcs-hash:20080610125813-3cc5d-f087f1dcc63185433dbb41cebcab69fd740a709a.gz
---
dev/graph-container.lisp | 7 +++----
dev/graph.lisp | 37 +++++++++++++++++-------------------
dev/graphviz/graphviz-support.lisp | 4 ++--
3 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/dev/graph-container.lisp b/dev/graph-container.lisp
index 345ee48..7c9bf2f 100644
--- a/dev/graph-container.lisp
+++ b/dev/graph-container.lisp
@@ -211,10 +211,9 @@ DISCUSSION
&key error-if-not-found?)
(bind ((v1 (find-vertex graph value-1 error-if-not-found?))
(v2 (find-vertex graph value-2 error-if-not-found?)))
- (aif (and v1 v2 (find-edge-between-vertexes-if graph v1 v2 fn))
- it
- (when error-if-not-found?
- (error 'graph-edge-not-found-error :vertex-1 v1 :vertex-2 v2)))))
+ (or (and v1 v2 (find-edge-between-vertexes-if graph v1 v2 fn))
+ (when error-if-not-found?
+ (error 'graph-edge-not-found-error :vertex-1 v1 :vertex-2 v2)))))
;;; ---------------------------------------------------------------------------
diff --git a/dev/graph.lisp b/dev/graph.lisp
index 3af3c47..20197f5 100644
--- a/dev/graph.lisp
+++ b/dev/graph.lisp
@@ -456,14 +456,14 @@ something is putting something on the vertexes plist's
;;; ---------------------------------------------------------------------------
-(defmethod find-edge-between-vertexes ((graph basic-graph) (value-1 t) (value-2 t)
- &key (error-if-not-found? t))
- (let ((v1 (find-vertex graph value-1 error-if-not-found?))
- (v2 (find-vertex graph value-2 error-if-not-found?)))
- (aif (and v1 v2 (find-edge-between-vertexes graph v1 v2))
- it
- (when error-if-not-found?
- (error 'graph-edge-not-found-error :vertex-1 v1 :vertex-2 v2)))))
+(defmethod find-edge-between-vertexes
+ ((graph basic-graph) (value-1 t) (value-2 t)
+ &key (error-if-not-found? t))
+ (let* ((v1 (find-vertex graph value-1 error-if-not-found?))
+ (v2 (find-vertex graph value-2 error-if-not-found?)))
+ (or (and v1 v2 (find-edge-between-vertexes graph v1 v2)))
+ (when error-if-not-found?
+ (error 'graph-edge-not-found-error :vertex-1 v1 :vertex-2 v2))))
;;; ---------------------------------------------------------------------------
@@ -617,10 +617,9 @@ something is putting something on the vertexes plist's
(defmethod find-vertex ((graph basic-graph) (value t)
&optional (error-if-not-found? t))
- (aif (find-item (graph-vertexes graph) (funcall (vertex-key graph) value))
- it
- (when error-if-not-found?
- (error 'graph-vertex-not-found-error :vertex value :graph graph))))
+ (or (find-item (graph-vertexes graph) (funcall (vertex-key graph) value))
+ (when error-if-not-found?
+ (error 'graph-vertex-not-found-error :vertex value :graph graph))))
(defmethod find-vertex ((graph basic-graph) (vertex basic-vertex)
&optional (error-if-not-found? t))
@@ -646,18 +645,16 @@ something is putting something on the vertexes plist's
(defmethod search-for-vertex ((graph basic-graph) (vertex basic-vertex)
&key (key (vertex-key graph)) (test 'equal)
(error-if-not-found? t))
- (aif (search-for-node (graph-vertexes graph) vertex :test test :key key)
- it
- (when error-if-not-found?
- (error "~A not found in ~A" vertex graph))))
+ (or (search-for-node (graph-vertexes graph) vertex :test test :key key)
+ (when error-if-not-found?
+ (error "~A not found in ~A" vertex graph))))
(defmethod search-for-vertex ((graph basic-graph) (vertex t)
&key (key (vertex-key graph)) (test 'equal)
(error-if-not-found? t))
- (aif (search-for-element (graph-vertexes graph) vertex :test test :key key)
- it
- (when error-if-not-found?
- (error "~A not found in ~A" vertex graph))))
+ (or (search-for-element (graph-vertexes graph) vertex :test test :key key)
+ (when error-if-not-found?
+ (error "~A not found in ~A" vertex graph))))
(defmethod iterate-elements ((graph basic-graph) fn)
(iterate-elements (graph-vertexes graph)
diff --git a/dev/graphviz/graphviz-support.lisp b/dev/graphviz/graphviz-support.lisp
index f9fa261..eda1187 100644
--- a/dev/graphviz/graphviz-support.lisp
+++ b/dev/graphviz/graphviz-support.lisp
@@ -357,8 +357,8 @@ B--D []
(eval-always (export ',actual-name))
(defmethod ,actual-name ((thing ,type))
"Return the attribute in pixels assuming 72 dpi"
- (awhen (dot-attribute-value ,attr thing)
- (* 72 it)))
+ (when (dot-attribute-value ,attr thing)
+ (* 72 (dot-attribute-value ,attr thing))))
(defmethod (setf ,actual-name) (value (thing ,type))
"Set the attribute in pixels assuming 72 dpi"
(setf (dot-attribute-value ,attr thing)
--
1.7.10.4