atria-soft/ejson
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

[DEBUG] correct the type of the Object

Browse Source
This commit is contained in:
Edouard DUPIN 2016-04-28 23:38:54 +02:00
parent a6865bfa43
commit c41bcd52d4
41 changed files with 39 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ejson/Array.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <ejson/Array.h> #include <ejson/Array.h>

4
ejson/Array.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/Boolean.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/Boolean.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/Document.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <ejson/Document.h> #include <ejson/Document.h>

4
ejson/Document.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/FilePos.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/FilePos.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/Null.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <ejson/Null.h> #include <ejson/Null.h>

4
ejson/Null.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/Number.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <ejson/Number.h> #include <ejson/Number.h>

4
ejson/Number.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

7
ejson/Object.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <ejson/Object.h> #include <ejson/Object.h>
@ -15,7 +13,8 @@ ejson::Object::Object(ememory::SharedPtr<ejson::internal::Value> _internalValue)
if (m_data == nullptr) { if (m_data == nullptr) {
return; return;
} }
if (m_data->getType() != ejson::valueType::null) { if ( m_data->getType() != ejson::valueType::object
&& m_data->getType() != ejson::valueType::document) {
// try to set wrong type inside ... ==> remove it ... // try to set wrong type inside ... ==> remove it ...
m_data = nullptr; m_data = nullptr;
} }

4
ejson/Object.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/String.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <ejson/String.h> #include <ejson/String.h>

4
ejson/String.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/Value.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/Value.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/debug.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/debug.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

2
ejson/details/iterator.hxx
View File

@ -1,8 +1,6 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <ejson/iterator.h> #include <ejson/iterator.h>

4
ejson/ejson.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/internal/Array.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/internal/Array.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/internal/Boolean.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/internal/Boolean.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/internal/Document.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/internal/Document.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/internal/Null.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/internal/Null.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/internal/Number.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/internal/Number.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/internal/Object.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/internal/Object.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/internal/String.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/internal/String.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

4
ejson/internal/Value.cpp
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

4
ejson/internal/Value.h
View File

@ -1,8 +1,6 @@
/** /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

2
ejson/iterator.h
View File

@ -1,8 +1,6 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once

2
ejson/valueType.cpp
View File

@ -1,8 +1,6 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */

2
ejson/valueType.h
View File

@ -1,8 +1,6 @@
/** @file /** @file
* @author Edouard DUPIN * @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once