Wed Sep 19 11:51:56 2012 UTC ()
* Add scanw family function calls as input functions


(blymn)
diff -r1.12 -r1.13 src/tests/lib/libcurses/director/testlang_parse.y
cvs diff -r1.12 -r1.13 src/tests/lib/libcurses/director/testlang_parse.y (expand / switch to unified diff)

--- src/tests/lib/libcurses/director/testlang_parse.y 2011/09/15 16:25:17 1.12
+++ src/tests/lib/libcurses/director/testlang_parse.y 2012/09/19 11:51:56 1.13
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1%{ 1%{
2/* $NetBSD: testlang_parse.y,v 1.12 2011/09/15 16:25:17 christos Exp $ */ 2/* $NetBSD: testlang_parse.y,v 1.13 2012/09/19 11:51:56 blymn Exp $ */
3 3
4/*- 4/*-
5 * Copyright 2009 Brett Lymn <blymn@NetBSD.org> 5 * Copyright 2009 Brett Lymn <blymn@NetBSD.org>
6 * 6 *
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * This code has been donated to The NetBSD Foundation by the Author. 9 * This code has been donated to The NetBSD Foundation by the Author.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
15 * notice, this list of conditions and the following disclaimer. 15 * notice, this list of conditions and the following disclaimer.
@@ -139,27 +139,28 @@ static void read_cmd_pipe(returns_t *); @@ -139,27 +139,28 @@ static void read_cmd_pipe(returns_t *);
139static void write_func_and_args(void); 139static void write_func_and_args(void);
140static void compare_streams(char *, bool); 140static void compare_streams(char *, bool);
141static void do_function_call(size_t); 141static void do_function_call(size_t);
142static void save_slave_output(bool); 142static void save_slave_output(bool);
143static void validate_type(returns_enum_t, returns_t *, int); 143static void validate_type(returns_enum_t, returns_t *, int);
144static void set_var(returns_enum_t, char *, void *); 144static void set_var(returns_enum_t, char *, void *);
145static void validate_reference(int, void *); 145static void validate_reference(int, void *);
146static char *numeric_or(char *, char *); 146static char *numeric_or(char *, char *);
147static char *get_numeric_var(const char *); 147static char *get_numeric_var(const char *);
148static void perform_delay(struct timespec *); 148static void perform_delay(struct timespec *);
149 149
150static const char *input_functions[] = { 150static const char *input_functions[] = {
151 "getch", "getnstr", "getstr", "mvgetnstr", "mvgetstr", "mvgetnstr", 151 "getch", "getnstr", "getstr", "mvgetnstr", "mvgetstr", "mvgetnstr",
152 "mvgetstr", "wgetch", "wgetnstr", "wgetstr" 152 "mvgetstr", "mvscanw", "mvwscanw", "scanw", "wgetch", "wgetnstr",
 153 "wgetstr"
153}; 154};
154 155
155static const unsigned ninput_functions = 156static const unsigned ninput_functions =
156 sizeof(input_functions) / sizeof(char *); 157 sizeof(input_functions) / sizeof(char *);
157 158
158saved_data_t saved_output; 159saved_data_t saved_output;
159 160
160%} 161%}
161 162
162%union { 163%union {
163 char *string; 164 char *string;
164 returns_t *retval; 165 returns_t *retval;
165} 166}