X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=libecoli_yaml%2Fecoli_yaml.c;h=84007d55b96a756ff1d3f8c60b38b1bc908eff62;hb=7dfc4c9ed511c058b0ac47826742aec7b5175ecd;hp=63af83b0760b781ecbbcf6d215f1fa257cc1c0ee;hpb=4474db15e8601cb8aa1a3a8c3b4ae6d8cecd340a;p=protos%2Flibecoli.git

diff --git a/libecoli_yaml/ecoli_yaml.c b/libecoli_yaml/ecoli_yaml.c
index 63af83b..84007d5 100644
--- a/libecoli_yaml/ecoli_yaml.c
+++ b/libecoli_yaml/ecoli_yaml.c
@@ -11,6 +11,9 @@
 #include <assert.h>
 
 #include <yaml.h>
+
+#include <ecoli_malloc.h>
+#include <ecoli_keyval.h>
 #include <ecoli_node.h>
 #include <ecoli_config.h>
 #include <ecoli_yaml.h>
@@ -28,16 +31,16 @@ struct enode_table {
 };
 
 static struct ec_node *
-parse_ec_node(struct ec_node **root, struct enode_table *table,
-	const yaml_document_t *document, const yaml_node_t *ynode);
+parse_ec_node(struct enode_table *table, const yaml_document_t *document,
+	const yaml_node_t *ynode);
 
 static struct ec_config *
