Mark comparison operators as const (simdjson#1320)

mmatrosov · Mikhail Matrosov · web-flow · commit b442b29ccf37 · 2020-11-27T14:18:42.000-05:00
Co-authored-by: Mikhail Matrosov &lt;mikhail.matrosov@aimtech.com&gt;
diff --git a/include/simdjson/generic/ondemand/array_iterator-inl.h b/include/simdjson/generic/ondemand/array_iterator-inl.h
@@ -19,11 +19,11 @@ simdjson_really_inline simdjson_result<value> array_iterator<T>::operator*() noe
   return value::start(iter->borrow_iterator());
 }
 template<typename T>
-simdjson_really_inline bool array_iterator<T>::operator==(const array_iterator<T> &other) noexcept {
+simdjson_really_inline bool array_iterator<T>::operator==(const array_iterator<T> &other) const noexcept {
   return !(*this != other);
 }
 template<typename T>
-simdjson_really_inline bool array_iterator<T>::operator!=(const array_iterator<T> &) noexcept {
+simdjson_really_inline bool array_iterator<T>::operator!=(const array_iterator<T> &) const noexcept {
   return iter->is_iterator_alive();
 }
 template<typename T>
@@ -62,12 +62,12 @@ simdjson_really_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value>
   return *this->first;
 }
 template<typename T>
-simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>>::operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &other) noexcept {
+simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>>::operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &other) const noexcept {
   if (this->error()) { return true; }
   return this->first == other.first;
 }
 template<typename T>
-simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>>::operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &other) noexcept {
+simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>>::operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &other) const noexcept {
   if (this->error()) { return false; }
   return this->first != other.first;
 }
diff --git a/include/simdjson/generic/ondemand/array_iterator.h b/include/simdjson/generic/ondemand/array_iterator.h
@@ -41,15 +41,15 @@ class array_iterator {
    *
    * @return true if there are no more elements in the JSON array.
    */
-  simdjson_really_inline bool operator==(const array_iterator<T> &) noexcept;
+  simdjson_really_inline bool operator==(const array_iterator<T> &) const noexcept;
   /**
    * Check if there are more elements in the JSON array.
    *
    * Part of the std::iterator interface.
    *
    * @return true if there are more elements in the JSON array.
    */
-  simdjson_really_inline bool operator!=(const array_iterator<T> &) noexcept;
+  simdjson_really_inline bool operator!=(const array_iterator<T> &) const noexcept;
   /**
    * Move to the next element.
    *
@@ -91,8 +91,8 @@ struct simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> : p
   //
 
   simdjson_really_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> operator*() noexcept; // MUST ONLY BE CALLED ONCE PER ITERATION.
-  simdjson_really_inline bool operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &) noexcept;
-  simdjson_really_inline bool operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &) noexcept;
+  simdjson_really_inline bool operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &) const noexcept;
+  simdjson_really_inline bool operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &) const noexcept;
   simdjson_really_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &operator++() noexcept;
 };
 
diff --git a/include/simdjson/generic/ondemand/object_iterator-inl.h b/include/simdjson/generic/ondemand/object_iterator-inl.h
@@ -17,10 +17,10 @@ simdjson_really_inline simdjson_result<field> object_iterator::operator*() noexc
   if (result.error()) { iter->release(); }
   return result;
 }
-simdjson_really_inline bool object_iterator::operator==(const object_iterator &other) noexcept {
+simdjson_really_inline bool object_iterator::operator==(const object_iterator &other) const noexcept {
   return !(*this != other);
 }
-simdjson_really_inline bool object_iterator::operator!=(const object_iterator &) noexcept {
+simdjson_really_inline bool object_iterator::operator!=(const object_iterator &) const noexcept {
   return iter->is_alive();
 }
 simdjson_really_inline object_iterator &object_iterator::operator++() noexcept {
@@ -55,12 +55,12 @@ simdjson_really_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::field>
   return *first;
 }
 // Assumes it's being compared with the end. true if depth < iter->depth.
-simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator>::operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &other) noexcept {
+simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator>::operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &other) const noexcept {
   if (error()) { return true; }
   return first == other.first;
 }
 // Assumes it's being compared with the end. true if depth >= iter->depth.
-simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator>::operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &other) noexcept {
+simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator>::operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &other) const noexcept {
   if (error()) { return false; }
   return first != other.first;
 }
diff --git a/include/simdjson/generic/ondemand/object_iterator.h b/include/simdjson/generic/ondemand/object_iterator.h
@@ -26,9 +26,9 @@ class object_iterator {
   // MUST ONLY BE CALLED ONCE PER ITERATION.
   simdjson_really_inline simdjson_result<field> operator*() noexcept;
   // Assumes it's being compared with the end. true if depth < iter->depth.
-  simdjson_really_inline bool operator==(const object_iterator &) noexcept;
+  simdjson_really_inline bool operator==(const object_iterator &) const noexcept;
   // Assumes it's being compared with the end. true if depth >= iter->depth.
-  simdjson_really_inline bool operator!=(const object_iterator &) noexcept;
+  simdjson_really_inline bool operator!=(const object_iterator &) const noexcept;
   // Checks for ']' and ','
   simdjson_really_inline object_iterator &operator++() noexcept;
 private:
@@ -61,9 +61,9 @@ struct simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> : pub
   // Reads key and value, yielding them to the user.
   simdjson_really_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::field> operator*() noexcept; // MUST ONLY BE CALLED ONCE PER ITERATION.
   // Assumes it's being compared with the end. true if depth < iter->depth.
-  simdjson_really_inline bool operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &) noexcept;
+  simdjson_really_inline bool operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &) const noexcept;
   // Assumes it's being compared with the end. true if depth >= iter->depth.
-  simdjson_really_inline bool operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &) noexcept;
+  simdjson_really_inline bool operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &) const noexcept;
   // Checks for ']' and ','
   simdjson_really_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &operator++() noexcept;
 };

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ simdjson_really_inline simdjson_result<value> array_iterator<T>::operator*() noe`
`19`	`19`	`return value::start(iter->borrow_iterator());`
`20`	`20`	`}`
`21`	`21`	`template<typename T>`
`22`		`-simdjson_really_inline bool array_iterator<T>::operator==(const array_iterator<T> &other) noexcept {`
	`22`	`+simdjson_really_inline bool array_iterator<T>::operator==(const array_iterator<T> &other) const noexcept {`
`23`	`23`	`return !(*this != other);`
`24`	`24`	`}`
`25`	`25`	`template<typename T>`
`26`		`-simdjson_really_inline bool array_iterator<T>::operator!=(const array_iterator<T> &) noexcept {`
	`26`	`+simdjson_really_inline bool array_iterator<T>::operator!=(const array_iterator<T> &) const noexcept {`
`27`	`27`	`return iter->is_iterator_alive();`
`28`	`28`	`}`
`29`	`29`	`template<typename T>`
`@@ -62,12 +62,12 @@ simdjson_really_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value>`
`62`	`62`	`return *this->first;`
`63`	`63`	`}`
`64`	`64`	`template<typename T>`
`65`		`-simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>>::operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &other) noexcept {`
	`65`	`+simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>>::operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &other) const noexcept {`
`66`	`66`	`if (this->error()) { return true; }`
`67`	`67`	`return this->first == other.first;`
`68`	`68`	`}`
`69`	`69`	`template<typename T>`
`70`		`-simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>>::operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &other) noexcept {`
	`70`	`+simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>>::operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator<T>> &other) const noexcept {`
`71`	`71`	`if (this->error()) { return false; }`
`72`	`72`	`return this->first != other.first;`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ simdjson_really_inline simdjson_result<field> object_iterator::operator*() noexc`
`17`	`17`	`if (result.error()) { iter->release(); }`
`18`	`18`	`return result;`
`19`	`19`	`}`
`20`		`-simdjson_really_inline bool object_iterator::operator==(const object_iterator &other) noexcept {`
	`20`	`+simdjson_really_inline bool object_iterator::operator==(const object_iterator &other) const noexcept {`
`21`	`21`	`return !(*this != other);`
`22`	`22`	`}`
`23`		`-simdjson_really_inline bool object_iterator::operator!=(const object_iterator &) noexcept {`
	`23`	`+simdjson_really_inline bool object_iterator::operator!=(const object_iterator &) const noexcept {`
`24`	`24`	`return iter->is_alive();`
`25`	`25`	`}`
`26`	`26`	`simdjson_really_inline object_iterator &object_iterator::operator++() noexcept {`
`@@ -55,12 +55,12 @@ simdjson_really_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::field>`
`55`	`55`	`return *first;`
`56`	`56`	`}`
`57`	`57`	`// Assumes it's being compared with the end. true if depth < iter->depth.`
`58`		`-simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator>::operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &other) noexcept {`
	`58`	`+simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator>::operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &other) const noexcept {`
`59`	`59`	`if (error()) { return true; }`
`60`	`60`	`return first == other.first;`
`61`	`61`	`}`
`62`	`62`	`// Assumes it's being compared with the end. true if depth >= iter->depth.`
`63`		`-simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator>::operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &other) noexcept {`
	`63`	`+simdjson_really_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator>::operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::object_iterator> &other) const noexcept {`
`64`	`64`	`if (error()) { return false; }`
`65`	`65`	`return first != other.first;`
`66`	`66`	`}`