folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Enrich EXPECT and SEND help and document information

Browse source
This commit is contained in:
Mark Pizzolato 2017-11-29 16:49:20 -08:00
parent 9a7306a647
commit 0293d7f4af
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
doc/simh_doc.doc
View file

Binary file not shown.

17
scp.c
View file

@ -1623,15 +1623,20 @@ ASSERT failure have several different actions:
" The SEND command provides a way to insert input into the console device of\n" " The SEND command provides a way to insert input into the console device of\n"
" a simulated system as if it was entered by a user.\n\n" " a simulated system as if it was entered by a user.\n\n"
"++SEND {-t} {after=nn,}{delay=nn,}\"<string>\"\n\n" "++SEND {-t} {after=nn,}{delay=nn,}\"<string>\"\n\n"
"++NOSEND\n\n"
"++SHOW SEND\n\n"
" The string argument must be delimited by quote characters. Quotes may\n" " The string argument must be delimited by quote characters. Quotes may\n"
" be either single or double but the opening and closing quote characters\n" " be either single or double but the opening and closing quote characters\n"
" must match. Data in the string may contain escaped character strings.\n\n" " must match. Data in the string may contain escaped character strings.\n\n"
" The SEND command can also insert input into any serial device on a\n" " The SEND command can also insert input into any serial device on a\n"
" simulated system as if it was entered by a user.\n\n" " simulated system as if it was entered by a user.\n\n"
"++SEND {-t} {<dev>:line} {after=nn,}{delay=nn,}\"<string>\"\n" "++SEND {-t} {<dev>:line} {after=nn,}{delay=nn,}\"<string>\"\n\n"
"++NOSEND {<dev>:line}\n\n" "++NOSEND {<dev>:line}\n\n"
"++SHOW SEND {<dev>:line}\n\n"
" The NOSEND command removes any undelivered input data which may be\n" " The NOSEND command removes any undelivered input data which may be\n"
" pending on a line.\n" " pending on the CONSOLE or a specific multiplexer line.\n\n"
" The SHOW SEND command displays any pending SEND activity for the\n"
" CONSOLE or a specific multiplexer line.\n"
"4Delay\n" "4Delay\n"
" Specifies an integer (>=0) representing a minimal instruction delay\n" " Specifies an integer (>=0) representing a minimal instruction delay\n"
" between characters being sent. The delay parameter can be set by\n" " between characters being sent. The delay parameter can be set by\n"
@ -1681,6 +1686,7 @@ ASSERT failure have several different actions:
" when specific output has been generated by the simulated system.\n\n" " when specific output has been generated by the simulated system.\n\n"
"++EXPECT {dev:line} {[count]} {HALTAFTER=n,}\"<string>\" {actioncommand {; actioncommand}...}\n\n" "++EXPECT {dev:line} {[count]} {HALTAFTER=n,}\"<string>\" {actioncommand {; actioncommand}...}\n\n"
"++NOEXPECT {dev:line} \"<string>\"\n\n" "++NOEXPECT {dev:line} \"<string>\"\n\n"
"++SHOW EXPECT {dev:line}\n\n"
" The string argument must be delimited by quote characters. Quotes may\n" " The string argument must be delimited by quote characters. Quotes may\n"
" be either single or double but the opening and closing quote characters\n" " be either single or double but the opening and closing quote characters\n"
" must match. Data in the string may contain escaped character strings.\n" " must match. Data in the string may contain escaped character strings.\n"
@ -1698,7 +1704,10 @@ ASSERT failure have several different actions:
" to match other expect rules which may already be defined.\n" " to match other expect rules which may already be defined.\n"
" Data which is output prior to the definition of an expect rule is not\n" " Data which is output prior to the definition of an expect rule is not\n"
" eligible to be matched against.\n\n" " eligible to be matched against.\n\n"
" The NOEXPECT command removes a previously defined EXPECT command.\n" " The NOEXPECT command removes a previously defined EXPECT command for the\n"
" console or a specific multiplexer line.\n\n"
" The SHOW EXPECT command displays all of the pending EXPECT state for\n"
" the console or a specific multiplexer line.\n"
/***************** 80 character line width template *************************/ /***************** 80 character line width template *************************/
"4Switches\n" "4Switches\n"
" Switches can be used to influence the behavior of EXPECT rules\n\n" " Switches can be used to influence the behavior of EXPECT rules\n\n"
@ -3924,7 +3933,7 @@ tptr = get_glyph (cptr, gbuf, ',');
if (sim_isalpha(gbuf[0]) && (strchr (gbuf, ':'))) { if (sim_isalpha(gbuf[0]) && (strchr (gbuf, ':'))) {
r = tmxr_locate_line_expect (gbuf, &exp); r = tmxr_locate_line_expect (gbuf, &exp);
if (r != SCPE_OK) if (r != SCPE_OK)
return r; return sim_messagef (r, "No such active line: %s\n", gbuf);
cptr = tptr; cptr = tptr;
} }
else else