Skip to content

J
json
Commit bd05c7a1 by Niels
Options

small tidy up after pull request #22

- removed IDE leftovers - adjusted const’ness of some functions - style guide
parent 6533b333
Showing with 20 additions and 90 deletions
.gitignore
...@@ -46,3 +46,5 @@ CMakeFiles ...@@ -46,3 +46,5 @@ CMakeFiles
libjson.a libjson.a
Testing Testing
.idea
\ No newline at end of file
.idea/codeStyleSettings.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectCodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value>
<Objective-C-extensions>
<option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
<option name="RELEASE_STYLE" value="IVAR" />
<file>
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="ClassPredef" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="Function" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="Class" />
</file>
<class>
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.objc.util.OCDeclarationKind" value="DeallocMethod" />
</class>
</Objective-C-extensions>
</value>
</option>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
</component>
</project>
\ No newline at end of file
.idea/json.iml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<module type="CPP_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/misc.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
<component name="ProjectRootManager" version="2" />
</project>
\ No newline at end of file
.idea/modules.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/json.iml" filepath="$PROJECT_DIR$/.idea/json.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
src/json.cc
...@@ -1988,9 +1988,9 @@ json json::parser::parse() ...@@ -1988,9 +1988,9 @@ json json::parser::parse()
// remember position of number's first character // remember position of number's first character
const auto _firstpos_ = pos_ - 1; const auto _firstpos_ = pos_ - 1;
while (next() and (std::isdigit(current_) || current_ == '.' while (next() and (std::isdigit(current_) or current_ == '.'
|| current_ == 'e' || current_ == 'E' or current_ == 'e' or current_ == 'E'
|| current_ == '+' || current_ == '-')); or current_ == '+' or current_ == '-'));
try try
{ {
...@@ -2066,7 +2066,7 @@ the error message \p msg), and the last read token. ...@@ -2066,7 +2066,7 @@ the error message \p msg), and the last read token.
@exception std::invalid_argument whenever the function is called @exception std::invalid_argument whenever the function is called
*/ */
void json::parser::error(const std::string& msg) void json::parser::error(const std::string& msg) const
{ {
throw std::invalid_argument("parse error at position " + throw std::invalid_argument("parse error at position " +
std::to_string(pos_) + ": " + msg + std::to_string(pos_) + ": " + msg +
...@@ -2102,7 +2102,7 @@ std::string json::parser::parseString() ...@@ -2102,7 +2102,7 @@ std::string json::parser::parseString()
{ {
char currentChar = buffer_[pos_]; char currentChar = buffer_[pos_];
if (!evenAmountOfBackslashes) if (not evenAmountOfBackslashes)
{ {
// uneven amount of backslashes means the user wants to escape // uneven amount of backslashes means the user wants to escape
// something so we know there is a case such as '\X' or '\\\X' but // something so we know there is a case such as '\X' or '\\\X' but
...@@ -2110,9 +2110,7 @@ std::string json::parser::parseString() ...@@ -2110,9 +2110,7 @@ std::string json::parser::parseString()
// at this point in the code, the currentChar has the value of X. // at this point in the code, the currentChar has the value of X.
// slash, backslash and quote are copied as is // slash, backslash and quote are copied as is
if ( currentChar == '/' if (currentChar == '/' or currentChar == '\\' or currentChar == '"')
|| currentChar == '\\'
|| currentChar == '"')
{ {
result += currentChar; result += currentChar;
} }
...@@ -2221,12 +2219,8 @@ You should only pass numbers < 0x10ffff into this function ...@@ -2221,12 +2219,8 @@ You should only pass numbers < 0x10ffff into this function
(everything else is a invalid code point). (everything else is a invalid code point).
@return the UTF-8 representation of the given code point @return the UTF-8 representation of the given code point
@pre This method isn't accessing the members of the parser
@post This method isn't accessing the members of the parser
*/ */
std::string json::parser::codePointToUTF8(unsigned int codePoint) std::string json::parser::codePointToUTF8(unsigned int codePoint) const
{ {
// this method contains a lot of bit manipulations to // this method contains a lot of bit manipulations to
// build the bytes for UTF-8. // build the bytes for UTF-8.
...@@ -2239,7 +2233,6 @@ std::string json::parser::codePointToUTF8(unsigned int codePoint) ...@@ -2239,7 +2233,6 @@ std::string json::parser::codePointToUTF8(unsigned int codePoint)
// we initialize all strings with their final length // we initialize all strings with their final length
// (e.g. 1 to 4 bytes) to save the reallocations. // (e.g. 1 to 4 bytes) to save the reallocations.
if (codePoint <= 0x7f) if (codePoint <= 0x7f)
{ {
// it's just a ASCII compatible codePoint, // it's just a ASCII compatible codePoint,
...@@ -2309,15 +2302,15 @@ unsigned int json::parser::parse4HexCodePoint() ...@@ -2309,15 +2302,15 @@ unsigned int json::parser::parse4HexCodePoint()
// make a string that can hold the pair // make a string that can hold the pair
std::string hexCode(4, ' '); std::string hexCode(4, ' ');
for(; pos_ < startPos + 4; pos_++) for (; pos_ < startPos + 4; pos_++)
{ {
// no boundary check here as we already checked above // no boundary check here as we already checked above
char currentChar = buffer_[pos_]; char currentChar = buffer_[pos_];
// check if we have a hexadecimal character // check if we have a hexadecimal character
if ( (currentChar >= '0' && currentChar <= '9') if ((currentChar >= '0' and currentChar <= '9')
|| (currentChar >= 'a' && currentChar <= 'f') or (currentChar >= 'a' and currentChar <= 'f')
|| (currentChar >= 'A' && currentChar <= 'F')) or (currentChar >= 'A' and currentChar <= 'F'))
{ {
// all is well, we have valid hexadecimal chars // all is well, we have valid hexadecimal chars
// so we copy that char into our string // so we copy that char into our string
...@@ -2358,8 +2351,7 @@ std::string json::parser::parseUnicodeEscape() ...@@ -2358,8 +2351,7 @@ std::string json::parser::parseUnicodeEscape()
// parse the hex first hex values // parse the hex first hex values
unsigned int firstCodePoint = parse4HexCodePoint(); unsigned int firstCodePoint = parse4HexCodePoint();
if (firstCodePoint >= 0xD800 and firstCodePoint <= 0xDBFF)
if (firstCodePoint >= 0xD800 && firstCodePoint <= 0xDBFF)
{ {
// we found invalid code points, which means we either have a malformed // we found invalid code points, which means we either have a malformed
// input or we found a high surrogate. // input or we found a high surrogate.
...@@ -2372,7 +2364,7 @@ std::string json::parser::parseUnicodeEscape() ...@@ -2372,7 +2364,7 @@ std::string json::parser::parseUnicodeEscape()
// the method does boundary checking for us, so no need to do that here // the method does boundary checking for us, so no need to do that here
unsigned secondCodePoint = parse4HexCodePoint(); unsigned secondCodePoint = parse4HexCodePoint();
// ok, we have a low surrogate, check if it is a valid one // ok, we have a low surrogate, check if it is a valid one
if (secondCodePoint >= 0xDC00 && secondCodePoint <= 0xDFFF) if (secondCodePoint >= 0xDC00 and secondCodePoint <= 0xDFFF)
{ {
// calculate the code point from the pair according to the spec // calculate the code point from the pair according to the spec
unsigned int finalCodePoint = unsigned int finalCodePoint =
...@@ -2390,7 +2382,9 @@ std::string json::parser::parseUnicodeEscape() ...@@ -2390,7 +2382,9 @@ std::string json::parser::parseUnicodeEscape()
return codePointToUTF8(finalCodePoint); return codePointToUTF8(finalCodePoint);
} }
else else
{
error("missing low surrogate"); error("missing low surrogate");
}
} }
// We have Form 1, so we just interpret the XXXX as a code point // We have Form 1, so we just interpret the XXXX as a code point
......
src/json.h
...@@ -418,11 +418,11 @@ class json ...@@ -418,11 +418,11 @@ class json
/// read the next character, stripping whitespace /// read the next character, stripping whitespace
bool next(); bool next();
/// raise an exception with an error message /// raise an exception with an error message
inline void error(const std::string&) __attribute__((noreturn)); inline void error(const std::string&) const __attribute__((noreturn));
/// parse a quoted string /// parse a quoted string
inline std::string parseString(); inline std::string parseString();
/// transforms a unicode codepoint to it's UTF-8 presentation /// transforms a unicode codepoint to it's UTF-8 presentation
std::string codePointToUTF8(unsigned int codePoint); std::string codePointToUTF8(unsigned int codePoint) const;
/// parses 4 hex characters that represent a unicode code point /// parses 4 hex characters that represent a unicode code point
inline unsigned int parse4HexCodePoint(); inline unsigned int parse4HexCodePoint();
/// parses \uXXXX[\uXXXX] unicode escape characters /// parses \uXXXX[\uXXXX] unicode escape characters
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment