brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[script] Simplify the parser code

Browse Source 
JSON-GLib provides simple accessors for basic types so that we
can avoid getting the JsonNode out of a complex type. This makes
the code simpler to understand.
This commit is contained in:
Emmanuele Bassi 2009-06-29 16:33:36 +01:00
parent 354fa437cd
commit df572d089c
1 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
clutter/clutter-script.c
View File

@ -281,11 +281,7 @@ get_id_from_node (JsonNode *node)
case JSON_NODE_OBJECT: case JSON_NODE_OBJECT:
object = json_node_get_object (node); object = json_node_get_object (node);
if (json_object_has_member (object, "id")) if (json_object_has_member (object, "id"))
{ return json_object_get_string_member (object, "id");
JsonNode *id = json_object_get_member (object, "id");
return json_node_get_string (id);
}
break; break;
case JSON_NODE_VALUE: case JSON_NODE_VALUE:
@ -372,11 +368,8 @@ parse_signals (ClutterScript *script,
} }
else else
{ {
val = json_object_get_member (object, "name"); name = json_object_get_string_member (object, "name");
if ((JSON_NODE_TYPE (val) == JSON_NODE_VALUE) && if (!name)
json_node_get_string (val) != NULL)
name = json_node_get_string (val);
else
{ {
warn_invalid_value (script, "name", "string", val); warn_invalid_value (script, "name", "string", val);
continue; continue;
@ -391,11 +384,8 @@ parse_signals (ClutterScript *script,
} }
else else
{ {
val = json_object_get_member (object, "handler"); handler = json_object_get_string_member (object, "handler");
if ((JSON_NODE_TYPE (val) == JSON_NODE_VALUE) && if (!handler)
json_node_get_string (val) != NULL)
handler = json_node_get_string (val);
else
{ {
warn_invalid_value (script, "handler", "string", val); warn_invalid_value (script, "handler", "string", val);
continue; continue;
@ -404,30 +394,21 @@ parse_signals (ClutterScript *script,
/* optional: "object" */ /* optional: "object" */
if (json_object_has_member (object, "object")) if (json_object_has_member (object, "object"))
{ connect = json_object_get_string_member (object, "object");
val = json_object_get_member (object, "object");
if ((JSON_NODE_TYPE (val) == JSON_NODE_VALUE) &&
json_node_get_string (val) != NULL)
connect = json_node_get_string (val);
else
connect = NULL;
}
else else
connect = NULL; connect = NULL;
/* optional: "after" */ /* optional: "after" */
if (json_object_has_member (object, "after")) if (json_object_has_member (object, "after"))
{ {
val = json_object_get_member (object, "after"); if (json_object_get_boolean_member (object, "after"))
if (json_node_get_boolean (val))
flags |= G_CONNECT_AFTER; flags |= G_CONNECT_AFTER;
} }
/* optional: "swapped" */ /* optional: "swapped" */
if (json_object_has_member (object, "swapped")) if (json_object_has_member (object, "swapped"))
{ {
val = json_object_get_member (object, "swapped"); if (json_object_get_boolean_member (object, "swapped"))
if (json_node_get_boolean (val))
flags |= G_CONNECT_SWAPPED; flags |= G_CONNECT_SWAPPED;
} }
@ -764,8 +745,8 @@ json_object_end (JsonParser *parser,
if (strcmp (oinfo->class_name, "ClutterStage") == 0 && if (strcmp (oinfo->class_name, "ClutterStage") == 0 &&
json_object_has_member (object, "is-default")) json_object_has_member (object, "is-default"))
{ {
val = json_object_get_member (object, "is-default"); oinfo->is_stage_default =
oinfo->is_stage_default = json_node_get_boolean (val); json_object_get_boolean_member (object, "is-default");
json_object_remove_member (object, "is-default"); json_object_remove_member (object, "is-default");
} }