From 1a75039cf7c9f63c37e484e05c1733ff1f149fab Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 25 May 2014 09:15:49 -0400 Subject: [PATCH] A3 - Removed obsolete ::infix method. --- src/A3.cpp | 34 ---------------------------------- src/A3.h | 1 - 2 files changed, 35 deletions(-) diff --git a/src/A3.cpp b/src/A3.cpp index 0daea2045..35cee4f6f 100644 --- a/src/A3.cpp +++ b/src/A3.cpp @@ -759,40 +759,6 @@ const A3 A3::tokenize (const A3& input) const return output; } -//////////////////////////////////////////////////////////////////////////////// -// Insert 'and' operators between adjacent non-operators. -// -// ) --> ) and -// ( --> ( -// ) ( --> ) and ( -// --> and -// -const A3 A3::infix (const A3& input) const -{ - if (input.size () == 1) - return input; - - Arg previous ("?", Arg::cat_op); - A3 modified; - std::vector ::const_iterator arg; - for (arg = input.begin (); arg != input.end (); ++arg) - { - // Old-style filters need 'and' conjunctions. - if ((previous._category != Arg::cat_op || previous._raw == ")") && - (arg->_category != Arg::cat_op || arg->_raw == "(")) - { - modified.push_back (Arg ("and", Arg::cat_op)); - } - - // Now insert the adjacent non-operator. - modified.push_back (*arg); - previous = *arg; - } - - modified.dump ("A3::infix"); - return modified; -} - //////////////////////////////////////////////////////////////////////////////// const A3 A3::expand (const A3& input) const { diff --git a/src/A3.h b/src/A3.h index 4db7a578e..156feac2d 100644 --- a/src/A3.h +++ b/src/A3.h @@ -62,7 +62,6 @@ public: const A3 extract_modifications () const; const A3 tokenize (const A3&) const; - const A3 infix (const A3&) const; const A3 expand (const A3&) const; const A3 sequence (const A3&) const; const A3 postfix (const A3&) const;