Added Reset() method on ParserSingle

GoPlan · GoPlan · commit eed574440fe1 · 2015-12-18T12:21:09.000+07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.2)
 project(cldeparser)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-set(STORAGE /Volumes/External-SSD)
+set(STORAGE "~/Devel")
 set(EXTRA_DIR "${STORAGE}/Extra")
 set(VERSION 1.0.0)
 # Note: Extra folder containing supporting libraries such as gtest, gmock, valgrind ... Extra folder is not tracked
diff --git a/Examples/example-json.cpp b/Examples/example-json.cpp
@@ -2,6 +2,8 @@
 #include <iostream>
 #include <cldeparser/CldeParser.h>
 #include <cldeparser-json/Json.h>
+#include <cldeparser-json/JsonDerivativeFactory.h>
+#include <cldeparser-json/JsonSyntaxModel.h>
 
 using namespace CLDEParser;
 
diff --git a/cldeparser-ios/cldeparser-ios.xcodeproj/project.pbxproj b/cldeparser-ios/cldeparser-ios.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
 		C814DFAB1C002AF60021BB10 /* JsonDerivativeFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C814DFA91C002AF60021BB10 /* JsonDerivativeFactory.cpp */; };
 		C814DFB01C0043890021BB10 /* JsonDefaultParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C814DFAC1C0043890021BB10 /* JsonDefaultParser.cpp */; };
 		C814DFB11C00438A0021BB10 /* JsonEntityFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C814DFAE1C0043890021BB10 /* JsonEntityFactory.cpp */; };
-		C814DFB21C004F510021BB10 /* CLDEiOSParser.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = C858624E1BFF06DA00961BE2 /* CLDEiOSParser.hpp */; };
 		C85861DF1BFF05B800961BE2 /* Derivative.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C85861851BFF05B700961BE2 /* Derivative.cpp */; };
 		C85861E01BFF05B800961BE2 /* Exception.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C85861871BFF05B700961BE2 /* Exception.cpp */; };
 		C85861E11BFF05B800961BE2 /* ParserException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C858618A1BFF05B700961BE2 /* ParserException.cpp */; };
@@ -75,7 +74,6 @@
 			dstPath = "include/$(PRODUCT_NAME)";
 			dstSubfolderSpec = 16;
 			files = (
-				C814DFB21C004F510021BB10 /* CLDEiOSParser.hpp in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/cldeparser-ios/cldeparser-ios/CLDEiOSParser.mm b/cldeparser-ios/cldeparser-ios/CLDEiOSParser.mm
@@ -16,6 +16,7 @@
 struct Impl {
     
     Parsing::Json::JsonDefaultParser parser;
+    
     Parsing::Json::SPtrJsonEntity Parse(std::string const &string){
         return parser.Parse(string);
     }
diff --git a/cldeparser-json/JsonDefaultParser.cpp b/cldeparser-json/JsonDefaultParser.cpp
@@ -58,6 +58,8 @@ CLDEParser::Parsing::Json::JsonDefaultParser::~JsonDefaultParser() {
 
 CLDEParser::Parsing::Json::SPtrJsonEntity CLDEParser::Parsing::Json::JsonDefaultParser::Parse(std::string const &json) const {
 
+    _ptrImpl->parser.Reset();
+    
     // Scanning
     auto tokens = _ptrImpl->scanner.Scan(json);
     auto filteredCodes = Scanning::TokenHelper::DefaultFilterCodes();
diff --git a/cldeparser/ParserSingle.cpp b/cldeparser/ParserSingle.cpp
@@ -43,6 +43,10 @@ namespace CLDEParser {
 
         return _sptrDerivative->SyntaxModel();
     }
+    
+    void ParserSingle::Reset() const {        
+        _sptrDerivative->Reset();
+    }
 }
 
 
diff --git a/cldeparser/ParserSingle.h b/cldeparser/ParserSingle.h
@@ -26,6 +26,7 @@ namespace CLDEParser {
 
         // Locals
         virtual SPtrSyntaxModel Parse(SPtrTokenVector const &sptrTokens) const;
+        virtual void Reset() const;
 
         template<typename T>
         std::shared_ptr<T> ParseCast(SPtrTokenVector const &sptrTokens) const {

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`struct Impl {`
`17`	`17`
`18`	`18`	`Parsing::Json::JsonDefaultParser parser;`
	`19`	`+`
`19`	`20`	`Parsing::Json::SPtrJsonEntity Parse(std::string const &string){`
`20`	`21`	`return parser.Parse(string);`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@ namespace CLDEParser {`
`43`	`43`
`44`	`44`	`return _sptrDerivative->SyntaxModel();`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ void ParserSingle::Reset() const {`
	`48`	`+ _sptrDerivative->Reset();`
	`49`	`+ }`
`46`	`50`	`}`
`47`	`51`
`48`	`52`