@@ -864,45 +864,8 @@ std::vector<Reader::StructuredError> Reader::getStructuredErrors() const {
864
864
}
865
865
return allErrors;
866
866
}
867
-
868
- bool Reader::pushError (const Value& value, const std::string& message) {
869
- size_t length = end_ - begin_;
870
- if (value.getOffsetStart () > length
871
- || value.getOffsetLimit () > length)
872
- return false ;
873
- Token token;
874
- token.type_ = tokenError;
875
- token.start_ = begin_ + value.getOffsetStart ();
876
- token.end_ = end_ + value.getOffsetLimit ();
877
- ErrorInfo info;
878
- info.token_ = token;
879
- info.message_ = message;
880
- info.extra_ = 0 ;
881
- errors_.push_back (info);
882
- return true ;
883
- }
884
-
885
- bool Reader::pushError (const Value& value, const std::string& message, const Value& extra) {
886
- size_t length = end_ - begin_;
887
- if (value.getOffsetStart () > length
888
- || value.getOffsetLimit () > length
889
- || extra.getOffsetLimit () > length)
890
- return false ;
891
- Token token;
892
- token.type_ = tokenError;
893
- token.start_ = begin_ + value.getOffsetStart ();
894
- token.end_ = begin_ + value.getOffsetLimit ();
895
- ErrorInfo info;
896
- info.token_ = token;
897
- info.message_ = message;
898
- info.extra_ = begin_ + extra.getOffsetStart ();
899
- errors_.push_back (info);
900
- return true ;
901
- }
902
-
903
- bool Reader::good () const {
904
- return !errors_.size ();
905
- }
867
+ // Reader
868
+ // ///////////////////////
906
869
907
870
// exact copy of Features
908
871
class OurFeatures {
@@ -956,9 +919,6 @@ class OurReader {
956
919
bool collectComments = true );
957
920
std::string getFormattedErrorMessages () const ;
958
921
std::vector<StructuredError> getStructuredErrors () const ;
959
- bool pushError (const Value& value, const std::string& message);
960
- bool pushError (const Value& value, const std::string& message, const Value& extra);
961
- bool good () const ;
962
922
963
923
private:
964
924
OurReader (OurReader const &); // no impl
@@ -1794,45 +1754,6 @@ std::vector<OurReader::StructuredError> OurReader::getStructuredErrors() const {
1794
1754
return allErrors;
1795
1755
}
1796
1756
1797
- bool OurReader::pushError (const Value& value, const std::string& message) {
1798
- size_t length = end_ - begin_;
1799
- if (value.getOffsetStart () > length
1800
- || value.getOffsetLimit () > length)
1801
- return false ;
1802
- Token token;
1803
- token.type_ = tokenError;
1804
- token.start_ = begin_ + value.getOffsetStart ();
1805
- token.end_ = end_ + value.getOffsetLimit ();
1806
- ErrorInfo info;
1807
- info.token_ = token;
1808
- info.message_ = message;
1809
- info.extra_ = 0 ;
1810
- errors_.push_back (info);
1811
- return true ;
1812
- }
1813
-
1814
- bool OurReader::pushError (const Value& value, const std::string& message, const Value& extra) {
1815
- size_t length = end_ - begin_;
1816
- if (value.getOffsetStart () > length
1817
- || value.getOffsetLimit () > length
1818
- || extra.getOffsetLimit () > length)
1819
- return false ;
1820
- Token token;
1821
- token.type_ = tokenError;
1822
- token.start_ = begin_ + value.getOffsetStart ();
1823
- token.end_ = begin_ + value.getOffsetLimit ();
1824
- ErrorInfo info;
1825
- info.token_ = token;
1826
- info.message_ = message;
1827
- info.extra_ = begin_ + extra.getOffsetStart ();
1828
- errors_.push_back (info);
1829
- return true ;
1830
- }
1831
-
1832
- bool OurReader::good () const {
1833
- return !errors_.size ();
1834
- }
1835
-
1836
1757
1837
1758
class OurCharReader : public CharReader {
1838
1759
bool const collectComments_;
0 commit comments