Debug: rc.sugar enables ID/UUID snytactic sugar

- This is not documented.  It is not for users.

src/CLI2.cpp

@@ -1313,6 +1313,10 @@ void CLI2::desugarFilterPatterns ()
 //   or a combination:     1,3,5-10 12
 //
 void CLI2::findIDs ()
+{
+  bool changes = false;
+
+  if (context.config.getBoolean ("sugar"))
   {
     bool previousFilterArgWasAnOperator = false;
     int filterCount = 0;
@@ -1328,6 +1332,7 @@ void CLI2::findIDs ()
         // Skip any number that was preceded by an operator.
           if (! previousFilterArgWasAnOperator)
           {
+            changes = true;
             std::string number = a.attribute ("raw");
             _id_ranges.push_back (std::pair <std::string, std::string> (number, number));
           }
@@ -1340,6 +1345,7 @@ void CLI2::findIDs ()
 
           for (auto& element : elements)
           {
+            changes = true;
             auto hyphen = element.find ("-");
             if (hyphen != std::string::npos)
             {
@@ -1383,6 +1389,7 @@ void CLI2::findIDs ()
               raw.find ('e') == std::string::npos &&
               raw.find ('-') == std::string::npos)
           {
+            changes = true;
             a.unTag ("MODIFICATION");
             a.tag ("FILTER");
             _id_ranges.push_back (std::pair <std::string, std::string> (raw, raw));
@@ -1398,6 +1405,7 @@ void CLI2::findIDs ()
 
             for (auto& element : elements)
             {
+              changes = true;
               auto hyphen = element.find ("-");
               if (hyphen != std::string::npos)
               {
@@ -1412,20 +1420,49 @@ void CLI2::findIDs ()
         }
       }
     }
+  }
 
-  if (_id_ranges.size ())
+  // Sugar-free.
+  else
+  {
+    std::vector <A2> reconstructed;
+    for (auto& a : _args)
+    {
+      if (a.hasTag ("FILTER") &&
+          a._lextype == Lexer::Type::number)
+      {
+        changes = true;
+        A2 pair ("id:" + a.attribute ("raw"), Lexer::Type::pair);
+        pair.tag ("FILTER");
+        pair.decompose ();
+        reconstructed.push_back (pair);
+      }
+      else
+        reconstructed.push_back (a);
+    }
+
+    if (changes)
+      _args = reconstructed;
+  }
+
+  if (changes)
     if (context.config.getInteger ("debug.parser") >= 3)
       context.debug (dump ("CLI2::prepareFilter findIDs"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void CLI2::findUUIDs ()
+{
+  bool changes = false;
+
+  if (context.config.getBoolean ("sugar"))
   {
     for (auto& a : _args)
     {
       if (a._lextype == Lexer::Type::uuid &&
           a.hasTag ("FILTER"))
       {
+        changes = true;
         _uuid_list.push_back (a.attribute ("raw"));
       }
     }
@@ -1437,14 +1474,39 @@ void CLI2::findUUIDs ()
         if (a._lextype == Lexer::Type::uuid &&
             a.hasTag ("MODIFICATION"))
         {
+          changes = true;
           a.unTag ("MODIFICATION");
           a.tag ("FILTER");
           _uuid_list.push_back (a.attribute ("raw"));
         }
       }
     }
+  }
 
-  if (_uuid_list.size ())
+  // Sugar-free.
+  else
+  {
+    std::vector <A2> reconstructed;
+    for (auto& a : _args)
+    {
+      if (a.hasTag ("FILTER") &&
+          a._lextype == Lexer::Type::uuid)
+      {
+        changes = true;
+        A2 pair ("uuid:" + a.attribute ("raw"), Lexer::Type::pair);
+        pair.tag ("FILTER");
+        pair.decompose ();
+        reconstructed.push_back (pair);
+      }
+      else
+        reconstructed.push_back (a);
+    }
+
+    if (changes)
+      _args = reconstructed;
+  }
+
+  if (changes)
     if (context.config.getInteger ("debug.parser") >= 3)
       context.debug (dump ("CLI2::prepareFilter findUUIDs"));
 }

src/CLI2.h

@@ -47,8 +47,6 @@ public:
   const std::string attribute (const std::string&) const;
   const std::string getToken () const;
   const std::string dump () const;
-
-private:
   void decompose ();
 
 public:

src/Config.cpp

@@ -342,6 +342,7 @@ std::string Config::_defaults =
   "list.all.tags=no                               # Include old tag names in 'tags' command\n"
   "print.empty.columns=no                         # Print columns which have no data for any task\n"
   "debug=no                                       # Display diagnostics\n"
+  "sugar=yes                                      # Syntactic sugar\n"
   "obfuscate=no                                   # Obfuscate data for error reporting\n"
   "fontunderline=yes                              # Uses underlines rather than -------\n"
   "shell.prompt=task>                             # Prompt used by the shell command\n"

src/commands/CmdShow.cpp

@@ -186,6 +186,7 @@ int CmdShow::execute (std::string& output)
     " rule.precedence.color"
     " search.case.sensitive"
     " shell.prompt"
+    " sugar"
     " summary.all.projects"
     " tag.indicator"
     " taskd.server"