Module Name: src
Committed By: rillig
Date: Sun Feb 7 19:49:32 UTC 2021
Modified Files:
src/tests/lib/libcurses/director: testlang_conf.l
src/tests/lib/libcurses/tests: innstr
Log Message:
tests/libcurses: require keywords to be lowercase, except for OK and ERR
There is no need to write the keywords in upper case or mixed case. The
only case where a keyword did not have the canonical form yet was a
single lowercase 'ok' in the test case 'innstr'.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libcurses/director/testlang_conf.l
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/innstr
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.12 src/tests/lib/libcurses/director/testlang_conf.l:1.13
--- src/tests/lib/libcurses/director/testlang_conf.l:1.12 Sun Feb 7 17:32:55 2021
+++ src/tests/lib/libcurses/director/testlang_conf.l Sun Feb 7 19:49:32 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_conf.l,v 1.12 2021/02/07 17:32:55 rillig Exp $ */
+/* $NetBSD: testlang_conf.l,v 1.13 2021/02/07 19:49:32 rillig Exp $ */
/*-
* Copyright 2009 Brett Lymn <[email protected]>
@@ -138,25 +138,25 @@ HEX 0[xX][0-9a-zA-Z]+
STRING [0-9a-z!#-&(-^ \t%._\\]+
numeric [-0-9]+
PCHAR (\\.|[^ \t\n])
-ASSIGN [aA][sS][sS][iI][gG][nN]
-CALL2 [cC][aA][lL][lL]2
-CALL3 [cC][aA][lL][lL]3
-CALL4 [cC][aA][lL][lL]4
-CALL [cC][aA][lL][lL]
-CHECK [cC][hH][eE][cC][kK]
-DELAY [dD][eE][lL][aA][yY]
-INPUT [iI][nN][pP][uU][tT]
-NOINPUT [nN][oO][iI][nN][pP][uU][tT]
-OK_RET [oO][kK]
-ERR_RET [eE][rR][rR]
-COMPARE [cC][oO][mM][pP][aA][rR][eE]
-COMPAREND [cC][oO][mM][pP][aA][rR][eE][Nn][Dd]
+ASSIGN assign
+CALL2 call2
+CALL3 call3
+CALL4 call4
+CALL call
+CHECK check
+DELAY delay
+INPUT input
+NOINPUT noinput
+OK_RET OK
+ERR_RET ERR
+COMPARE compare
+COMPAREND comparend
FILENAME [A-Za-z0-9.][A-Za-z0-9./_-]+
VARNAME [A-Za-z][A-Za-z0-9_-]+
NULL_RET NULL
NON_NULL NON_NULL
-CCHAR [cC][cC][hH][aA][rR]
-WCHAR [wW][cC][hH][aA][rR]
+CCHAR cchar
+WCHAR wchar
BYTE BYTE
OR \|
LPAREN \(
Index: src/tests/lib/libcurses/tests/innstr
diff -u src/tests/lib/libcurses/tests/innstr:1.1 src/tests/lib/libcurses/tests/innstr:1.2
--- src/tests/lib/libcurses/tests/innstr:1.1 Sun May 26 09:54:33 2019
+++ src/tests/lib/libcurses/tests/innstr Sun Feb 7 19:49:32 2021
@@ -3,6 +3,6 @@ call OK move 0 2
call2 5 "cdefg" innstr 6
call OK move 0 76
call OK addstr "123"
-call ok move 0 75
+call OK move 0 75
call2 5 " 123 " innstr 10
call2 OK " 123 " instr
