CLDEPARSER-24 #time 2h

Author: LE, Duc-Anh

CMakeLists.txt

@@ -78,7 +78,7 @@ set(TEST_SOURCE
         Test/JsonParserInstance.h
         Test/JsonTestFixture.cpp
         Test/JsonTestFixture.h
-        Test/Case01_OtherTest.hpp)
+)
 
 include_directories(${EXTRA_DIR}/gtest-1.7.0/include)
 LINK_DIRECTORIES(${EXTRA_DIR}/gtest-1.7.0/lib)

Source/Parsing/Json/CMakeLists.txt

@@ -25,4 +25,8 @@ add_library(parser-json STATIC
         JsonSyntaxModel.h
         JsonValueFactory.cpp
         JsonValueFactory.h
+        JsonEntityHelper.cpp
+        JsonEntityHelper.h
+        JsonValueHelper.cpp
+        JsonValueHelper.h
 )

Source/Parsing/Json/Json.h

@@ -8,8 +8,10 @@
 #include "JsonException.h"
 #include "JsonDerivative.h"
 #include "JsonEntity.h"
+#include "JsonEntityHelper.h"
 #include "JsonObject.h"
 #include "JsonArray.h"
 #include "JsonValue.h"
+#include "JsonValueHelper.h"
 
 #endif //CLDEPARSER_JSON_H

Source/Parsing/Json/JsonArray.h

@@ -30,8 +30,9 @@ namespace CLDEParser {
 
             protected:
                 SPtrJsonValueVector _container;
-
             };
+
+            using SPtrJsonArray = std::shared_ptr<JsonArray>;
         }
     }
 }

Source/Parsing/Json/JsonDerivative.cpp

@@ -13,6 +13,43 @@ namespace CLDEParser {
                 //
             }
 
