GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

JSON

Browse source 
- Completed JSON parser with the addition of syntax error messages.
This commit is contained in:
Paul Beckingham 2011-05-21 15:06:42 -04:00
parent 409fa216b8
commit df1920d75c
4 changed files with 86 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/JSON.cpp
View file

@ -199,15 +199,20 @@ json::array* json::array::parse (Nibbler& nibbler)
else
{
delete arr;
return NULL;
throw std::string ("Error: missing value after ',' at position ") +
format ((int) n.cursor ());
}
}
}
if (n.skip (']'))
{
nibbler = n;
return arr;
}
else
throw std::string ("Error: missing ']' at position ") +
format ((int) n.cursor ());
delete arr;
}
@ -283,7 +288,8 @@ json::object* json::object::parse (Nibbler& nibbler)
else
{
delete obj;
return NULL;
throw std::string ("Error: missing value after ',' at position ") +
format ((int) n.cursor ());
}
}
}
@ -293,6 +299,9 @@ json::object* json::object::parse (Nibbler& nibbler)
nibbler = n;
return obj;
}
else
throw std::string ("Error: missing '}' at position ") +
format ((int) n.cursor ());
delete obj;
}
@ -319,7 +328,13 @@ bool json::object::parse_pair (
nibbler = n;
return true;
}
else
throw std::string ("Error: missing value at position ") +
format ((int) n.cursor ());
}
else
throw std::string ("Error: missing ':' at position ") +
format ((int) n.cursor ());
}
return NULL;
@ -372,7 +387,8 @@ json::value* json::parse (const std::string& input)
if (!n.depleted ())
{
delete root;
throw std::string ("Error: extra characters found: ") + n.dump ();
throw std::string ("Error: extra characters found at position ") +
format ((int) n.cursor ());
}
return root;