[src/trunk]: src/tests/lib/libcurses/director tests/libcurses: extract functi...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/649cc5d58931
branches:  trunk
changeset: 951956:649cc5d58931
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Feb 08 20:39:33 2021 +0000

description:
tests/libcurses: extract functions 'input' and 'noinput' from grammar

diffstat:

 tests/lib/libcurses/director/testlang_parse.y |  54 +++++++++++++++++----------
 1 files changed, 34 insertions(+), 20 deletions(-)

diffs (85 lines):

diff -r 695e303be58f -r 649cc5d58931 tests/lib/libcurses/director/testlang_parse.y
--- a/tests/lib/libcurses/director/testlang_parse.y     Mon Feb 08 20:26:46 2021 +0000
+++ b/tests/lib/libcurses/director/testlang_parse.y     Mon Feb 08 20:39:33 2021 +0000
@@ -1,5 +1,5 @@
 %{
-/*     $NetBSD: testlang_parse.y,v 1.40 2021/02/08 20:26:46 rillig Exp $       */
+/*     $NetBSD: testlang_parse.y,v 1.41 2021/02/08 20:39:33 rillig Exp $       */
 
 /*-
  * Copyright 2009 Brett Lymn <blymn%NetBSD.org@localhost>
@@ -140,6 +140,8 @@
 static void    do_function_call(size_t);
 static void    check(void);
 static void    delay_millis(const char *);
+static void    do_input(const char *);
+static void    do_noinput(void);
 static void    save_slave_output(bool);
 static void    validate_type(data_enum_t, ct_data_t *, int);
 static void    set_var(data_enum_t, const char *, void *);
@@ -301,27 +303,14 @@
                ;
 
 input          : INPUT STRING {
-       if (input_str != NULL) {
-               warnx("%s:%zu: Discarding unused input string", cur_file, line);
-               free(input_str);
-       }
-
-       if ((input_str = malloc(strlen($2) + 1)) == NULL)
-               err(2, "Cannot allocate memory for input string");
-
-       strlcpy(input_str, $2, strlen($2) + 1);
-}
-       ;
-
+                       do_input($2);
+               }
+               ;
 
 noinput                : NOINPUT {
-       if (input_str != NULL) {
-               warnx("%s:%zu: Discarding unused input string", cur_file, line);
-               free(input_str);
-       }
-
-       no_input = true;
-}
+                       do_noinput();
+               }
+               ;
 
 compare                : COMPARE PATH {
                        compare_streams($2, true);
@@ -1378,6 +1367,31 @@
        init_parse_variables(0);
 }
 
+static void
+do_input(const char *s)
+{
+       if (input_str != NULL) {
+               warnx("%s:%zu: Discarding unused input string", cur_file, line);
+               free(input_str);
+       }
+
+       if ((input_str = malloc(strlen(s) + 1)) == NULL)
+               err(2, "Cannot allocate memory for input string");
+
+       strlcpy(input_str, s, strlen(s) + 1);
+}
+
+static void
+do_noinput(void)
+{
+       if (input_str != NULL) {
+               warnx("%s:%zu: Discarding unused input string", cur_file, line);
+               free(input_str);
+       }
+
+       no_input = true;
+}
+
 /*
  * Initialise the command structure - if initial is non-zero then just set
  * everything to sane values otherwise free any memory that was allocated