From 4f98c8d9b56929c033dc0a7c1122bbb3f8d56560 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 12 May 2012 12:43:54 -0400
Subject: [PATCH] Code Cleanup

- Upgraded the magic number 10 to a constant with dynamic debug warning.
---
 src/A3.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/A3.cpp b/src/A3.cpp
index 15a7689c4..a1bfab382 100644
--- a/src/A3.cpp
+++ b/src/A3.cpp
@@ -114,6 +114,9 @@ static struct
 
 //static const char* non_word_chars = " +-*/%()=<>!~";
 
+// Alias expansion limit.  Any more would indicate some kind of error.
+const int safetyValveDefault = 10;
+
 ////////////////////////////////////////////////////////////////////////////////
 A3::A3 ()
 : _read_only_command (true)
@@ -374,7 +377,7 @@ void A3::resolve_aliases ()
 {
   std::vector <std::string> expanded;
   bool something;
-  int safety_valve = 10;
+  int safety_valve = safetyValveDefault;
 
   do
   {
@@ -423,7 +426,7 @@ void A3::resolve_aliases ()
   while (something && --safety_valve > 0);
 
   if (safety_valve <= 0)
-    context.debug ("Nested alias limit of 10 reached.");
+    context.debug (format ("Nested alias limit of {1} reached.", safetyValveDefault));
 }
 
 ////////////////////////////////////////////////////////////////////////////////