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

[DEV] UniChar ==> UChar & Hach ==> Hash

Browse Source
This commit is contained in:
Edouard DUPIN 2013-10-18 21:15:02 +02:00
parent 61f4b68621
commit b442284f09
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ejson/Object.h
View File

@ -11,7 +11,7 @@
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/Hach.h>
#include <etk/Hash.h>
#include <etk/math/Vector2D.h>
#include <ejson/Value.h>

6
ejson/Value.cpp
View File

@ -34,7 +34,7 @@ void ejson::Value::addIndent(etk::UString& _data, int32_t _indent) const {
}
}
void ejson::Value::drawElementParsed(const etk::UniChar& _val, const ejson::filePos& _filePos) const {
void ejson::Value::drawElementParsed(const etk::UChar& _val, const ejson::filePos& _filePos) const {
if (_val == '\n') {
JSON_DEBUG(_filePos << " parse '\\n'");
} else if (_val == '\t') {
@ -60,7 +60,7 @@ int32_t ejson::Value::countWhiteChar(const etk::UString& _data, int32_t _pos, ej
}
bool ejson::Value::checkString(const etk::UniChar& _val) const {
bool ejson::Value::checkString(const etk::UChar& _val) const {
if( _val == '!'
|| _val == '"'
|| _val == '#'
@ -99,7 +99,7 @@ bool ejson::Value::checkString(const etk::UniChar& _val) const {
return true;
}
bool ejson::Value::checkNumber(const etk::UniChar& _val) const {
bool ejson::Value::checkNumber(const etk::UChar& _val) const {
if( _val == '-'
|| _val == '+'
|| _val == 'e'

8
ejson/Value.h
View File

@ -76,7 +76,7 @@ namespace ejson
return *this;
}
void newLine(void) { m_col=0; m_line++; };
bool check(const etk::UniChar& _val) {
bool check(const etk::UChar& _val) {
m_col++;
if (_val == '\n') {
newLine();
@ -143,17 +143,17 @@ namespace ejson
* @param[in] _val Char that is parsed.
* @param[in] _filePos Position of the char in the file.
*/
void drawElementParsed(const etk::UniChar& _val, const ejson::filePos& _filePos) const;
void drawElementParsed(const etk::UChar& _val, const ejson::filePos& _filePos) const;
/**
* @brief check if an name (for object named) (not : !"#$%&'()*+,/;<=>?@[\]^`{|}~ \n\t\r).
* @param[in] _val Value to check the conformity.
*/
bool checkString(const etk::UniChar& _val) const;
bool checkString(const etk::UChar& _val) const;
/**
* @brief check if an number -+.0123456789e).
* @param[in] _val Value to check the conformity.
*/
bool checkNumber(const etk::UniChar& _val) const;
bool checkNumber(const etk::UChar& _val) const;
/**
* @brief count the number of white char in the string from the specify position (stop at the first element that is not a white char)
* @param[in] _data Data to parse.