+            bool JsonDerivative::isObjectFirstFollow(SPtrTokenVectorIterator &iterator) {
+
+                if ((JsonSyntaxNodeType) (*iterator)->id() == JsonSyntaxNodeType::BracketOpen) {
+                    return true;
+                }
+
+                if ((JsonSyntaxNodeType) (*iterator)->id() == JsonSyntaxNodeType::CurlyBraceOpen) {
+                    return true;
+                }
+
+                if ((JsonSyntaxNodeType) (*iterator)->id() == JsonSyntaxNodeType::String) {
+                    return true;
+                }
+
+                if ((JsonSyntaxNodeType) (*iterator)->id() == JsonSyntaxNodeType::BooleanFalse) {
+                    return true;
+                }
+
+                if ((JsonSyntaxNodeType) (*iterator)->id() == JsonSyntaxNodeType::BooleanTrue) {
+                    return true;
+                }
+
+                if ((JsonSyntaxNodeType) (*iterator)->id() == JsonSyntaxNodeType::Null) {
+                    return true;
+                }
+
+                if ((JsonSyntaxNodeType) (*iterator)->id() == JsonSyntaxNodeType::Number) {
+                    return true;
+                }
+
+                if ((JsonSyntaxNodeType) (*iterator)->id() == JsonSyntaxNodeType::NumberInteger) {
+                    return true;
+                }
+
+                return false;
+            }
+
             void JsonDerivative::matchBracketOpen(SPtrTokenVectorIterator &iterator) {
 
                 if ((JsonSyntaxNodeType) (*iterator)->id() != JsonSyntaxNodeType::BracketOpen) {
@@ -270,10 +307,13 @@ namespace CLDEParser {
 
             void JsonDerivative::array(SPtrTokenVectorIterator &iterator) {
 
-                _sptrSyntaxModel->_sptrSyntaxNodeQueue
-                                .push_back(JsonFactory::CreateSPtrJsonSyntaxNode((int) JsonSyntaxNodeType::Id,
-                                                                                 std::string{}));
-                value(iterator);
+                if (isObjectFirstFollow(iterator)) {
+
+                    _sptrSyntaxModel->_sptrSyntaxNodeQueue
+                                    .push_back(JsonFactory::CreateSPtrJsonSyntaxNode((int) JsonSyntaxNodeType::Id,
+                                                                                     std::string{}));
+                    value(iterator);
+                }
 
                 if ((JsonSyntaxNodeType) (*iterator)->id() == JsonSyntaxNodeType::Comma) {
                     value_add(iterator);
@@ -340,7 +380,6 @@ namespace CLDEParser {
             SPtrSyntaxModel JsonDerivative::SyntaxModel() {
                 return _sptrSyntaxModel;
             }
-
             void JsonDerivative::Reset() {
                 _sptrSyntaxModel->Reset();
             }

Source/Parsing/Json/JsonDerivative.h

@@ -20,6 +20,7 @@ namespace CLDEParser {
 
                 // Main
                 bool json(SPtrTokenVectorIterator &iterator);
+                bool isObjectFirstFollow(SPtrTokenVectorIterator &iterator);
 
                 // Terminal matching
                 void matchId(SPtrTokenVectorIterator &iterator);

Source/Parsing/Json/JsonEntity.cpp

@@ -3,7 +3,14 @@
 //
 
 #include "JsonEntity.h"
+#include "JsonException.h"
 
 
+namespace CLDEParser {
+    namespace Parsing {
+        namespace Json {
 
 
+        }
+    }
+}

Source/Parsing/Json/JsonEntity.h

@@ -26,7 +26,8 @@ namespace CLDEParser {
             using SPtrJsonEntityMap = std::unordered_map<std::string, SPtrJsonEntity>;
             using SPtrJsonEntityVector = std::vector<SPtrJsonEntity>;
 
-            class JsonEntity : public Common::IPrintable {
+            class JsonEntity : public Common::IPrintable,
+                               public std::enable_shared_from_this<JsonEntity> {
 
             public:
                 JsonEntity() = default;
@@ -37,7 +38,7 @@ namespace CLDEParser {
                 virtual ~JsonEntity() = default;
 
                 // Accessors & Mutators
-                JsonEntityType &Type() { return _type; }
+                JsonEntityType const &Type() const { return _type; }
 
             protected:
                 JsonEntity(JsonEntityType type) : _type{type} { };

Source/Parsing/Json/JsonEntityHelper.cpp

@@ -0,0 +1,32 @@
+//
+// Created by LE, Duc Anh on 8/25/15.
+//
+
+#include "JsonEntityHelper.h"
+
+namespace CLDEParser {
+    namespace Parsing {
+        namespace Json {
+
+            SPtrJsonArray JsonEntityHelper::ToSPtrArray(SPtrJsonEntity const &sptrJsonEntity) {
+
+                if (sptrJsonEntity->Type() != JsonEntityType::Array) {
+                    int code = (int) JsonException::JsonExceptionCode::InvalidTypeCasting;
+                    throw JsonException{code, std::string{}};
+                }
+
+                return std::dynamic_pointer_cast<JsonArray>(sptrJsonEntity);
+            }
+
+            SPtrJsonObject JsonEntityHelper::ToSPtrObject(SPtrJsonEntity const &sptrJsonEntity) {
+
+                if (sptrJsonEntity->Type() != JsonEntityType::Object) {
+                    int code = (int) JsonException::JsonExceptionCode::InvalidTypeCasting;
+                    throw JsonException{code, std::string{}};
+                }
+
+                return std::dynamic_pointer_cast<JsonObject>(sptrJsonEntity);
+            }
+        }
+    }
+}

Source/Parsing/Json/JsonEntityHelper.h

@@ -0,0 +1,25 @@
+//
+// Created by LE, Duc Anh on 8/25/15.
+//
+
+#ifndef CLDEPARSER_PARSING_JSON_JSONENTITYHELPER_H
+#define CLDEPARSER_PARSING_JSON_JSONENTITYHELPER_H
+
+#include "JsonEntity.h"
+#include "JsonArray.h"
+#include "JsonObject.h"
+#include "JsonException.h"
+
+namespace CLDEParser {
+    namespace Parsing {
+        namespace Json {
+            struct JsonEntityHelper {
+                static SPtrJsonArray ToSPtrArray(SPtrJsonEntity const &sptrJsonEntity);
+                static SPtrJsonObject ToSPtrObject(SPtrJsonEntity const &sptrJsonEntity);
+            };
+        }
+    }
+}
+
+
+#endif //CLDEPARSER_PARSING_JSON_JSONENTITYHELPER_H