Module Name: src
Committed By: rillig
Date: Sun Feb 7 17:32:55 UTC 2021
Modified Files:
src/tests/lib/libcurses/director: testlang_conf.l testlang_parse.y
Log Message:
tests/libcurses: use more common abbreviations for tokens
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/lib/libcurses/director/testlang_conf.l
cvs rdiff -u -r1.26 -r1.27 src/tests/lib/libcurses/director/testlang_parse.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/director/testlang_conf.l
diff -u src/tests/lib/libcurses/director/testlang_conf.l:1.11 src/tests/lib/libcurses/director/testlang_conf.l:1.12
--- src/tests/lib/libcurses/director/testlang_conf.l:1.11 Sun Feb 7 12:05:36 2021
+++ src/tests/lib/libcurses/director/testlang_conf.l Sun Feb 7 17:32:55 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_conf.l,v 1.11 2021/02/07 12:05:36 rillig Exp $ */
+/* $NetBSD: testlang_conf.l,v 1.12 2021/02/07 17:32:55 rillig Exp $ */
/*-
* Copyright 2009 Brett Lymn <[email protected]>
@@ -159,10 +159,10 @@ CCHAR [cC][cC][hH][aA][rR]
WCHAR [wW][cC][hH][aA][rR]
BYTE BYTE
OR \|
-LHB \(
-RHB \)
-LHSB \[
-RHSB \]
+LPAREN \(
+RPAREN \)
+LBRACK \[
+RBRACK \]
MULTIPLIER \*
%x incl
@@ -248,10 +248,10 @@ include BEGIN(incl);
{CCHAR} return CCHAR;
{WCHAR} return WCHAR;
{OR} return OR;
-{LHB} return LHB;
-{RHB} return RHB;
-{LHSB} return LHSB;
-{RHSB} return RHSB;
+{LPAREN} return LPAREN;
+{RPAREN} return RPAREN;
+{LBRACK} return LBRACK;
+{RBRACK} return RBRACK;
{HEX} {
/* Hex value, convert to decimal and return numeric */
Index: src/tests/lib/libcurses/director/testlang_parse.y
diff -u src/tests/lib/libcurses/director/testlang_parse.y:1.26 src/tests/lib/libcurses/director/testlang_parse.y:1.27
--- src/tests/lib/libcurses/director/testlang_parse.y:1.26 Sun Feb 7 17:26:15 2021
+++ src/tests/lib/libcurses/director/testlang_parse.y Sun Feb 7 17:32:55 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_parse.y,v 1.26 2021/02/07 17:26:15 rillig Exp $ */
+/* $NetBSD: testlang_parse.y,v 1.27 2021/02/07 17:32:55 rillig Exp $ */
/*-
* Copyright 2009 Brett Lymn <[email protected]>
@@ -189,7 +189,7 @@ extern saved_data_t saved_output;
%token <string> ASSIGN
%token <string> CCHAR
%token <string> WCHAR
-%token EOL CALL CHECK NOINPUT OR MULTIPLIER LHB RHB LHSB RHSB
+%token EOL CALL CHECK NOINPUT OR MULTIPLIER LPAREN RPAREN LBRACK RBRACK
%token CALL2 CALL3 CALL4 DRAIN
%nonassoc OR
@@ -219,7 +219,7 @@ statement : assign
assign : ASSIGN VARNAME numeric {
set_var(data_number, $2, $3);
}
- | ASSIGN VARNAME LHB expr RHB {
+ | ASSIGN VARNAME LPAREN expr RPAREN {
set_var(data_number, $2, $<string>4);
}
| ASSIGN VARNAME STRING {
@@ -241,7 +241,7 @@ wchar : WCHAR VARNAME char_vals {
;
attributes : numeric
- | LHB expr RHB {
+ | LPAREN expr RPAREN {
$<string>$ = $<string>2;
}
| VARIABLE {
@@ -252,7 +252,7 @@ attributes : numeric
char_vals : numeric {
add_to_vals(data_number, $1);
}
- | LHSB array RHSB
+ | LBRACK array RBRACK
| VARIABLE {
add_to_vals(data_var, $1);
}
@@ -451,7 +451,7 @@ result : returns
;
returns : numeric { assign_rets(data_number, $1); }
- | LHB expr RHB { assign_rets(data_number, $<string>2); }
+ | LPAREN expr RPAREN { assign_rets(data_number, $<string>2); }
| STRING { assign_rets(data_string, $1); }
| BYTE { assign_rets(data_byte, (void *) $1); }
| ERR_RET { assign_rets(data_err, NULL); }
@@ -549,7 +549,7 @@ args : /* empty */
| arg args
;
-arg : LHB expr RHB {
+arg : LPAREN expr RPAREN {
assign_arg(data_static, $<string>2);
}
| numeric {
