gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove temp debug statements

Browse Source
This commit is contained in:
Steve Hanson 2021-06-08 17:11:42 +01:00
parent 6d253c160d
commit 18ab3b16bc
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/rapidjson/uri.h
View File

@ -39,7 +39,6 @@ RAPIDJSON_NAMESPACE_BEGIN
//! Constructors //! Constructors
GenericUri(Allocator* allocator = 0) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() { GenericUri(Allocator* allocator = 0) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() {
//std::cout << "Default constructor" << std::endl;
} }
GenericUri(const Ch* uri, SizeType len, Allocator* allocator = 0) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() { GenericUri(const Ch* uri, SizeType len, Allocator* allocator = 0) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() {
@ -64,26 +63,22 @@ RAPIDJSON_NAMESPACE_BEGIN
//! Copy constructor //! Copy constructor
GenericUri(const GenericUri& rhs) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(rhs.allocator_), ownAllocator_() { GenericUri(const GenericUri& rhs) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(rhs.allocator_), ownAllocator_() {
//std::cout << "Copy constructor" << std::endl;
*this = rhs; *this = rhs;
} }
//! Copy constructor //! Copy constructor
GenericUri(const GenericUri& rhs, Allocator* allocator) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() { GenericUri(const GenericUri& rhs, Allocator* allocator) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() {
//std::cout << "Copy constructor" << std::endl;
*this = rhs; *this = rhs;
} }
//! Destructor. //! Destructor.
~GenericUri() { ~GenericUri() {
//std::cout << "Destructor" << std::endl;
Free(); Free();
RAPIDJSON_DELETE(ownAllocator_); RAPIDJSON_DELETE(ownAllocator_);
} }
//! Assignment operator //! Assignment operator
GenericUri& operator=(const GenericUri& rhs) { GenericUri& operator=(const GenericUri& rhs) {
//std::cout << "Operator=" << std::endl;
if (this != &rhs) { if (this != &rhs) {
// Do not delete ownAllocator // Do not delete ownAllocator
Free(); Free();
@ -95,7 +90,6 @@ RAPIDJSON_NAMESPACE_BEGIN
base_ = CopyPart(frag_, rhs.frag_, rhs.GetFragStringLength()); base_ = CopyPart(frag_, rhs.frag_, rhs.GetFragStringLength());
uri_ = CopyPart(base_, rhs.base_, rhs.GetBaseStringLength()); uri_ = CopyPart(base_, rhs.base_, rhs.GetBaseStringLength());
CopyPart(uri_, rhs.uri_, rhs.GetStringLength()); CopyPart(uri_, rhs.uri_, rhs.GetStringLength());
//std::wcout << L" Assignment uri: " << uri_ << ", length: " << GetStringLength() << std::endl;
} }
return *this; return *this;
} }
@ -160,7 +154,6 @@ RAPIDJSON_NAMESPACE_BEGIN
// Use for resolving an id or $ref with an in-scope id. // Use for resolving an id or $ref with an in-scope id.
// Returns a new GenericUri for the resolved URI. // Returns a new GenericUri for the resolved URI.
GenericUri Resolve(const GenericUri& baseuri, Allocator* allocator = 0) { GenericUri Resolve(const GenericUri& baseuri, Allocator* allocator = 0) {
//std::cout << "Resolve" << std::endl;
GenericUri resuri; GenericUri resuri;
resuri.allocator_ = allocator; resuri.allocator_ = allocator;
// Ensure enough space for combining paths // Ensure enough space for combining paths
@ -224,13 +217,11 @@ RAPIDJSON_NAMESPACE_BEGIN
} }
// Always use this frag // Always use this frag
resuri.base_ = CopyPart(resuri.frag_, frag_, GetFragStringLength()); resuri.base_ = CopyPart(resuri.frag_, frag_, GetFragStringLength());
//std::wcout << L" Resolved uri: " << L"s: " << resuri.scheme_ << L" a: " << resuri.auth_ << L" p: " << resuri.path_ << L" q: " << resuri.query_ << L" f: " << resuri.frag_ << std::endl;
// Re-constitute base_ and uri_ // Re-constitute base_ and uri_
resuri.SetBase(); resuri.SetBase();
resuri.uri_ = resuri.base_ + resuri.GetBaseStringLength() + 1; resuri.uri_ = resuri.base_ + resuri.GetBaseStringLength() + 1;
resuri.SetUri(); resuri.SetUri();
//std::wcout << L" Resolved rebuilt uri: " << resuri.uri_ << L", length: " << resuri.GetStringLength() << std::endl;
return resuri; return resuri;
} }
@ -241,7 +232,6 @@ private:
// Allocate memory for a URI // Allocate memory for a URI
// Returns total amount allocated // Returns total amount allocated
std::size_t Allocate(std::size_t len) { std::size_t Allocate(std::size_t len) {
//std::cout << "Allocate" << std::endl;
// Create own allocator if user did not supply. // Create own allocator if user did not supply.
if (!allocator_) if (!allocator_)
ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)(); ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
@ -263,15 +253,12 @@ private:
*base_ = '\0'; *base_ = '\0';
uri_ = base_ + 1; uri_ = base_ + 1;
*uri_ = '\0'; *uri_ = '\0';
//std::cout << " Allocating " << total << std::endl;
return total; return total;
} }
// Free memory for a URI // Free memory for a URI
void Free() { void Free() {
//std::cout << "Free" << std::endl;
if (scheme_) { if (scheme_) {
//std::cout << " Freeing" << std::endl;
Allocator::Free(scheme_); Allocator::Free(scheme_);
scheme_ = 0; scheme_ = 0;
} }
@ -281,7 +268,6 @@ private:
// Supports URIs that match regex ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))? as per // Supports URIs that match regex ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))? as per
// https://tools.ietf.org/html/rfc3986 // https://tools.ietf.org/html/rfc3986
void Parse(const Ch* uri, std::size_t len) { void Parse(const Ch* uri, std::size_t len) {
//std::cout << "Parse" << std::endl;
std::size_t start = 0, pos1 = 0, pos2 = 0; std::size_t start = 0, pos1 = 0, pos2 = 0;
Allocate(len); Allocate(len);
@ -368,14 +354,12 @@ private:
std::memcpy(frag_, &uri[start], (len - start) * sizeof(Ch)); std::memcpy(frag_, &uri[start], (len - start) * sizeof(Ch));
frag_[len - start] = '\0'; frag_[len - start] = '\0';
} }
//std::wcout << L" Parsed uri: " << L"s: " << scheme_ << L" a: " << auth_ << L" p: " << path_ << L" q: " << query_ << L" f: " << frag_ << std::endl;
// Re-constitute base_ and uri_ // Re-constitute base_ and uri_
base_ = frag_ + GetFragStringLength() + 1; base_ = frag_ + GetFragStringLength() + 1;
SetBase(); SetBase();
uri_ = base_ + GetBaseStringLength() + 1; uri_ = base_ + GetBaseStringLength() + 1;
SetUri(); SetUri();
//std::wcout << L" Rebuilt uri: " << uri_ << L", length: " << GetStringLength() << std::endl;
} }
// Reconstitute base // Reconstitute base
@ -433,7 +417,6 @@ private:
if (slashpos == 2 && path_[pathpos] == '.' && path_[pathpos + 1] == '.') { if (slashpos == 2 && path_[pathpos] == '.' && path_[pathpos + 1] == '.') {
// Backup a .. segment in the new path_ // Backup a .. segment in the new path_
// We expect to find a previously added slash at the end or nothing // We expect to find a previously added slash at the end or nothing
//std::wcout << L" Path - backing up .. in " << path_ << std::endl;
size_t lastslashpos = newpos; size_t lastslashpos = newpos;
while (lastslashpos > 0) { while (lastslashpos > 0) {
if (path_[lastslashpos - 1] == '/') break; if (path_[lastslashpos - 1] == '/') break;
@ -452,7 +435,6 @@ private:
} }
} else if (slashpos == 1 && path_[pathpos] == '.') { } else if (slashpos == 1 && path_[pathpos] == '.') {
// Discard . segment, leaves new path_ unchanged // Discard . segment, leaves new path_ unchanged
//std::wcout << L" Path - removing . in " << path_ << std::endl;
} else { } else {
// Move any other kind of segment to the new path_ // Move any other kind of segment to the new path_
RAPIDJSON_ASSERT(newpos <= pathpos); RAPIDJSON_ASSERT(newpos <= pathpos);
@ -468,7 +450,6 @@ private:
pathpos += slashpos + 1; pathpos += slashpos + 1;
} }
path_[newpos] = '\0'; path_[newpos] = '\0';
//std::wcout << L" Normalized Path: " << path_ << ", length: " << GetPathStringLength() << std::endl;
} }
Ch* uri_; // Everything Ch* uri_; // Everything