diff --git a/clink/app/src/host/host_cmd.cpp b/clink/app/src/host/host_cmd.cpp index 10b84e144..2fc7fa9d2 100644 --- a/clink/app/src/host/host_cmd.cpp +++ b/clink/app/src/host/host_cmd.cpp @@ -392,14 +392,14 @@ bool host_cmd::initialise_system() buffer << "\"" << dll_path; buffer << "/" CLINK_EXE "\" $*"; m_doskey.add_alias("clink", buffer.c_str()); - + // Add an alias to operate on the command history. buffer.clear(); buffer << "\"" << dll_path; buffer << "/" CLINK_EXE "\" history $*"; m_doskey.add_alias("history", buffer.c_str()); } - + // Tag the prompt again just incase it got unset by by something like // setlocal/endlocal in a boot Batch script. tag_prompt(); diff --git a/clink/app/src/loader/draw_test.cpp b/clink/app/src/loader/draw_test.cpp index 84b7b0fc9..5d33e618e 100644 --- a/clink/app/src/loader/draw_test.cpp +++ b/clink/app/src/loader/draw_test.cpp @@ -41,7 +41,7 @@ class test_editor line_editor* m_editor; handle m_thread; }; - + //------------------------------------------------------------------------------ void test_editor::start(const char* prompt) { @@ -333,7 +333,7 @@ void runner::line_test() { editor.press_keys("_"); int j = rand() % (sizeof(word) - 2); - editor.press_keys(word + j); + editor.press_keys(word + j); i += sizeof(word) - j; } diff --git a/clink/core/test/path.cpp b/clink/core/test/path.cpp index 303056b5d..e2cd6e715 100644 --- a/clink/core/test/path.cpp +++ b/clink/core/test/path.cpp @@ -391,7 +391,7 @@ TEST_CASE("path::join(get_dir(), get_name())") str<> dir, name; path::get_directory(in, dir); path::get_name(in, name); - + str<> join; path::join(dir.c_str(), name.c_str(), join); path::normalise(join, '/'); diff --git a/clink/core/test/settings.cpp b/clink/core/test/settings.cpp index 3d82f9137..7e9ba43a4 100644 --- a/clink/core/test/settings.cpp +++ b/clink/core/test/settings.cpp @@ -141,7 +141,7 @@ TEST_CASE("settings : enum") { REQUIRE(test.set(options[i])); REQUIRE(test.get() == i); - + test.get(out); REQUIRE(out.equals(options[i])); } diff --git a/clink/lib/include/lib/matches.h b/clink/lib/include/lib/matches.h index fa6df3818..d222208fc 100644 --- a/clink/lib/include/lib/matches.h +++ b/clink/lib/include/lib/matches.h @@ -38,7 +38,7 @@ class match_builder bool add_match(const char* match); bool add_match(const match_desc& desc); void set_prefix_included(bool included=true); - + private: matches& m_matches; }; diff --git a/clink/lib/src/binder.h b/clink/lib/src/binder.h index b33f581b4..a7ff02d7b 100644 --- a/clink/lib/src/binder.h +++ b/clink/lib/src/binder.h @@ -22,7 +22,7 @@ class binder struct node { - unsigned short is_group : 1; + unsigned short is_group : 1; unsigned short next : link_bits; unsigned short module : module_bits; diff --git a/clink/lib/src/rl/rl_module.cpp b/clink/lib/src/rl/rl_module.cpp index 63a375491..6594fa970 100644 --- a/clink/lib/src/rl/rl_module.cpp +++ b/clink/lib/src/rl/rl_module.cpp @@ -239,9 +239,9 @@ void rl_module::on_input(const input& input, result& result, const context& cont virtual void end() override {} virtual void select() override {} virtual int read() override { return *(unsigned char*)(data++); } - const char* data; + const char* data; } term_in; - + term_in.data = input.keys; rl_instream = (FILE*)(&term_in); diff --git a/clink/lib/test/binder.cpp b/clink/lib/test/binder.cpp index a11df0804..98bb3c6e0 100644 --- a/clink/lib/test/binder.cpp +++ b/clink/lib/test/binder.cpp @@ -105,8 +105,8 @@ TEST_CASE("Binder") SECTION("Invalid chords") { const char* chords[] = { - "\\C", "\\Cx", "\\C-", - "\\M", "\\Mx", "\\M-", + "\\C", "\\Cx", "\\C-", + "\\M", "\\Mx", "\\M-", "\\M-C-", }; diff --git a/clink/lua/src/line_state_lua.cpp b/clink/lua/src/line_state_lua.cpp index 0e8c2a00e..66cf9919c 100644 --- a/clink/lua/src/line_state_lua.cpp +++ b/clink/lua/src/line_state_lua.cpp @@ -123,7 +123,7 @@ int line_state_lua::get_word(lua_State* state) { if (!lua_isnumber(state, 1)) return 0; - + unsigned int index = int(lua_tointeger(state, 1)) - 1; str_iter word = m_line.get_word(index); lua_pushlstring(state, word.get_pointer(), word.length()); diff --git a/clink/lua/test/args.cpp b/clink/lua/test/args.cpp index 23b743ded..59571995e 100644 --- a/clink/lua/test/args.cpp +++ b/clink/lua/test/args.cpp @@ -380,21 +380,21 @@ TEST_CASE("Lua arg parsers.") "; REQUIRE(lua.do_string(script)); - + SECTION("Not looped yet") { tester.set_input("argcmd_parser t"); tester.set_expected_matches("two", "three"); tester.run(); } - + SECTION("Looped once") { tester.set_input("argcmd_parser two four t"); tester.set_expected_matches("two", "three"); tester.run(); } - + SECTION("Looped twice") { tester.set_input("argcmd_parser two four abc ba"); diff --git a/clink/terminal/src/ecma48_iter.cpp b/clink/terminal/src/ecma48_iter.cpp index 1de451177..2ec3da155 100644 --- a/clink/terminal/src/ecma48_iter.cpp +++ b/clink/terminal/src/ecma48_iter.cpp @@ -127,7 +127,7 @@ bool ecma48_code::get_c1_str(str_base& out) const { if (c == 0x9c || c == 0x1b) break; - + iter.next(); } diff --git a/clink/terminal/src/win_screen_buffer.cpp b/clink/terminal/src/win_screen_buffer.cpp index ed1606f2b..b0249faa1 100644 --- a/clink/terminal/src/win_screen_buffer.cpp +++ b/clink/terminal/src/win_screen_buffer.cpp @@ -93,20 +93,20 @@ void win_screen_buffer::clear(clear_type type) case clear_type_all: width = csbi.dwSize.X; height = (csbi.srWindow.Bottom - csbi.srWindow.Top) + 1; - xy = { 0, csbi.srWindow.Top }; + xy = { 0, csbi.srWindow.Top }; break; case clear_type_before: width = csbi.dwSize.X; height = csbi.dwCursorPosition.Y - csbi.srWindow.Top; - xy = { 0, csbi.srWindow.Top }; + xy = { 0, csbi.srWindow.Top }; count = csbi.dwCursorPosition.X + 1; break; case clear_type_after: width = csbi.dwSize.X; height = csbi.srWindow.Bottom - csbi.dwCursorPosition.Y; - xy = { csbi.dwCursorPosition.X, csbi.dwCursorPosition.Y }; + xy = { csbi.dwCursorPosition.X, csbi.dwCursorPosition.Y }; count = width - csbi.dwCursorPosition.X; break; } @@ -130,17 +130,17 @@ void win_screen_buffer::clear_line(clear_type type) { case clear_type_all: width = csbi.dwSize.X; - xy = { 0, csbi.dwCursorPosition.Y }; + xy = { 0, csbi.dwCursorPosition.Y }; break; case clear_type_before: width = csbi.dwCursorPosition.X + 1; - xy = { 0, csbi.dwCursorPosition.Y }; + xy = { 0, csbi.dwCursorPosition.Y }; break; case clear_type_after: width = csbi.dwSize.X - csbi.dwCursorPosition.X; - xy = { csbi.dwCursorPosition.X, csbi.dwCursorPosition.Y }; + xy = { csbi.dwCursorPosition.X, csbi.dwCursorPosition.Y }; break; } diff --git a/clink/test/src/line_editor_tester.h b/clink/test/src/line_editor_tester.h index 956ddbb84..beef63d4d 100644 --- a/clink/test/src/line_editor_tester.h +++ b/clink/test/src/line_editor_tester.h @@ -19,7 +19,7 @@ class test_terminal_in { public: bool has_input() const { return (m_read == nullptr) ? false : (*m_read != '\0'); } - void set_input(const char* input) { m_input = m_read = input; } + void set_input(const char* input) { m_input = m_read = input; } virtual void begin() override {} virtual void end() override {} virtual void select() override {}