From a9b942e913cedceafd6c2d260867f693d278400f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 11 Jun 2011 16:08:38 -0400
Subject: [PATCH] Expressions

- Corrected interpretation of integers outside the location of a
  sequence as a word.
- Corrected interpretation of uuids outside the location of a
  sequence as a word.
---
 src/Arguments.cpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/Arguments.cpp b/src/Arguments.cpp
index f19acaa48..b8ed1ea9f 100644
--- a/src/Arguments.cpp
+++ b/src/Arguments.cpp
@@ -244,19 +244,31 @@ void Arguments::categorize ()
       }
 
       // <id>[-<id>][,...]
-      else if (!found_something_after_sequence &&
-               is_id (arg->first))
+      else if (is_id (arg->first))
       {
-        found_sequence = true;
-        arg->second = "id";
+        if (!found_something_after_sequence)
+        {
+          found_sequence = true;
+          arg->second = "id";
+        }
+        else
+        {
+          arg->second = "word";
+        }
       }
 
       // <uuid>[,...]
-      else if (!found_something_after_sequence &&
-               is_uuid (arg->first))
+      else if (is_uuid (arg->first))
       {
-        found_sequence = true;
-        arg->second = "uuid";
+        if (!found_something_after_sequence)
+        {
+          found_sequence = true;
+          arg->second = "uuid";
+        }
+        else
+        {
+          arg->second = "word";
+        }
       }
 
       // [+-]tag