From 6a4a046b1a339ff9d47ee16d1164c283ab4dd513 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 16 Jun 2014 18:44:37 -0400
Subject: [PATCH] Variant

- Updated operator%= to handle trivial values.
---
 src/Variant.cpp | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/Variant.cpp b/src/Variant.cpp
index 179166143..49f61f5d7 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -1664,43 +1664,65 @@ Variant& Variant::operator%= (const Variant& other)
   case type_integer:
     switch (right._type)
     {
-    case type_unknown:  throw std::string ("Cannot modulo unknown type");
-    case type_boolean:  throw std::string ("Cannot modulo integer by Boolean");
+    case type_unknown:
+      throw std::string ("Cannot modulo unknown type");
+
+    case type_boolean:
+      throw std::string ("Cannot modulo integer by Boolean");
+
     case type_integer:
       if (right._integer == 0)
         throw std::string ("Modulo zero");
       _integer %= right._integer;
       break;
+
     case type_real:
       if (right._real == 0.0)
         throw std::string ("Modulo zero");
       cast (type_real);
       _real = fmod (_real, right._real);
       break;
-    case type_string:   throw std::string ("Cannot modulo integer by string");
-    case type_date:     throw std::string ("Cannot modulo integer by date values");
-    case type_duration: throw std::string ("Cannot modulo integer by duration values");
+
+    case type_string:
+      throw std::string ("Cannot modulo integer by string");
+
+    case type_date:
+      throw std::string ("Cannot modulo integer by date values");
+
+    case type_duration:
+      throw std::string ("Cannot modulo integer by duration values");
     }
     break;
 
   case type_real:
     switch (right._type)
     {
-    case type_unknown:  throw std::string ("Cannot modulo unknown type");
-    case type_boolean:  throw std::string ("Cannot modulo real by Boolean");
+    case type_unknown:
+      throw std::string ("Cannot modulo unknown type");
+
+    case type_boolean:
+      throw std::string ("Cannot modulo real by Boolean");
+
     case type_integer:
       if (right._integer == 0)
         throw std::string ("Modulo zero");
       _real = fmod (_real, static_cast<double>(right._integer));
       break;
+
     case type_real:
       if (right._real == 0)
         throw std::string ("Modulo zero");
       _real = fmod (_real, right._real);
       break;
-    case type_string:   throw std::string ("Cannot modulo real numbers by strings");
-    case type_date:     throw std::string ("Cannot modulo real numbers by dates");
-    case type_duration: throw std::string ("Cannot modulo real by duration values");
+
+    case type_string:
+      throw std::string ("Cannot modulo real numbers by strings");
+
+    case type_date:
+      throw std::string ("Cannot modulo real numbers by dates");
+
+    case type_duration:
+      throw std::string ("Cannot modulo real by duration values");
     }
     break;