Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
rillig 2021-02-08 20:39:33 +00:00
parent 9e7915b0b6
commit 91cc09774d
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
tests/lib/libcurses/director/testlang_parse.y
View File

@ -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>
@ -140,6 +140,8 @@ static void compare_streams(const char *, bool);
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 @@ delay : DELAY numeric {
;
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 @@ delay_millis(const char *millis)
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