- Added an A3::is_attr type override for 'recur', which needs to be
  treated as an un-expanded 'string' type, most, but not all of the
  time.
- Documented the above in ColRecur.cpp.
- Modified Command.cpp to recognize both type 'duration' and name 'recur'.
- Removed Command::next_mod_group argument coalescing for date types,
  which was not used anyway.
- Improved the error message for unrecognized durations, which previously
  included the word 'date'.
- Modified unit tests to accomodate the above error message change.
- Added bug.972.t unit tests, which fail, because it isn't fixed yet.
- Made A3::dump const so it can be used anywhere.
This commit is contained in:
Paul Beckingham 2012-07-08 10:47:01 -04:00
parent 5fcc33f1f8
commit 4d4f286330
11 changed files with 81 additions and 25 deletions

View file

@ -27,7 +27,6 @@
#define L10N // Localization complete.
#include <iostream>
#include <sstream>
#include <algorithm>
#include <stdlib.h>
@ -1335,7 +1334,13 @@ bool A3::is_attr (Nibbler& n, Arg& arg)
// therefore not stored.
std::map<std::string, Column*>::iterator i = context.columns.find (canonical);
if (i != context.columns.end ())
arg._type = Arg::type_id (i->second->type ());
{
// Special-case: override the type, which is 'string'.
if (canonical == "recur")
arg._type = Arg::type_duration;
else
arg._type = Arg::type_id (i->second->type ());
}
else
arg._type = Arg::type_pseudo;
@ -2072,7 +2077,7 @@ bool A3::which_operator (
}
////////////////////////////////////////////////////////////////////////////////
void A3::dump (const std::string& label)
void A3::dump (const std::string& label) const
{
if (context.config.getBoolean ("debug"))
{