Commit 72fd03a6 by Maarten L. Hekkelman

formatting, fix in is_unquoted test

parent 61f464ae
...@@ -147,7 +147,6 @@ class condition ...@@ -147,7 +147,6 @@ class condition
} }
private: private:
void optimise(condition_impl *&impl); void optimise(condition_impl *&impl);
condition_impl *m_impl; condition_impl *m_impl;
...@@ -195,9 +194,7 @@ namespace detail ...@@ -195,9 +194,7 @@ namespace detail
bool test(row_handle r) const override bool test(row_handle r) const override
{ {
return m_single_hit.has_value() ? return m_single_hit.has_value() ? *m_single_hit == r : r[m_item_ix].compare(m_value, m_icase) == 0;
*m_single_hit == r :
r[m_item_ix].compare(m_value, m_icase) == 0;
} }
void str(std::ostream &os) const override void str(std::ostream &os) const override
...@@ -285,7 +282,7 @@ namespace detail ...@@ -285,7 +282,7 @@ namespace detail
std::string m_value; std::string m_value;
bool m_icase = false; bool m_icase = false;
std::optional<row_handle> m_single_hit; std::optional<row_handle> m_single_hit;
}; };
struct key_compare_condition_impl : public condition_impl struct key_compare_condition_impl : public condition_impl
{ {
...@@ -483,7 +480,7 @@ namespace detail ...@@ -483,7 +480,7 @@ namespace detail
{ {
if (sub->test(r)) if (sub->test(r))
continue; continue;
result = false; result = false;
break; break;
} }
...@@ -522,7 +519,7 @@ namespace detail ...@@ -522,7 +519,7 @@ namespace detail
result = s; result = s;
continue; continue;
} }
if (s == result) if (s == result)
continue; continue;
...@@ -582,7 +579,7 @@ namespace detail ...@@ -582,7 +579,7 @@ namespace detail
result = true; result = true;
break; break;
} }
return result; return result;
} }
...@@ -615,7 +612,7 @@ namespace detail ...@@ -615,7 +612,7 @@ namespace detail
result = s; result = s;
continue; continue;
} }
if (s == result) if (s == result)
continue; continue;
...@@ -688,7 +685,7 @@ inline condition operator or(condition &&a, condition &&b) ...@@ -688,7 +685,7 @@ inline condition operator or(condition &&a, condition &&b)
return condition(new detail::key_equals_or_empty_condition_impl(ci)); return condition(new detail::key_equals_or_empty_condition_impl(ci));
} }
else if (typeid(*b.m_impl) == typeid(detail::key_equals_condition_impl) and else if (typeid(*b.m_impl) == typeid(detail::key_equals_condition_impl) and
typeid(*a.m_impl) == typeid(detail::key_is_empty_condition_impl)) typeid(*a.m_impl) == typeid(detail::key_is_empty_condition_impl))
{ {
auto ci = static_cast<detail::key_equals_condition_impl *>(b.m_impl); auto ci = static_cast<detail::key_equals_condition_impl *>(b.m_impl);
auto ce = static_cast<detail::key_is_empty_condition_impl *>(a.m_impl); auto ce = static_cast<detail::key_is_empty_condition_impl *>(a.m_impl);
......
...@@ -94,13 +94,17 @@ class sac_parser ...@@ -94,13 +94,17 @@ class sac_parser
static bool is_unquoted_string(std::string_view text) static bool is_unquoted_string(std::string_view text)
{ {
bool result = true; bool result = is_ordinary(text.front());
for (auto ch : text)
if (result)
{ {
if (is_non_blank(ch)) for (auto ch : text)
continue; {
result = false; if (is_non_blank(ch))
break; continue;
result = false;
break;
}
} }
static const std::regex kReservedRx(R"(loop_|stop_|global_|data_\S+|save_\S+)", std::regex_constants::icase); static const std::regex kReservedRx(R"(loop_|stop_|global_|data_\S+|save_\S+)", std::regex_constants::icase);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment