@@ -865,45 +865,8 @@ std::vector<Reader::StructuredError> Reader::getStructuredErrors() const {
865
865
}
866
866
return allErrors;
867
867
}
868
-
869
- bool Reader::pushError (const Value& value, const std::string& message) {
870
- size_t length = end_ - begin_;
871
- if (value.getOffsetStart () > length
872
- || value.getOffsetLimit () > length)
873
- return false ;
874
- Token token;
875
- token.type_ = tokenError;
876
- token.start_ = begin_ + value.getOffsetStart ();
877
- token.end_ = end_ + value.getOffsetLimit ();
878
- ErrorInfo info;
879
- info.token_ = token;
880
- info.message_ = message;
881
- info.extra_ = 0 ;
882
- errors_.push_back (info);
883
- return true ;
884
- }
885
-
886
- bool Reader::pushError (const Value& value, const std::string& message, const Value& extra) {
887
- size_t length = end_ - begin_;
888
- if (value.getOffsetStart () > length
889
- || value.getOffsetLimit () > length
890
- || extra.getOffsetLimit () > length)
891
- return false ;
892
- Token token;
893
- token.type_ = tokenError;
894
- token.start_ = begin_ + value.getOffsetStart ();
895
- token.end_ = begin_ + value.getOffsetLimit ();
896
- ErrorInfo info;
897
- info.token_ = token;
898
- info.message_ = message;
899
- info.extra_ = begin_ + extra.getOffsetStart ();
900
- errors_.push_back (info);
901
- return true ;
902
- }
903
-
904
- bool Reader::good () const {
905
- return !errors_.size ();
906
- }
868
+ // Reader
869
+ // ///////////////////////
907
870
908
871
// exact copy of Features
909
872
class OurFeatures {
@@ -954,9 +917,6 @@ class OurReader {
954
917
bool collectComments = true );
955
918
std::string getFormattedErrorMessages () const ;
956
919
std::vector<StructuredError> getStructuredErrors () const ;
957
- bool pushError (const Value& value, const std::string& message);
958
- bool pushError (const Value& value, const std::string& message, const Value& extra);
959
- bool good () const ;
960
920
961
921
private:
962
922
OurReader (OurReader const &); // no impl
@@ -1824,45 +1784,6 @@ std::vector<OurReader::StructuredError> OurReader::getStructuredErrors() const {
1824
1784
return allErrors;
1825
1785
}
1826
1786
1827
- bool OurReader::pushError (const Value& value, const std::string& message) {
1828
- size_t length = end_ - begin_;
1829
- if (value.getOffsetStart () > length
1830
- || value.getOffsetLimit () > length)
1831
- return false ;
1832
- Token token;
1833
- token.type_ = tokenError;
1834
- token.start_ = begin_ + value.getOffsetStart ();
1835
- token.end_ = end_ + value.getOffsetLimit ();
1836
- ErrorInfo info;
1837
- info.token_ = token;
1838
- info.message_ = message;
1839
- info.extra_ = 0 ;
1840
- errors_.push_back (info);
1841
- return true ;
1842
- }
1843
-
1844
- bool OurReader::pushError (const Value& value, const std::string& message, const Value& extra) {
1845
- size_t length = end_ - begin_;
1846
- if (value.getOffsetStart () > length
1847
- || value.getOffsetLimit () > length
1848
- || extra.getOffsetLimit () > length)
1849
- return false ;
1850
- Token token;
1851
- token.type_ = tokenError;
1852
- token.start_ = begin_ + value.getOffsetStart ();
1853
- token.end_ = begin_ + value.getOffsetLimit ();
1854
- ErrorInfo info;
1855
- info.token_ = token;
1856
- info.message_ = message;
1857
- info.extra_ = begin_ + extra.getOffsetStart ();
1858
- errors_.push_back (info);
1859
- return true ;
1860
- }
1861
-
1862
- bool OurReader::good () const {
1863
- return !errors_.size ();
1864
- }
1865
-
1866
1787
1867
1788
class OurCharReader : public CharReader {
1868
1789
bool const collectComments_;
0 commit comments