From d66729adf319e0a97908563c99ab1cf3640b709c Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 16 Jul 2011 23:58:03 -0400
Subject: [PATCH] Code Cleanup

- Assorted minor edits.
- Snapshot before E9 work.
---
 src/Arguments.cpp  |  1 +
 src/DOM.cpp        | 28 +++++++++++++---------------
 src/Expression.cpp |  2 +-
 test/benchmark2.t  | 13 ++++++-------
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/Arguments.cpp b/src/Arguments.cpp
index 873ea278f..6e6fa879f 100644
--- a/src/Arguments.cpp
+++ b/src/Arguments.cpp
@@ -1059,6 +1059,7 @@ bool Arguments::is_symbol_operator (const std::string& input)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// Canonicalize attribute names.
 bool Arguments::is_attribute (const std::string& input, std::string& canonical)
 {
   // Guess at the full attribute name.
diff --git a/src/DOM.cpp b/src/DOM.cpp
index 82333586e..3b8d2820d 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -27,10 +27,12 @@
 
 #define L10N                                           // Localization complete.
 
-//#include <iostream> // TODO Remove
+#include <iostream> // TODO Remove
 #include <sstream>
 #include <Context.h>
 #include <Nibbler.h>
+#include <Date.h>
+#include <Duration.h>
 #include <text.h>
 #include <i18n.h>
 #include <DOM.h>
@@ -64,7 +66,6 @@ DOM::~DOM ()
 //   context.width
 //   context.height
 //
-//   TODO report.<name>.         <-- context.reports
 //   TODO stats.<name>           <-- context.stats
 //
 //   system.version
@@ -102,9 +103,7 @@ const std::string DOM::get (const std::string& name)
 
     else if (name == "context.args")
     {
-      std::string combined;
-      join (combined, " ", context.args.list ());
-      return /*_cache[name] =*/ combined;
+      return /*_cache[name] =*/ context.args.combine ();
     }
     else if (name == "context.width")
     {
@@ -123,7 +122,6 @@ const std::string DOM::get (const std::string& name)
       throw format (STRING_DOM_UNREC, name);
   }
 
-  // TODO report.
   // TODO stats.<name>
 
   // system. --> Implement locally.
@@ -226,8 +224,6 @@ const std::string DOM::get (const std::string& name, const Task& task)
     if (n.skip ('.'))
     {
       // TODO Obtain task 'id' from TDB2.
-//      std::cout << "# DOM::get " << name << "\n";
-
       std::string attr;
       n.getUntilEOS (attr);
 
@@ -243,8 +239,6 @@ const std::string DOM::get (const std::string& name, const Task& task)
     if (n.skip ('.'))
     {
       // TODO Obtain task 'uuid' from TDB2.
-//      std::cout << "# DOM::get name\n";
-
       std::string attr;
       n.getUntilEOS (attr);
 
@@ -255,14 +249,11 @@ const std::string DOM::get (const std::string& name, const Task& task)
   }
 
   // [<task>.] <name>
-//  std::cout << "# DOM::get " << name << "\n";
-
        if (name == "id")      return format (task.id);
   else if (name == "urgency") return format (task.urgency_c (), 4, 3);
   else                        return task.get (name);
 
   // Delegate to the context-free version of DOM::get.
-//  std::cout << "# DOM::get delegate...\n";
   return this->get (name);
 }
 
@@ -290,9 +281,15 @@ bool DOM::is_primitive (const std::string& input)
   double d;
   int i;
 
-  // TODO Date?
+  // Date?
+  if (Date::valid (input, context.config.get ("dateformat")))
+    return true;
+
+  // Duration?
+  if (Duration::valid (input))
+    return true;
+
   // TODO Quoted Date?
-  // TODO Duration?
   // TODO Quoted Duration?
 
   // String?
@@ -312,6 +309,7 @@ bool DOM::is_primitive (const std::string& input)
   if (n.getInt (i) && n.depleted ())
     return true;
 
+  std::cout << "# DOM::is_primitive '" << input << "' --> unknown\n";
   return false;
 }
 
diff --git a/src/Expression.cpp b/src/Expression.cpp
index e6b7aedff..4b6d8114b 100644
--- a/src/Expression.cpp
+++ b/src/Expression.cpp
@@ -446,7 +446,7 @@ void Expression::create_variant (
     variant = Variant (unquoteText (value));
 
   else
-    throw std::string ("Unrecognized operand '") +   + "'.";
+    throw std::string ("Unrecognized operand '") + type + "'.";
 
   variant._raw      = value;
   variant._raw_type = type;
diff --git a/test/benchmark2.t b/test/benchmark2.t
index cf83e747e..584765f45 100755
--- a/test/benchmark2.t
+++ b/test/benchmark2.t
@@ -112,16 +112,15 @@ sub report
 
   # Generate output for benchmark2 chart.
   chomp (my $version = qx{../src/task _version});
-  my $out = sprintf "%s %s %f,%f,%f,%f,%f,%f,%f",
+  my $out = sprintf "%s %s %f,%f,%f,%f,%f,%f",
                     $label,
                     $version,
                     $data{'Context::initialize'},
-                    $data{'Context::parse'},
-                    $data{'TDB::loadPending'},
-                    $data{'TDB::loadCompleted'} || 0,
-                    $data{'TDB::gc'},
-                    $data{'TDB::commit'},
-                    $data{'View::render'};
+                    $data{'TDB2::loadPending'},
+                    $data{'TDB2::loadCompleted'} || 0,
+                    $data{'TDB2::gc'},
+                    $data{'TDB2::commit'},
+                    $data{'ViewTask::render'};
 
   diag ($out);
 }