-parse_ec_config_list(struct ec_node **root, struct enode_table *table,
+parse_ec_config_list(struct enode_table *table,
 		const struct ec_config_schema *schema,
 		const yaml_document_t *document, const yaml_node_t *ynode);
 
 static struct ec_config *
-parse_ec_config_dict(struct ec_node **root, struct enode_table *table,
+parse_ec_config_dict(struct enode_table *table,
 		const struct ec_config_schema *schema,
 		const yaml_document_t *document, const yaml_node_t *ynode);
 
@@ -133,7 +136,7 @@ free_table(struct enode_table *table)
 }
 
 static struct ec_config *
-parse_ec_config(struct ec_node **root, struct enode_table *table,
+parse_ec_config(struct enode_table *table,
 		const struct ec_config_schema *schema_elt,
 		const yaml_document_t *document, const yaml_node_t *ynode)
 {
@@ -210,10 +213,11 @@ parse_ec_config(struct ec_node **root, struct enode_table *table,
 		}
 		break;
 	case EC_CONFIG_TYPE_NODE:
-		enode = parse_ec_node(root, table, document, ynode);
+		enode = parse_ec_node(table, document, ynode);
 		if (enode == NULL)
 			goto fail;
 		config = ec_config_node(enode);
+		enode = NULL;
 		if (config == NULL) {
 			fprintf(stderr, "Failed to create config\n");
 			goto fail;
@@ -225,7 +229,7 @@ parse_ec_config(struct ec_node **root, struct enode_table *table,
 			fprintf(stderr, "List has no subschema\n");
 			goto fail;
 		}
-		config = parse_ec_config_list(root, table, subschema, document, ynode);
+		config = parse_ec_config_list(table, subschema, document, ynode);
 		if (config == NULL)
 			goto fail;
 		break;
@@ -235,7 +239,7 @@ parse_ec_config(struct ec_node **root, struct enode_table *table,
 			fprintf(stderr, "Dict has no subschema\n");
 			goto fail;
 		}
-		config = parse_ec_config_dict(root, table, subschema, document, ynode);
+		config = parse_ec_config_dict(table, subschema, document, ynode);
 		if (config == NULL)
 			goto fail;
 		break;
@@ -253,7 +257,7 @@ fail:
 }
 
 static struct ec_config *
-parse_ec_config_list(struct ec_node **root, struct enode_table *table,
+parse_ec_config_list(struct enode_table *table,
 		const struct ec_config_schema *schema,
 		const yaml_document_t *document, const yaml_node_t *ynode)
 {
@@ -275,7 +279,7 @@ parse_ec_config_list(struct ec_node **root, struct enode_table *table,
 	for (item = ynode->data.sequence.items.start;
 	     item < ynode->data.sequence.items.top; item++) {
 		value = document->nodes.start + (*item) - 1; // XXX -1 ?
-		subconfig = parse_ec_config(root, table, schema, document, value);
+		subconfig = parse_ec_config(table, schema, document, value);
 		if (subconfig == NULL)
 			goto fail;
 		if (ec_config_list_add(config, subconfig) < 0) {
@@ -292,7 +296,7 @@ fail:
 }
 
 static struct ec_config *
-parse_ec_config_dict(struct ec_node **root, struct enode_table *table,
+parse_ec_config_dict(struct enode_table *table,
 		const struct ec_config_schema *schema,
 		const yaml_document_t *document, const yaml_node_t *ynode)
 {
@@ -326,7 +330,7 @@ parse_ec_config_dict(struct ec_node **root, struct enode_table *table,
 			fprintf(stderr, "No such config %s\n", key_str);
 			goto fail;
 		}
-		subconfig = parse_ec_config(root, table, schema_elt, document, value);
+		subconfig = parse_ec_config(table, schema_elt, document, value);
 		if (subconfig == NULL)
 			goto fail;
 		if (ec_config_dict_set(config, key_str, subconfig) < 0) {
@@ -343,12 +347,13 @@ fail:
 }
 
 static struct ec_node *
-parse_ec_node(struct ec_node **root, struct enode_table *table,
+parse_ec_node(struct enode_table *table,
 	const yaml_document_t *document, const yaml_node_t *ynode)
 {
 	const struct ec_config_schema *schema;
 	const struct ec_node_type *type = NULL;
-	const char *id = NULL, *help = NULL;
+	const char *id = NULL;
+	char *help = NULL;
 	struct ec_config *config = NULL;
 	const yaml_node_t *attrs = NULL;
 	const yaml_node_t *key, *value;
@@ -412,7 +417,11 @@ parse_ec_node(struct ec_node **root, struct enode_table *table,
 				fprintf(stderr, "Help must be a scalar\n");
 				goto fail;
 			}
-			help = value_str;
+			help = ec_strdup(value_str);
+			if (help == NULL) {
+				fprintf(stderr, "Failed to allocate help\n");
+				goto fail;
+			}
 		}
 	}
 
@@ -428,10 +437,6 @@ parse_ec_node(struct ec_node **root, struct enode_table *table,
 		fprintf(stderr, "Cannot add node in table\n");
 		goto fail;
 	}
-	if (*root == NULL) {
-		ec_node_clone(enode);
-		*root = enode;
-	}
 
 	/* create its config */
 	schema = ec_node_type_schema(type);
@@ -441,14 +446,26 @@ parse_ec_node(struct ec_node **root, struct enode_table *table,
 		goto fail;
 	}
 
-	config = parse_ec_config_dict(root, table, schema, document, ynode);
+	config = parse_ec_config_dict(table, schema, document, ynode);
 	if (config == NULL)
 		goto fail;
 
 	if (ec_node_set_config(enode, config) < 0) {
+		config = NULL; /* freed */
 		fprintf(stderr, "Failed to set config\n");
 		goto fail;
 	}
+	config = NULL; /* freed */
+
+	if (help != NULL) {
+		if (ec_keyval_set(ec_node_attrs(enode), "help", help,
+					ec_free_func) < 0) {
+			fprintf(stderr, "Failed to set help\n");
+			help = NULL;
+			goto fail;
+		}
+		help = NULL;
+	}
 
 	/* add attributes (all as string) */
 	//XXX
@@ -458,20 +475,19 @@ parse_ec_node(struct ec_node **root, struct enode_table *table,
 fail:
 	ec_node_free(enode);
 	ec_config_free(config);
+	ec_free(help);
+
 	return NULL;
 }
 
-static int
-parse_document(struct ec_node **root, struct enode_table *table,
+static struct ec_node *
+parse_document(struct enode_table *table,
 	const yaml_document_t *document)
 {
 	yaml_node_t *node;
 
 	node = document->nodes.start;
-	if (parse_ec_node(root, table, document, node) == NULL)
-		return -1;
-
-	return 0;
+	return parse_ec_node(table, document, node);
 }
 
 struct ec_node *
@@ -508,7 +524,8 @@ ec_yaml_import(const char *filename)
 		goto fail;
 	}
 
-	if (parse_document(&root, &table, &document) < 0) {
+	root = parse_document(&table, &document);
+	if (root == NULL) {
 		fprintf(stderr, "Failed to parse document\n");
 		goto fail;
 	}
@@ -526,6 +543,7 @@ fail_no_doc:
 	yaml_parser_delete(&parser);
 	if (file != NULL)
 		fclose(file);
+	free_table(&table);
 	ec_node_free(root);
 
 	return NULL;