string型コンストラクタの利用方法を修正

Author: PANFACTORY

src/lexer.h

@@ -65,15 +65,14 @@ namespace JsonParser {
             case '8':
             case '9':
                 {
-                std::string str(&ch);
+                std::string str(1, ch);
                 ch = ss.get();
                 while (!ss.eof() && ch != '}' && ch != ',' && ch != ']') {
                     str += ch;
                     ch = ss.get();
                 }
                 str = str.substr(0, str.find_last_not_of(" \f\t\v\r\n") + 1);
                 if (!std::regex_match(str, std::regex("-?(0|[1-9]\\d*)(\\.\\d+)?(e[-+](0|[1-9]\\d*)(\\.\\d+)?)?"))) {
-                    std::cout << str << std::endl;
                     throw std::runtime_error("At LexicalAnalyzer(): \"str\" is not a number.");
                 }
                 chs.push_back(str);
@@ -83,15 +82,14 @@ namespace JsonParser {
             case 'f':
             case 'n':
                 {
-                std::string str(&ch);
+                std::string str(1, ch);
                 ch = ss.get();
                 while (!ss.eof() && ch != '}' && ch != ',' && ch != ']') {
                     str += ch;
                     ch = ss.get();
                 }
                 str = str.substr(0, str.find_last_not_of(" \f\t\v\r\n") + 1);
                 if (str != "true" && str != "false" && str != "null") {
-                    std::cout << str << std::endl;
                     throw std::runtime_error("At LexicalAnalyzer(): \"str\" is neither true, false nor null.");
                 }
                 chs.push_back(str);

test/lexer_test.cpp

@@ -39,36 +39,12 @@ TEST(JsonParserTest, LexicalHappyTest6) {
     ASSERT_EQ(JsonParser::Lexer(ss).size(), 17);
 }
 
-TEST(JsonParserTest, LexicalHappyTest6_1) {
-    std::stringstream ss;
-    ss << R"({ "pi": 5.14 })";
-    ASSERT_EQ(JsonParser::Lexer(ss).size(), 5);
-}
-
-TEST(JsonParserTest, LexicalHappyTest6_2) {
-    std::stringstream ss;
-    ss << R"({ "pi": 35.14 })";
-    ASSERT_EQ(JsonParser::Lexer(ss).size(), 5);
-}
-
 TEST(JsonParserTest, LexicalHappyTest7) {
     std::stringstream ss;
     ss << R"({ "name": null, "active_flag": true, "delete_flag": false })";
     ASSERT_EQ(JsonParser::Lexer(ss).size(), 13);
 }
 
-TEST(JsonParserTest, LexicalHappyTest7_1) {
-    std::stringstream ss;
-    ss << R"({ "active_flag": true, "delete_flag": false })";
-    ASSERT_EQ(JsonParser::Lexer(ss).size(), 9);
-}
-
-TEST(JsonParserTest, LexicalHappyTest7_2) {
-    std::stringstream ss;
-    ss << R"({ "delete_flag": false })";
-    ASSERT_EQ(JsonParser::Lexer(ss).size(), 5);
-}
-
 TEST(JsonParserTest, LexicalHappyTest8) {
     std::stringstream ss;
     ss << R"({ "user_info": { "user_id": "A1234567", "user_name": "Yamada Taro" } })";