aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-01-30 13:23:51 +1100
committerNeil <nyamatongwe@gmail.com>2019-01-30 13:23:51 +1100
commit1d08f1c50b85db47113a17e758fdd9c573f6b3a2 (patch)
tree40aa31113de66641a04753a9a0275e88eed10a5b
parent08db4d86352f05d8aafcefde3f5e196951c35616 (diff)
downloadscintilla-mirror-1d08f1c50b85db47113a17e758fdd9c573f6b3a2.tar.gz
Backport: Add a ';' statement separator at end of statement in example code.
The TCL lexer handles CRLF line ends strangely often with different styles for the CR and LF. This breaks the unit testing driver as the CR and LF are now separated in the output leading to 2 lines where there was one. It also causes differences in runs between Windows and Unix. Backport of changeset 7245:f3e1c8c6bc19.
-rw-r--r--test/examples/x.tcl2
-rw-r--r--test/examples/x.tcl.styled2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/examples/x.tcl b/test/examples/x.tcl
index 6a4b13dbe..d1260fc82 100644
--- a/test/examples/x.tcl
+++ b/test/examples/x.tcl
@@ -4,7 +4,7 @@
proc Echo_Server {port} {
set s [socket -server EchoAccept $port]
- vwait forever
+ vwait forever;
}
# Bug #1947
diff --git a/test/examples/x.tcl.styled b/test/examples/x.tcl.styled
index fecdc9dea..66af41327 100644
--- a/test/examples/x.tcl.styled
+++ b/test/examples/x.tcl.styled
@@ -4,7 +4,7 @@
{0}
{12}proc{0} {7}Echo_Server{0} {6}{{7}port{6}}{0} {6}{
{0} {12}set{0} {7}s{0} {6}[{12}socket{0} {10}-server{0} {7}EchoAccept{0} {8}$port{6}]
-{0} {12}vwait{0} {7}forever{0}
+{0} {12}vwait{0} {7}forever{0};
{6}}
{0}
{2}# Bug #1947