add C enum generation

driftregion · Jan 27, 2022 · 35f3bef · howerj · Jan 27, 2022 · howerj
1 parent 68139f7
commit 35f3bef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/2c.c b/2c.c
@@ -864,6 +864,16 @@ static int msg2h_types(dbc_t *dbc, FILE *h, dbc2c_options_t *copts)
 	assert(dbc);
 	assert(copts);
 
+	for (size_t i = 0; i < dbc->val_count; i++) {
+		val_list_t *list = dbc->vals[i];
+		fprintf(h, "typedef enum {\n");
+		for (size_t j = 0; j < list->val_list_item_count; j++) {
+			val_list_item_t *item = list->val_list_items[j];
+			fprintf(h, "\t%s_%s=%d,\n", list->name, item->name, item->value);
+		}
+		fprintf(h, "} %s_e;\n\n", list->name);
+	}
+
 	for (size_t i = 0; i < dbc->message_count; i++) {
 		can_msg_t *msg = dbc->messages[i];
 		char name[MAX_NAME_LENGTH] = {0};

diff --git a/parse.c b/parse.c
@@ -106,7 +106,7 @@ static const char *dbc_grammar =
 "                        |    <comment_string> "
 "                        ) <s>* ';' <n> ;\n "
 " comments              : <comment>* ; "
-" dbc       : <version> <symbols> <bs> <ecus> <values>* <n>* <messages> (<n>|<sigval>|<types>)*  ; \n" ;
+" dbc       : <version> <symbols> <bs> <ecus> <values>* <n>* <messages> <comments> <sigval>* <attribute_definition>* <attribute_value>* <vals>  ; \n" ;
 
 const char *parse_get_grammar(void)
 {