Cleanup.

dmlc · Jul 25, 2019 · fc37c9f · fc37c9f
1 parent b7b56f2
commit fc37c9f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/include/xgboost/json_io.h b/include/xgboost/json_io.h
@@ -77,6 +77,7 @@ class JsonReader {
 
    public:
     SourceLocation() : pos_(0) {}
+    SourceLocation(size_t pos) : pos_{pos} {}
     size_t  Pos()  const { return pos_; }
 
     SourceLocation& Forward(char c = 0) {
@@ -138,20 +139,17 @@ class JsonReader {
 
   Json Parse();
 
-  void SetStr(StringView const& str) {
-    raw_str_ = str;
-  }
-  void SetCursor(size_t pos) {
-    cursor_.pos_ = pos;
-  }
-
  private:
   using Fn = std::function<Json (StringView, size_t*)>;
 
  public:
   explicit JsonReader(StringView str, bool ignore = false) :
       raw_str_{str},
       ignore_specialization_{ignore} {}
+  explicit JsonReader(StringView str, size_t pos, bool ignore = false) :
+      cursor_{pos},
+      raw_str_{str},
+      ignore_specialization_{ignore} {}
 
   virtual ~JsonReader() = default;
 

diff --git a/src/common/json.cc b/src/common/json.cc
@@ -3,6 +3,7 @@
  */
 #include <sstream>
 
+#include "charconv.h"
 #include "xgboost/logging.h"
 #include "xgboost/json.h"
 #include "xgboost/json_io.h"

diff --git a/src/gbm/gblinear_model.cc b/src/gbm/gblinear_model.cc
@@ -83,9 +83,7 @@ class LinearSelectRaw : public JsonReader {
 
  public:
   LinearSelectRaw(StringView str, size_t* pos) :
-      JsonReader{str}, pre_pos_{pos} {
-    JsonReader::SetCursor(*pos);
-  }
+      JsonReader{str, *pos}, pre_pos_{pos} {}
 
   Json ParseRaw() {
     SkipSpaces();

diff --git a/src/gbm/gbtree.cc b/src/gbm/gbtree.cc
@@ -612,9 +612,7 @@ class TreeSelectRaw : public JsonReader {
 
  public:
   TreeSelectRaw(StringView str, size_t* pos) :
-      JsonReader{str}, pre_pos_{pos} {
-    JsonReader::SetCursor(*pos);
-  }
+      JsonReader{str, *pos}, pre_pos_{pos} {}
 
   Json ParseRaw() {
     SkipSpaces();