From 53fbba4f64d158ee79c6dc0cc25535f51a226187 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Mon, 26 Dec 2016 15:24:56 -0800 Subject: 3711 Delete '^L' characters now that I'm trying to switch from Vim to Kakoune. Pages aren't text objects in Kakoune. --- relayout | 2 -- tangle/001trace.cc | 6 ------ tangle/001trace.test.cc | 2 +- tangle/002main.cc | 2 -- tangle/003tangle.test.cc | 4 ++-- tangle/boot.cc | 2 -- termbox/termbox.h | 4 ---- 7 files changed, 3 insertions(+), 19 deletions(-) diff --git a/relayout b/relayout index 3e0d5b0c..921fda9c 100755 --- a/relayout +++ b/relayout @@ -57,6 +57,4 @@ cat .layout | index=$(($index+1)) done -# - rm .layout diff --git a/tangle/001trace.cc b/tangle/001trace.cc index d228301a..e78c0010 100644 --- a/tangle/001trace.cc +++ b/tangle/001trace.cc @@ -40,8 +40,6 @@ struct trace_stream { } }; - - trace_stream* Trace_stream = NULL; // Top-level helper. IMPORTANT: can't nest. @@ -70,8 +68,6 @@ struct lease_tracer { #define START_TRACING_UNTIL_END_OF_SCOPE lease_tracer leased_tracer; - - bool check_trace_contents(string FUNCTION, string FILE, int LINE, string layer, string expected) { // empty layer == everything vector expected_lines = split(expected, ""); size_t curr_expected_line = 0; @@ -127,8 +123,6 @@ bool trace_doesnt_contain(string layer, string line) { #define CHECK_TRACE_DOESNT_CONTAIN(...) CHECK(trace_doesnt_contain(__VA_ARGS__)) - - vector split(string s, string delim) { vector result; string::size_type begin=0, end=s.find(delim); diff --git a/tangle/001trace.test.cc b/tangle/001trace.test.cc index 4e403b65..5f0a696e 100644 --- a/tangle/001trace.test.cc +++ b/tangle/001trace.test.cc @@ -48,7 +48,7 @@ void test_trace_supports_count() { CHECK_EQ(trace_count("test layer 1", "foo"), 2); } - +//// helpers // can't check trace because trace methods call 'split' diff --git a/tangle/002main.cc b/tangle/002main.cc index aaa91e6f..c8c61039 100644 --- a/tangle/002main.cc +++ b/tangle/002main.cc @@ -18,8 +18,6 @@ string flag_value(const string& flag, int argc, const char* argv[]) { return ""; } - - //// test harness int run_tests() { diff --git a/tangle/003tangle.test.cc b/tangle/003tangle.test.cc index 4a28a622..88901ef7 100644 --- a/tangle/003tangle.test.cc +++ b/tangle/003tangle.test.cc @@ -163,7 +163,7 @@ void test_tangle_nested_patterns2() { // todo: include line numbers in tangle errors - +//// scenarios void test_tangle_supports_scenarios() { istringstream in(":(scenario does_bar)\nabc def\n+layer1: pqr\n+layer2: xyz"); @@ -337,7 +337,7 @@ void test_tangle_can_handle_mu_comments_in_scenario() { CHECK(lines.empty()); } - +//// helpers void test_trim() { CHECK_EQ(trim(""), ""); diff --git a/tangle/boot.cc b/tangle/boot.cc index 4ae68c89..a11d34b3 100644 --- a/tangle/boot.cc +++ b/tangle/boot.cc @@ -29,8 +29,6 @@ using std::ifstream; #include using std::isspace; // unicode-aware - - #include "type_list" #include "function_list" diff --git a/termbox/termbox.h b/termbox/termbox.h index 0d8e9129..c6cda6e1 100644 --- a/termbox/termbox.h +++ b/termbox/termbox.h @@ -74,8 +74,6 @@ void tb_set_cursor(int cx, int cy); * commit your changes. */ void tb_change_cell(int x, int y, uint32_t ch, uint16_t fg, uint16_t bg); - - /*** 2. Controlling keyboard events. */ struct tb_event { @@ -206,8 +204,6 @@ int tb_poll_event(struct tb_event *event); int tb_event_ready(void); - - /*** 3. Utility utf8 functions. */ #define TB_EOF -1 int tb_utf8_char_length(char c); -- cgit 1.4.1-2-gfad0