remove some parsing bugs

Jadit19 · Jadit19 · commit c0b2a42998aa · 2024-02-04T20:53:28.000+05:30
diff --git a/include/json/object.h b/include/json/object.h
@@ -13,9 +13,10 @@ namespace json {
 
 class object {
 private:
-  using value = std::variant<std::nullptr_t, bool, int, double, std::string>;
+  using value =
+      std::variant<std::nullptr_t, bool, long long int, double, std::string>;
   using all_values =
-      std::variant<std::nullptr_t, bool, int, double, std::string,
+      std::variant<std::nullptr_t, bool, long long int, double, std::string,
                    std::vector<object>, std::map<std::string, object>>;
 
   type _type;
@@ -44,6 +45,7 @@ class object {
   object &operator=(std::nullptr_t data);
   object &operator=(bool data);
   object &operator=(int data);
+  object &operator=(long long int data);
   object &operator=(double data);
   object &operator=(const char *data);
   object &operator=(std::vector<object> data);
diff --git a/include/json/parse.h b/include/json/parse.h
@@ -22,6 +22,7 @@ class parser {
   object parseMap();
 
   void skipWhitespace();
+  char getPrevChar();
   char getCurrChar();
   char getNextChar();
 
diff --git a/src/object.cpp b/src/object.cpp
@@ -11,7 +11,7 @@ json::object::object(all_values data) {
   else if (data.index() == 1)
     *this = std::get<bool>(data);
   else if (data.index() == 2)
-    *this = std::get<int>(data);
+    *this = std::get<long long int>(data);
   else if (data.index() == 3)
     *this = std::get<double>(data);
   else if (data.index() == 4)
@@ -43,6 +43,13 @@ json::object &json::object::operator=(bool data) {
   return *this;
 }
 json::object &json::object::operator=(int data) {
+  this->_value = static_cast<long long int>(data);
+  this->_type.set(type::integer);
+  this->clearArray();
+  this->clearMap();
+  return *this;
+}
+json::object &json::object::operator=(long long int data) {
   this->_value = data;
   this->_type.set(type::integer);
   this->clearArray();
@@ -196,7 +203,7 @@ std::string json::object::dumps(size_t indent, size_t baseIndent) {
     else
       return "false";
   } else if (this->_type.get() == type::integer) {
-    return std::to_string(std::get<int>(this->_value));
+    return std::to_string(std::get<long long int>(this->_value));
   } else if (this->_type.get() == type::number) {
     return std::to_string(std::get<double>(this->_value));
   } else if (this->_type.get() == type::string) {
diff --git a/src/parse.cpp b/src/parse.cpp
@@ -69,18 +69,27 @@ json::object json::parser::parseNumber() {
   }
 
   if (isInt)
-    return object(std::stoi(number));
+    return object(std::stoll(number));
   return object(std::stod(number));
 }
 json::object json::parser::parseString() {
   std::string value = "";
-  value += this->getNextChar();
-  char nextChar;
+  char nextChar = this->getNextChar();
 
-  while ((nextChar = this->getNextChar()) != '"')
+  if (nextChar != '"') {
     value += nextChar;
-  this->getNextChar();
 
+    while (true) {
+      nextChar = this->getNextChar();
+      if (nextChar == '"') {
+        if (this->getPrevChar() != '\\')
+          break;
+      }
+      value += nextChar;
+    }
+  }
+
+  this->getNextChar();
   return object(value);
 }
 json::object json::parser::parseArray() {
@@ -114,14 +123,22 @@ json::object json::parser::parseMap() {
   while (true) {
     this->getNextChar();
     this->skipWhitespace();
-    if (this->getCurrChar() == '}')
+    if (this->getCurrChar() == '}') {
+      this->getNextChar();
       break;
+    }
 
     if (this->getCurrChar() == '"') {
       std::string key = "";
       char nextChar;
-      while ((nextChar = this->getNextChar()) != '"')
+      while (true) {
+        nextChar = this->getNextChar();
+        if (nextChar == '"') {
+          if (this->getPrevChar() != '\\')
+            break;
+        }
         key += nextChar;
+      }
 
       this->getNextChar();
       this->skipWhitespace();
@@ -154,6 +171,12 @@ void json::parser::skipWhitespace() {
   }
   return;
 }
+char json::parser::getPrevChar() {
+  if (this->index > 0) {
+    return this->input[this->index - 1];
+  }
+  return '\0';
+}
 char json::parser::getCurrChar() {
   if (this->index < this->input.size()) {
     return this->input[this->index];
