ncd: NCDConfig: rename NCDConfig_arguments to NCDConfig_list

examples/ncd_parser_test.c

@@ -66,7 +66,7 @@ int main (int argc, char **argv)
             
             printf("\n");
             
-            struct NCDConfig_arguments *arg = st->args;
+            struct NCDConfig_list *arg = st->args;
             while (arg) {
                 switch (arg->type) {
                     case NCDCONFIG_ARG_STRING:

generated/NCDConfigParser_parse.c

@@ -76,9 +76,9 @@ struct parser_out {
 typedef union {
   int yyinit;
   ParseTOKENTYPE yy0;
-  struct NCDConfig_arguments * yy8;
   char * yy9;
   int yy20;
+  struct NCDConfig_list * yy30;
   struct NCDConfig_statements * yy38;
   struct NCDConfig_strings * yy40;
   struct NCDConfig_processes * yy41;
@@ -439,7 +439,7 @@ static void yy_destructor(
     case 18: /* statement_args */
 {
 #line 56 "NCDConfigParser_parse.y"
- NCDConfig_free_arguments((yypminor->yy8)); 
+ NCDConfig_free_list((yypminor->yy30)); 
 #line 444 "NCDConfigParser_parse.c"
 }
       break;
@@ -793,7 +793,7 @@ static void yy_reduce(
       case 3: /* statements ::= statement_names ROUND_OPEN statement_args_maybe ROUND_CLOSE name_maybe SEMICOLON */
 #line 95 "NCDConfigParser_parse.y"
 {
-    yygotominor.yy38 = NCDConfig_make_statements(NULL, yymsp[-5].minor.yy40, yymsp[-3].minor.yy8, yymsp[-1].minor.yy9, NULL);
+    yygotominor.yy38 = NCDConfig_make_statements(NULL, yymsp[-5].minor.yy40, yymsp[-3].minor.yy30, yymsp[-1].minor.yy9, NULL);
     if (!yygotominor.yy38) {
         parser_out->out_of_memory = 1;
     }
@@ -806,7 +806,7 @@ static void yy_reduce(
       case 4: /* statements ::= statement_names ROUND_OPEN statement_args_maybe ROUND_CLOSE name_maybe SEMICOLON statements */
 #line 102 "NCDConfigParser_parse.y"
 {
-    yygotominor.yy38 = NCDConfig_make_statements(NULL, yymsp[-6].minor.yy40, yymsp[-4].minor.yy8, yymsp[-2].minor.yy9, yymsp[0].minor.yy38);
+    yygotominor.yy38 = NCDConfig_make_statements(NULL, yymsp[-6].minor.yy40, yymsp[-4].minor.yy30, yymsp[-2].minor.yy9, yymsp[0].minor.yy38);
     if (!yygotominor.yy38) {
         parser_out->out_of_memory = 1;
     }
@@ -819,7 +819,7 @@ static void yy_reduce(
       case 5: /* statements ::= statement_names ARROW statement_names ROUND_OPEN statement_args_maybe ROUND_CLOSE name_maybe SEMICOLON */
 #line 109 "NCDConfigParser_parse.y"
 {
-    yygotominor.yy38 = NCDConfig_make_statements(yymsp[-7].minor.yy40, yymsp[-5].minor.yy40, yymsp[-3].minor.yy8, yymsp[-1].minor.yy9, NULL);
+    yygotominor.yy38 = NCDConfig_make_statements(yymsp[-7].minor.yy40, yymsp[-5].minor.yy40, yymsp[-3].minor.yy30, yymsp[-1].minor.yy9, NULL);
     if (!yygotominor.yy38) {
         parser_out->out_of_memory = 1;
     }
@@ -833,7 +833,7 @@ static void yy_reduce(
       case 6: /* statements ::= statement_names ARROW statement_names ROUND_OPEN statement_args_maybe ROUND_CLOSE name_maybe SEMICOLON statements */
 #line 116 "NCDConfigParser_parse.y"
 {
-    yygotominor.yy38 = NCDConfig_make_statements(yymsp[-8].minor.yy40, yymsp[-6].minor.yy40, yymsp[-4].minor.yy8, yymsp[-2].minor.yy9, yymsp[0].minor.yy38);
+    yygotominor.yy38 = NCDConfig_make_statements(yymsp[-8].minor.yy40, yymsp[-6].minor.yy40, yymsp[-4].minor.yy30, yymsp[-2].minor.yy9, yymsp[0].minor.yy38);
     if (!yygotominor.yy38) {
         parser_out->out_of_memory = 1;
     }
@@ -868,22 +868,22 @@ static void yy_reduce(
       case 9: /* statement_args_maybe ::= */
 #line 137 "NCDConfigParser_parse.y"
 {
-    yygotominor.yy8 = NULL;
+    yygotominor.yy30 = NULL;
 }
 #line 874 "NCDConfigParser_parse.c"
         break;
       case 10: /* statement_args_maybe ::= statement_args */
 #line 141 "NCDConfigParser_parse.y"
 {
-    yygotominor.yy8 = yymsp[0].minor.yy8;
+    yygotominor.yy30 = yymsp[0].minor.yy30;
 }
 #line 881 "NCDConfigParser_parse.c"
         break;
       case 11: /* statement_args ::= STRING */
 #line 145 "NCDConfigParser_parse.y"
 {
-    yygotominor.yy8 = NCDConfig_make_arguments_string(yymsp[0].minor.yy0, NULL);
-    if (!yygotominor.yy8) {
+    yygotominor.yy30 = NCDConfig_make_list_string(yymsp[0].minor.yy0, NULL);
+    if (!yygotominor.yy30) {
         parser_out->out_of_memory = 1;
     }
 }
@@ -892,8 +892,8 @@ static void yy_reduce(
       case 12: /* statement_args ::= statement_names */
 #line 152 "NCDConfigParser_parse.y"
 {
-    yygotominor.yy8 = NCDConfig_make_arguments_var(yymsp[0].minor.yy40, NULL);
-    if (!yygotominor.yy8) {
+    yygotominor.yy30 = NCDConfig_make_list_var(yymsp[0].minor.yy40, NULL);
+    if (!yygotominor.yy30) {
         parser_out->out_of_memory = 1;
     }
 }
@@ -902,8 +902,8 @@ static void yy_reduce(
       case 13: /* statement_args ::= STRING COMMA statement_args */
 #line 159 "NCDConfigParser_parse.y"
 {
-    yygotominor.yy8 = NCDConfig_make_arguments_string(yymsp[-2].minor.yy0, yymsp[0].minor.yy8);
-    if (!yygotominor.yy8) {
+    yygotominor.yy30 = NCDConfig_make_list_string(yymsp[-2].minor.yy0, yymsp[0].minor.yy30);
+    if (!yygotominor.yy30) {
         parser_out->out_of_memory = 1;
     }
   yy_destructor(yypParser,10,&yymsp[-1].minor);
@@ -913,8 +913,8 @@ static void yy_reduce(
       case 14: /* statement_args ::= statement_names COMMA statement_args */
 #line 166 "NCDConfigParser_parse.y"
 {
-    yygotominor.yy8 = NCDConfig_make_arguments_var(yymsp[-2].minor.yy40, yymsp[0].minor.yy8);
-    if (!yygotominor.yy8) {
+    yygotominor.yy30 = NCDConfig_make_list_var(yymsp[-2].minor.yy40, yymsp[0].minor.yy30);
+    if (!yygotominor.yy30) {
         parser_out->out_of_memory = 1;
     }
   yy_destructor(yypParser,10,&yymsp[-1].minor);

generated/NCDConfigParser_parse.y

@@ -45,16 +45,16 @@ struct parser_out {
 %type processes {struct NCDConfig_processes *}
 %type statements {struct NCDConfig_statements *}
 %type statement_names {struct NCDConfig_strings *}
-%type statement_args_maybe {struct NCDConfig_arguments *}
-%type statement_args {struct NCDConfig_arguments *}
+%type statement_args_maybe {struct NCDConfig_list *}
+%type statement_args {struct NCDConfig_list *}
 %type name_maybe {char *}
 %type process_or_template {int}
 
 %destructor processes { NCDConfig_free_processes($$); }
 %destructor statements { NCDConfig_free_statements($$); }
 %destructor statement_names { NCDConfig_free_strings($$); }
-%destructor statement_args_maybe { NCDConfig_free_arguments($$); }
-%destructor statement_args { NCDConfig_free_arguments($$); }
+%destructor statement_args_maybe { NCDConfig_free_list($$); }
+%destructor statement_args { NCDConfig_free_list($$); }
 %destructor name_maybe { free($$); }
 
 %stack_size 0
@@ -143,28 +143,28 @@ statement_args_maybe(R) ::= statement_args(A). {
 }
 
 statement_args(R) ::= STRING(A). {
-    R = NCDConfig_make_arguments_string(A, NULL);
+    R = NCDConfig_make_list_string(A, NULL);
     if (!R) {
         parser_out->out_of_memory = 1;
     }
 }
 
 statement_args(R) ::= statement_names(A). {
-    R = NCDConfig_make_arguments_var(A, NULL);
+    R = NCDConfig_make_list_var(A, NULL);
     if (!R) {
         parser_out->out_of_memory = 1;
     }
 }
 
 statement_args(R) ::= STRING(A) COMMA statement_args(N). {
-    R = NCDConfig_make_arguments_string(A, N);
+    R = NCDConfig_make_list_string(A, N);
     if (!R) {
         parser_out->out_of_memory = 1;
     }
 }
 
 statement_args(R) ::= statement_names(A) COMMA statement_args(N). {
-    R = NCDConfig_make_arguments_var(A, N);
+    R = NCDConfig_make_list_var(A, N);
     if (!R) {
         parser_out->out_of_memory = 1;
     }

ncd/NCDConfig.c

@@ -49,14 +49,14 @@ void NCDConfig_free_statements (struct NCDConfig_statements *v)
     
     NCDConfig_free_strings(v->objname);
     NCDConfig_free_strings(v->names);
-    NCDConfig_free_arguments(v->args);
+    NCDConfig_free_list(v->args);
     free(v->name);
     NCDConfig_free_statements(v->next);
     
     free(v);
 }
 
-void NCDConfig_free_arguments (struct NCDConfig_arguments *v)
+void NCDConfig_free_list (struct NCDConfig_list *v)
 {
     if (!v) {
         return;
@@ -73,7 +73,7 @@ void NCDConfig_free_arguments (struct NCDConfig_arguments *v)
             ASSERT(0);
     }
     
-    NCDConfig_free_arguments(v->next);
+    NCDConfig_free_list(v->next);
     
     free(v);
 }
@@ -115,7 +115,7 @@ fail:
     return NULL;
 }
 
-struct NCDConfig_statements * NCDConfig_make_statements (struct NCDConfig_strings *objname, struct NCDConfig_strings *names, struct NCDConfig_arguments *args, char *name, struct NCDConfig_statements *next)
+struct NCDConfig_statements * NCDConfig_make_statements (struct NCDConfig_strings *objname, struct NCDConfig_strings *names, struct NCDConfig_list *args, char *name, struct NCDConfig_statements *next)
 {
     struct NCDConfig_statements *v = malloc(sizeof(*v));
     if (!v) {
@@ -132,15 +132,15 @@ struct NCDConfig_statements * NCDConfig_make_statements (struct NCDConfig_string
     
 fail:
     NCDConfig_free_strings(names);
-    NCDConfig_free_arguments(args);
+    NCDConfig_free_list(args);
     free(name);
     NCDConfig_free_statements(next);
     return NULL;
 }
 
-struct NCDConfig_arguments * NCDConfig_make_arguments_string (char *str, struct NCDConfig_arguments *next)
+struct NCDConfig_list * NCDConfig_make_list_string (char *str, struct NCDConfig_list *next)
 {
-    struct NCDConfig_arguments *v = malloc(sizeof(*v));
+    struct NCDConfig_list *v = malloc(sizeof(*v));
     if (!v) {
         goto fail;
     }
@@ -153,13 +153,13 @@ struct NCDConfig_arguments * NCDConfig_make_arguments_string (char *str, struct
     
 fail:
     free(str);
-    NCDConfig_free_arguments(next);
+    NCDConfig_free_list(next);
     return NULL;
 }
 
-struct NCDConfig_arguments * NCDConfig_make_arguments_var (struct NCDConfig_strings *var, struct NCDConfig_arguments *next)
+struct NCDConfig_list * NCDConfig_make_list_var (struct NCDConfig_strings *var, struct NCDConfig_list *next)
 {
-    struct NCDConfig_arguments *v = malloc(sizeof(*v));
+    struct NCDConfig_list *v = malloc(sizeof(*v));
     if (!v) {
         goto fail;
     }
@@ -172,7 +172,7 @@ struct NCDConfig_arguments * NCDConfig_make_arguments_var (struct NCDConfig_stri
     
 fail:
     NCDConfig_free_strings(var);
-    NCDConfig_free_arguments(next);
+    NCDConfig_free_list(next);
     return NULL;
 }
 

ncd/NCDConfig.h

@@ -25,7 +25,7 @@
 
 struct NCDConfig_processes;
 struct NCDConfig_statements;
-struct NCDConfig_arguments;
+struct NCDConfig_list;
 struct NCDConfig_strings;
 
 struct NCDConfig_processes {
@@ -38,7 +38,7 @@ struct NCDConfig_processes {
 struct NCDConfig_statements {
     struct NCDConfig_strings *objname;
     struct NCDConfig_strings *names;
-    struct NCDConfig_arguments *args;
+    struct NCDConfig_list *args;
     char *name;
     struct NCDConfig_statements *next;
 };
@@ -46,13 +46,13 @@ struct NCDConfig_statements {
 #define NCDCONFIG_ARG_STRING 1
 #define NCDCONFIG_ARG_VAR 2
 
-struct NCDConfig_arguments {
+struct NCDConfig_list {
     int type;
     union {
         char *string;
         struct NCDConfig_strings *var;
     };
-    struct NCDConfig_arguments *next;
+    struct NCDConfig_list *next;
 };
 
 struct NCDConfig_strings {
@@ -62,12 +62,12 @@ struct NCDConfig_strings {
 
 void NCDConfig_free_processes (struct NCDConfig_processes *v);
 void NCDConfig_free_statements (struct NCDConfig_statements *v);
-void NCDConfig_free_arguments (struct NCDConfig_arguments *v);
+void NCDConfig_free_list (struct NCDConfig_list *v);
 void NCDConfig_free_strings (struct NCDConfig_strings *v);
 struct NCDConfig_processes * NCDConfig_make_processes (int is_template, char *name, struct NCDConfig_statements *statements, int have_next, struct NCDConfig_processes *next);
-struct NCDConfig_statements * NCDConfig_make_statements (struct NCDConfig_strings *objname, struct NCDConfig_strings *names, struct NCDConfig_arguments *args, char *name, struct NCDConfig_statements *next);
-struct NCDConfig_arguments * NCDConfig_make_arguments_string (char *str, struct NCDConfig_arguments *next);
-struct NCDConfig_arguments * NCDConfig_make_arguments_var (struct NCDConfig_strings *var, struct NCDConfig_arguments *next);
+struct NCDConfig_statements * NCDConfig_make_statements (struct NCDConfig_strings *objname, struct NCDConfig_strings *names, struct NCDConfig_list *args, char *name, struct NCDConfig_statements *next);
+struct NCDConfig_list * NCDConfig_make_list_string (char *str, struct NCDConfig_list *next);
+struct NCDConfig_list * NCDConfig_make_list_var (struct NCDConfig_strings *var, struct NCDConfig_list *next);
 struct NCDConfig_strings * NCDConfig_make_strings (char *value, int have_next, struct NCDConfig_strings *next);
 
 int NCDConfig_statement_name_is (struct NCDConfig_statements *st, const char *needle);

ncd/NCDConfigParser_parse.y

@@ -45,16 +45,16 @@ struct parser_out {
 %type processes {struct NCDConfig_processes *}
 %type statements {struct NCDConfig_statements *}
 %type statement_names {struct NCDConfig_strings *}
-%type statement_args_maybe {struct NCDConfig_arguments *}
-%type statement_args {struct NCDConfig_arguments *}
+%type statement_args_maybe {struct NCDConfig_list *}
+%type statement_args {struct NCDConfig_list *}
 %type name_maybe {char *}
 %type process_or_template {int}
 
 %destructor processes { NCDConfig_free_processes($$); }
 %destructor statements { NCDConfig_free_statements($$); }
 %destructor statement_names { NCDConfig_free_strings($$); }
-%destructor statement_args_maybe { NCDConfig_free_arguments($$); }
-%destructor statement_args { NCDConfig_free_arguments($$); }
+%destructor statement_args_maybe { NCDConfig_free_list($$); }
+%destructor statement_args { NCDConfig_free_list($$); }
 %destructor name_maybe { free($$); }
 
 %stack_size 0
@@ -143,28 +143,28 @@ statement_args_maybe(R) ::= statement_args(A). {
 }
 
 statement_args(R) ::= STRING(A). {
-    R = NCDConfig_make_arguments_string(A, NULL);
+    R = NCDConfig_make_list_string(A, NULL);
     if (!R) {
         parser_out->out_of_memory = 1;
     }
 }
 
 statement_args(R) ::= statement_names(A). {
-    R = NCDConfig_make_arguments_var(A, NULL);
+    R = NCDConfig_make_list_var(A, NULL);
     if (!R) {
         parser_out->out_of_memory = 1;
     }
 }
 
 statement_args(R) ::= STRING(A) COMMA statement_args(N). {
-    R = NCDConfig_make_arguments_string(A, N);
+    R = NCDConfig_make_list_string(A, N);
     if (!R) {
         parser_out->out_of_memory = 1;
     }
 }
 
 statement_args(R) ::= statement_names(A) COMMA statement_args(N). {
-    R = NCDConfig_make_arguments_var(A, N);
+    R = NCDConfig_make_list_var(A, N);
     if (!R) {
         parser_out->out_of_memory = 1;
     }

ncd/ncd.c

@@ -591,7 +591,7 @@ int statement_init (struct statement *s, struct NCDConfig_statements *conf)
     
     // init arguments
     struct argument_elem **prevptr = &s->first_arg;
-    struct NCDConfig_arguments *arg = conf->args;
+    struct NCDConfig_list *arg = conf->args;
     while (arg) {
         struct argument_elem *e = malloc(sizeof(*e));
         if (!e) {