removed unused files - closes #47
This commit is contained in:
Mikulas Florek
parent
9e059f5965
commit
58305484cb
8 changed files with 0 additions and 509 deletions
|
|
@ -93,8 +93,6 @@
|
|||
<ClCompile Include="..\..\src\core\file_system.cpp" />
|
||||
<ClCompile Include="..\..\src\core\file_utils.cpp" />
|
||||
<ClCompile Include="..\..\src\core\istream.cpp" />
|
||||
<ClCompile Include="..\..\src\core\jsmn.cpp" />
|
||||
<ClCompile Include="..\..\src\core\json_object.cpp" />
|
||||
<ClCompile Include="..\..\src\core\json_serializer.cpp" />
|
||||
<ClCompile Include="..\..\src\core\log.cpp" />
|
||||
<ClCompile Include="..\..\src\core\math_utils.cpp" />
|
||||
|
|
@ -137,8 +135,6 @@
|
|||
<ClInclude Include="..\..\src\core\lux.h" />
|
||||
<ClInclude Include="..\..\src\core\event_manager.h" />
|
||||
<ClInclude Include="..\..\src\core\istream.h" />
|
||||
<ClInclude Include="..\..\src\core\jsmn.h" />
|
||||
<ClInclude Include="..\..\src\core\json_object.h" />
|
||||
<ClInclude Include="..\..\src\core\json_serializer.h" />
|
||||
<ClInclude Include="..\..\src\core\map.h" />
|
||||
<ClInclude Include="..\..\src\core\math_utils.h" />
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
<ClCompile Include="..\..\src\core\crc32.cpp" />
|
||||
<ClCompile Include="..\..\src\core\event_manager.cpp" />
|
||||
<ClCompile Include="..\..\src\core\istream.cpp" />
|
||||
<ClCompile Include="..\..\src\core\jsmn.cpp" />
|
||||
<ClCompile Include="..\..\src\core\json_object.cpp" />
|
||||
<ClCompile Include="..\..\src\core\json_serializer.cpp" />
|
||||
<ClCompile Include="..\..\src\core\matrix.cpp" />
|
||||
<ClCompile Include="..\..\src\core\quat.cpp" />
|
||||
|
|
@ -51,8 +49,6 @@
|
|||
<ClInclude Include="..\..\src\core\crc32.h" />
|
||||
<ClInclude Include="..\..\src\core\event_manager.h" />
|
||||
<ClInclude Include="..\..\src\core\istream.h" />
|
||||
<ClInclude Include="..\..\src\core\jsmn.h" />
|
||||
<ClInclude Include="..\..\src\core\json_object.h" />
|
||||
<ClInclude Include="..\..\src\core\json_serializer.h" />
|
||||
<ClInclude Include="..\..\src\core\map.h" />
|
||||
<ClInclude Include="..\..\src\core\matrix.h" />
|
||||
|
|
|
|||
|
|
@ -35,8 +35,6 @@ class LUX_CORE_API EventManager
|
|||
void emitEvent(Event& event);
|
||||
|
||||
private:
|
||||
typedef uint32_t EventType;
|
||||
|
||||
typedef map<Event::Type, PODArray<Listener> > ListenerMap;
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -1,254 +0,0 @@
|
|||
#include <stdlib.h>
|
||||
|
||||
#include "jsmn.h"
|
||||
|
||||
/**
|
||||
* Allocates a fresh unused token from the token pull.
|
||||
*/
|
||||
static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
|
||||
jsmntok_t *tokens, size_t num_tokens) {
|
||||
jsmntok_t *tok;
|
||||
if (parser->toknext >= (int)num_tokens) {
|
||||
return NULL;
|
||||
}
|
||||
tok = &tokens[parser->toknext++];
|
||||
tok->start = tok->end = -1;
|
||||
tok->size = 0;
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
tok->parent = -1;
|
||||
#endif
|
||||
return tok;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fills token type and boundaries.
|
||||
*/
|
||||
static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type,
|
||||
int start, int end) {
|
||||
token->type = type;
|
||||
token->start = start;
|
||||
token->end = end;
|
||||
token->size = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fills next available token with JSON primitive.
|
||||
*/
|
||||
static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js,
|
||||
jsmntok_t *tokens, size_t num_tokens) {
|
||||
jsmntok_t *token;
|
||||
int start;
|
||||
|
||||
start = parser->pos;
|
||||
|
||||
for (; js[parser->pos] != '\0'; parser->pos++) {
|
||||
switch (js[parser->pos]) {
|
||||
#ifndef JSMN_STRICT
|
||||
/* In strict mode primitive must be followed by "," or "}" or "]" */
|
||||
case ':':
|
||||
#endif
|
||||
case '\t' : case '\r' : case '\n' : case ' ' :
|
||||
case ',' : case ']' : case '}' :
|
||||
goto found;
|
||||
}
|
||||
if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
}
|
||||
#ifdef JSMN_STRICT
|
||||
/* In strict mode primitive must be followed by a comma/object/array */
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_PART;
|
||||
#endif
|
||||
|
||||
found:
|
||||
token = jsmn_alloc_token(parser, tokens, num_tokens);
|
||||
if (token == NULL) {
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_NOMEM;
|
||||
}
|
||||
jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
token->parent = parser->toksuper;
|
||||
#endif
|
||||
parser->pos--;
|
||||
return JSMN_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* Filsl next token with JSON string.
|
||||
*/
|
||||
static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js,
|
||||
jsmntok_t *tokens, size_t num_tokens) {
|
||||
jsmntok_t *token;
|
||||
|
||||
int start = parser->pos;
|
||||
|
||||
parser->pos++;
|
||||
|
||||
/* Skip starting quote */
|
||||
for (; js[parser->pos] != '\0'; parser->pos++) {
|
||||
char c = js[parser->pos];
|
||||
|
||||
/* Quote: end of string */
|
||||
if (c == '\"') {
|
||||
token = jsmn_alloc_token(parser, tokens, num_tokens);
|
||||
if (token == NULL) {
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_NOMEM;
|
||||
}
|
||||
jsmn_fill_token(token, JSMN_STRING, start+1, parser->pos);
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
token->parent = parser->toksuper;
|
||||
#endif
|
||||
return JSMN_SUCCESS;
|
||||
}
|
||||
|
||||
/* Backslash: Quoted symbol expected */
|
||||
if (c == '\\') {
|
||||
parser->pos++;
|
||||
switch (js[parser->pos]) {
|
||||
/* Allowed escaped symbols */
|
||||
case '\"': case '/' : case '\\' : case 'b' :
|
||||
case 'f' : case 'r' : case 'n' : case 't' :
|
||||
break;
|
||||
/* Allows escaped symbol \uXXXX */
|
||||
case 'u':
|
||||
/* TODO */
|
||||
break;
|
||||
/* Unexpected symbol */
|
||||
default:
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
}
|
||||
}
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_PART;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse JSON string and fill tokens.
|
||||
*/
|
||||
jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens,
|
||||
unsigned int num_tokens) {
|
||||
jsmnerr_t r;
|
||||
int i;
|
||||
jsmntok_t *token;
|
||||
|
||||
for (; js[parser->pos] != '\0'; parser->pos++) {
|
||||
char c;
|
||||
jsmntype_t type;
|
||||
|
||||
c = js[parser->pos];
|
||||
switch (c) {
|
||||
case '{': case '[':
|
||||
token = jsmn_alloc_token(parser, tokens, num_tokens);
|
||||
if (token == NULL)
|
||||
return JSMN_ERROR_NOMEM;
|
||||
if (parser->toksuper != -1) {
|
||||
tokens[parser->toksuper].size++;
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
token->parent = parser->toksuper;
|
||||
#endif
|
||||
}
|
||||
token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
|
||||
token->start = parser->pos;
|
||||
parser->toksuper = parser->toknext - 1;
|
||||
break;
|
||||
case '}': case ']':
|
||||
type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY);
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
if (parser->toknext < 1) {
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
token = &tokens[parser->toknext - 1];
|
||||
for (;;) {
|
||||
if (token->start != -1 && token->end == -1) {
|
||||
if (token->type != type) {
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
token->end = parser->pos + 1;
|
||||
parser->toksuper = token->parent;
|
||||
break;
|
||||
}
|
||||
if (token->parent == -1) {
|
||||
break;
|
||||
}
|
||||
token = &tokens[token->parent];
|
||||
}
|
||||
#else
|
||||
for (i = parser->toknext - 1; i >= 0; i--) {
|
||||
token = &tokens[i];
|
||||
if (token->start != -1 && token->end == -1) {
|
||||
if (token->type != type) {
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
parser->toksuper = -1;
|
||||
token->end = parser->pos + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* Error if unmatched closing bracket */
|
||||
if (i == -1) return JSMN_ERROR_INVAL;
|
||||
for (; i >= 0; i--) {
|
||||
token = &tokens[i];
|
||||
if (token->start != -1 && token->end == -1) {
|
||||
parser->toksuper = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
case '\"':
|
||||
r = jsmn_parse_string(parser, js, tokens, num_tokens);
|
||||
if (r < 0) return r;
|
||||
if (parser->toksuper != -1)
|
||||
tokens[parser->toksuper].size++;
|
||||
break;
|
||||
case '\t' : case '\r' : case '\n' : case ':' : case ',': case ' ':
|
||||
break;
|
||||
#ifdef JSMN_STRICT
|
||||
/* In strict mode primitives are: numbers and booleans */
|
||||
case '-': case '0': case '1' : case '2': case '3' : case '4':
|
||||
case '5': case '6': case '7' : case '8': case '9':
|
||||
case 't': case 'f': case 'n' :
|
||||
#else
|
||||
/* In non-strict mode every unquoted value is a primitive */
|
||||
default:
|
||||
#endif
|
||||
r = jsmn_parse_primitive(parser, js, tokens, num_tokens);
|
||||
if (r < 0) return r;
|
||||
if (parser->toksuper != -1)
|
||||
tokens[parser->toksuper].size++;
|
||||
break;
|
||||
|
||||
#ifdef JSMN_STRICT
|
||||
/* Unexpected char in strict mode */
|
||||
default:
|
||||
return JSMN_ERROR_INVAL;
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
for (i = parser->toknext - 1; i >= 0; i--) {
|
||||
/* Unmatched opened object or array */
|
||||
if (tokens[i].start != -1 && tokens[i].end == -1) {
|
||||
return JSMN_ERROR_PART;
|
||||
}
|
||||
}
|
||||
|
||||
return JSMN_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new parser based over a given buffer with an array of tokens
|
||||
* available.
|
||||
*/
|
||||
void jsmn_init(jsmn_parser *parser) {
|
||||
parser->pos = 0;
|
||||
parser->toknext = 0;
|
||||
parser->toksuper = -1;
|
||||
}
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/lux.h"
|
||||
|
||||
/**
|
||||
* JSON type identifier. Basic types are:
|
||||
* o Object
|
||||
* o Array
|
||||
* o String
|
||||
* o Other primitive: number, boolean (true/false) or null
|
||||
*/
|
||||
typedef enum {
|
||||
JSMN_PRIMITIVE = 0,
|
||||
JSMN_OBJECT = 1,
|
||||
JSMN_ARRAY = 2,
|
||||
JSMN_STRING = 3
|
||||
} jsmntype_t;
|
||||
|
||||
typedef enum {
|
||||
/* Not enough tokens were provided */
|
||||
JSMN_ERROR_NOMEM = -1,
|
||||
/* Invalid character inside JSON string */
|
||||
JSMN_ERROR_INVAL = -2,
|
||||
/* The string is not a full JSON packet, more bytes expected */
|
||||
JSMN_ERROR_PART = -3,
|
||||
/* Everything was fine */
|
||||
JSMN_SUCCESS = 0
|
||||
} jsmnerr_t;
|
||||
|
||||
/**
|
||||
* JSON token description.
|
||||
* @param type type (object, array, string etc.)
|
||||
* @param start start position in JSON data string
|
||||
* @param end end position in JSON data string
|
||||
*/
|
||||
typedef struct {
|
||||
jsmntype_t type;
|
||||
int start;
|
||||
int end;
|
||||
int size;
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
int parent;
|
||||
#endif
|
||||
} jsmntok_t;
|
||||
|
||||
/**
|
||||
* JSON parser. Contains an array of token blocks available. Also stores
|
||||
* the string being parsed now and current position in that string
|
||||
*/
|
||||
typedef struct {
|
||||
unsigned int pos; /* offset in the JSON string */
|
||||
int toknext; /* next token to allocate */
|
||||
int toksuper; /* superior token node, e.g parent object or array */
|
||||
} jsmn_parser;
|
||||
|
||||
/**
|
||||
* Create JSON parser over an array of tokens
|
||||
*/
|
||||
LUX_CORE_API void jsmn_init(jsmn_parser *parser);
|
||||
|
||||
/**
|
||||
* Run JSON parser. It parses a JSON data string into and array of tokens, each describing
|
||||
* a single JSON object.
|
||||
*/
|
||||
LUX_CORE_API jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js,
|
||||
jsmntok_t *tokens, unsigned int num_tokens);
|
||||
|
|
@ -1,148 +0,0 @@
|
|||
#include "json_object.h"
|
||||
#include <cstring>
|
||||
#include <cstdio>
|
||||
|
||||
|
||||
JsonObject::JsonObject(int m_token_idx, const char* data, jsmntok_t* m_tokens)
|
||||
{
|
||||
this->m_token_idx = m_token_idx;
|
||||
this->m_data = data;
|
||||
this->m_tokens = m_tokens;
|
||||
}
|
||||
|
||||
|
||||
JsonObject JsonObject::operator[](const char* name) const
|
||||
{
|
||||
return getProperty(name);
|
||||
}
|
||||
|
||||
|
||||
JsonObject JsonObject::operator[](int index) const
|
||||
{
|
||||
return getArrayItem(index);
|
||||
}
|
||||
|
||||
|
||||
JsonObject::operator unsigned int() const
|
||||
{
|
||||
if(m_token_idx == -1 || m_tokens[m_token_idx].type != JSMN_PRIMITIVE)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
unsigned int tmp;
|
||||
sscanf_s(getStart(), "%u", &tmp);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
|
||||
int JsonObject::skip(int index) const
|
||||
{
|
||||
switch(m_tokens[index].type)
|
||||
{
|
||||
case JSMN_STRING:
|
||||
case JSMN_PRIMITIVE:
|
||||
return index + 1;
|
||||
case JSMN_ARRAY:
|
||||
case JSMN_OBJECT:
|
||||
{
|
||||
int i = index + 1;
|
||||
int end = m_tokens[index].end;
|
||||
while(m_tokens[i].start < end)
|
||||
{
|
||||
++i;
|
||||
}
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
JsonObject JsonObject::getProperty(const char* name) const
|
||||
{
|
||||
if(m_token_idx == -1 || m_tokens[m_token_idx].type != JSMN_OBJECT)
|
||||
{
|
||||
return JsonObject(-1, m_data, m_tokens);
|
||||
}
|
||||
int idx = m_token_idx + 1;
|
||||
int len = strlen(name);
|
||||
while(m_tokens[idx].start < m_tokens[m_token_idx].end)
|
||||
{
|
||||
if(strncmp(m_data + m_tokens[idx].start, name, len) == 0)
|
||||
{
|
||||
switch(m_tokens[idx + 1].type)
|
||||
{
|
||||
case JSMN_ARRAY:
|
||||
return JsonObject(idx + 1, m_data, m_tokens);
|
||||
case JSMN_OBJECT:
|
||||
return JsonObject(idx + 1, m_data, m_tokens);
|
||||
case JSMN_STRING:
|
||||
return JsonObject(idx + 1, m_data, m_tokens);
|
||||
case JSMN_PRIMITIVE:
|
||||
return JsonObject(idx + 1, m_data, m_tokens);
|
||||
}
|
||||
}
|
||||
idx = skip(idx + 1);
|
||||
}
|
||||
return JsonObject(-1, m_data, m_tokens);
|
||||
}
|
||||
|
||||
|
||||
bool JsonObject::toString(char* str, int max_size) const
|
||||
{
|
||||
if(m_token_idx == -1 || m_tokens[m_token_idx].type != JSMN_STRING)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
strncpy_s(str, max_size, m_data + m_tokens[m_token_idx].start, m_tokens[m_token_idx].end - m_tokens[m_token_idx].start);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
JsonObject JsonObject::getArrayItem(int index) const
|
||||
{
|
||||
if(m_token_idx == -1 || m_tokens[m_token_idx].type != JSMN_ARRAY)
|
||||
{
|
||||
return JsonObject(-1, m_data, m_tokens);
|
||||
}
|
||||
int idx = m_token_idx + 1;
|
||||
int countdown = index;
|
||||
while(m_tokens[idx].start < m_tokens[m_token_idx].end)
|
||||
{
|
||||
if(countdown == 0)
|
||||
{
|
||||
switch(m_tokens[idx].type)
|
||||
{
|
||||
case JSMN_ARRAY:
|
||||
return JsonObject(idx, m_data, m_tokens);
|
||||
case JSMN_OBJECT:
|
||||
return JsonObject(idx, m_data, m_tokens);
|
||||
case JSMN_STRING:
|
||||
return JsonObject(idx, m_data, m_tokens);
|
||||
case JSMN_PRIMITIVE:
|
||||
return JsonObject(idx, m_data, m_tokens);
|
||||
}
|
||||
}
|
||||
--countdown;
|
||||
idx = skip(idx);
|
||||
}
|
||||
return JsonObject(-1, m_data, m_tokens);
|
||||
}
|
||||
|
||||
|
||||
const char* JsonObject::getStart() const
|
||||
{
|
||||
return m_data + m_tokens[m_token_idx].start;
|
||||
}
|
||||
|
||||
|
||||
int JsonObject::getLength() const
|
||||
{
|
||||
return m_tokens[m_token_idx].end - m_tokens[m_token_idx].start;
|
||||
}
|
||||
|
||||
|
||||
bool JsonObject::isString() const
|
||||
{
|
||||
return m_token_idx >= 0 && m_tokens[m_token_idx].type == JSMN_STRING;
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
|
||||
#include "core/lux.h"
|
||||
#include "jsmn.h"
|
||||
|
||||
|
||||
class LUX_CORE_API JsonObject
|
||||
{
|
||||
public:
|
||||
JsonObject(int token_idx, const char* data, jsmntok_t* tokens);
|
||||
|
||||
JsonObject operator[](const char* name) const;
|
||||
JsonObject operator[](int index) const;
|
||||
operator unsigned int() const;
|
||||
JsonObject getProperty(const char* name) const;
|
||||
JsonObject getArrayItem(int index) const;
|
||||
bool isString() const;
|
||||
const char* getStart() const;
|
||||
int getLength() const;
|
||||
bool toString(char* str, int max_size) const;
|
||||
|
||||
private:
|
||||
int skip(int index) const;
|
||||
|
||||
private:
|
||||
int m_token_idx;
|
||||
const char* m_data;
|
||||
jsmntok_t* m_tokens;
|
||||
};
|
||||
|
|
@ -10,7 +10,6 @@
|
|||
#include "core/file_system.h"
|
||||
#include "core/ifile.h"
|
||||
#include "core/iserializer.h"
|
||||
#include "core/json_object.h"
|
||||
#include "core/matrix.h"
|
||||
#include "engine/engine.h"
|
||||
#include "universe/component_event.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue