From 92d4481a682fa5872a87a822b1f070ae212451ee Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 29 Oct 2007 16:45:25 +0000 Subject: [PATCH] 2007-10-29 Emmanuele Bassi * clutter/json/json-parser.c: Enable parsing of negative numbers; GScanner splits negative numbers into two tokens, so we need to special case them. --- ChangeLog | 6 ++++ clutter/json/json-parser.c | 73 +++++++++++++++++++++++++++++++++++--- 2 files changed, 75 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 765ca4adc..8e063aca9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-29 Emmanuele Bassi + + * clutter/json/json-parser.c: Enable parsing of negative numbers; + GScanner splits negative numbers into two tokens, so we need to + special case them. + 2007-10-29 Emmanuele Bassi * clutter/clutter-script.c: Add the :filename and :filename-set diff --git a/clutter/json/json-parser.c b/clutter/json/json-parser.c index 1ced2b224..d7c960cf9 100644 --- a/clutter/json/json-parser.c +++ b/clutter/json/json-parser.c @@ -353,6 +353,7 @@ json_parse_array (JsonParser *parser, while (token != G_TOKEN_RIGHT_BRACE) { JsonNode *node = NULL; + gboolean negative = FALSE; if (token == G_TOKEN_COMMA) { @@ -427,16 +428,34 @@ json_parse_array (JsonParser *parser, continue; } + if (token == '-') + { + guint next_token = g_scanner_peek_next_token (scanner); + + if (next_token == G_TOKEN_INT || + next_token == G_TOKEN_FLOAT) + { + negative = TRUE; + token = g_scanner_get_next_token (scanner); + } + else + { + return G_TOKEN_INT; + } + } + switch (token) { case G_TOKEN_INT: node = json_node_new (JSON_NODE_VALUE); - json_node_set_int (node, scanner->value.v_int); + json_node_set_int (node, negative ? scanner->value.v_int * -1 + : scanner->value.v_int); break; case G_TOKEN_FLOAT: node = json_node_new (JSON_NODE_VALUE); - json_node_set_double (node, scanner->value.v_float); + json_node_set_double (node, negative ? scanner->value.v_float * -1.0 + : scanner->value.v_float); break; case G_TOKEN_STRING: @@ -505,6 +524,7 @@ json_parse_object (JsonParser *parser, { JsonNode *node = NULL; gchar *name = NULL; + gboolean negative = FALSE; if (token == G_TOKEN_COMMA) { @@ -610,16 +630,33 @@ json_parse_object (JsonParser *parser, continue; } + if (token == '-') + { + guint next_token = g_scanner_peek_next_token (scanner); + + if (next_token == G_TOKEN_INT || next_token == G_TOKEN_FLOAT) + { + negative = TRUE; + token = g_scanner_get_next_token (scanner); + } + else + { + return G_TOKEN_INT; + } + } + switch (token) { case G_TOKEN_INT: node = json_node_new (JSON_NODE_VALUE); - json_node_set_int (node, scanner->value.v_int); + json_node_set_int (node, negative ? scanner->value.v_int * -1 + : scanner->value.v_int); break; case G_TOKEN_FLOAT: node = json_node_new (JSON_NODE_VALUE); - json_node_set_double (node, scanner->value.v_float); + json_node_set_double (node, negative ? scanner->value.v_float * -1.0 + : scanner->value.v_float); break; case G_TOKEN_STRING: @@ -693,6 +730,34 @@ json_parse_statement (JsonParser *parser, token == JSON_TOKEN_TRUE ? TRUE : FALSE); return G_TOKEN_NONE; + case '-': + { + guint next_token = g_scanner_peek_next_token (scanner); + + if (next_token == G_TOKEN_INT || next_token == G_TOKEN_FLOAT) + { + priv->root = priv->current_node = json_node_new (JSON_NODE_VALUE); + + token = g_scanner_get_next_token (scanner); + switch (token) + { + case G_TOKEN_INT: + json_node_set_int (priv->current_node, scanner->value.v_int); + break; + case G_TOKEN_FLOAT: + json_node_set_double (priv->current_node, scanner->value.v_float); + break; + default: + break; + } + + return G_TOKEN_NONE; + } + else + return G_TOKEN_INT; + } + break; + case G_TOKEN_INT: case G_TOKEN_FLOAT: case G_TOKEN_STRING: