Grammar: added rule array

src/lib/grammar.c

@@ -39,6 +39,17 @@ struct symbol_info
 	bool is_terminal;
 };
 
+struct rule_info
+{
+	rule_t id;
+
+	size_t src_n;
+	symbol_t * src;
+
+	size_t dest_n;
+	symbol_t * dest;
+};
+
 struct GR_Grammar
 {
 	/*@only@*/ char * name;
@@ -47,6 +58,9 @@ struct GR_Grammar
 
 	size_t symbol_n;
 	struct symbol_info * symbols;
+
+	size_t rule_n;
+	struct rule_info * rules;
 };
 
 
@@ -105,6 +119,9 @@ GR_Grammar_new (const char * name,
 	grammar->symbols = NULL;
 	grammar->symbol_n = 0;
 
+	grammar->rules = NULL;
+	grammar->rule_n = 0;
+
 	set_success (status);
 	return grammar;
 
@@ -142,6 +159,9 @@ GR_Grammar_raw_new (/*@only@*/ char * name,
 	grammar->symbols = NULL;
 	grammar->symbol_n = 0;
 
+	grammar->rules = NULL;
+	grammar->rule_n = 0;
+
 	set_success (status);
 	return grammar;
 }
@@ -158,6 +178,12 @@ GR_Grammar_free (/*@out@*/ struct GR_Grammar * grammar)
 		free (grammar->symbols[i].name);
 	}
 
+	for (size_t i = 0; i < grammar->rule_n; i++)
+	{
+		free (grammar->rules[i].src);
+		free (grammar->rules[i].dest);
+	}
+
 	free (grammar);
 	return;
 }

src/lib/grammar.h

@@ -38,6 +38,12 @@ typedef unsigned int symbol_t;
 #define SYMBOL_MAX UINT_MAX
 
 
+typedef unsigned int rule_t;
+
+#define RULE_ERR 0
+#define RULE_MAX UINT_MAX
+
+
 /*@null@*/
 /*@only@*/
 GR_Grammar *

tests/test_grammar.c

@@ -47,6 +47,9 @@ START_TEST(test_grammar_no_status)
 	ck_assert_int_eq (0, grammar->symbol_n);
 	ck_assert_ptr_eq (NULL, grammar->symbols);
 
+	ck_assert_int_eq (0, grammar->rule_n);
+	ck_assert_ptr_eq (NULL, grammar->rules);
+
 	GR_Grammar_free (grammar);
 }
 END_TEST
@@ -70,6 +73,9 @@ START_TEST(test_grammar_with_status)
 	ck_assert_int_eq (0, grammar->symbol_n);
 	ck_assert_ptr_eq (NULL, grammar->symbols);
 
+	ck_assert_int_eq (0, grammar->rule_n);
+	ck_assert_ptr_eq (NULL, grammar->rules);
+
 	GR_Grammar_free (grammar);
 }
 END_TEST
@@ -94,6 +100,9 @@ START_TEST(test_grammar_raw_no_status)
 	ck_assert_int_eq (0, grammar->symbol_n);
 	ck_assert_ptr_eq (NULL, grammar->symbols);
 
+	ck_assert_int_eq (0, grammar->rule_n);
+	ck_assert_ptr_eq (NULL, grammar->rules);
+
 	GR_Grammar_free (grammar);
 }
 END_TEST
@@ -121,6 +130,9 @@ START_TEST(test_grammar_raw_with_status)
 	ck_assert_int_eq (0, grammar->symbol_n);
 	ck_assert_ptr_eq (NULL, grammar->symbols);
 
+	ck_assert_int_eq (0, grammar->rule_n);
+	ck_assert_ptr_eq (NULL, grammar->rules);
+
 	GR_Grammar_free (grammar);
 }
 END_TEST