Remove declaration tags. Better support vim code block navigation. (1e46859)

Remove declaration tags. Better support vim code block navigation.

dblume commited on 2022-04-08 11:46:34
Showing 11 changed files, with 37 additions and 19 deletions.

See https://vimhelp.org/usr_29.txt.html#:~:text=MOVING%20IN%20CODE%20BLOCKS

include/my_lib.hpp 6c4683b..f606758
maketags.sh d8e3571..0a05326
my_lib/my_lib.cpp daf2c92..60a0127
product/main.cpp 6502817..b9ba8b3
product/main_helper.cpp e769ed8..cc262af
product/main_helper.hpp b32c722..ae010f2
product/scoped_set_adder.cpp df08e10..10a0b79
product/scoped_set_adder.hpp c37d63b..7be9a4a
product/thread_manager.hpp e037d9d..6da002e
product/thread_with_lambda.cpp 50de436..cb4e33a
product/ui/widget.cpp 22a33dd..8b85e4e

include/my_lib.hpp

View file @ 1e46859

@@ -5,7 +5,8 @@
 
 namespace MY_LIB {
 
-class my_lib_rect {
+class my_lib_rect
+{
     int width_, height_;
 public:
     my_lib_rect(int width, int height);

maketags.sh

View file @ 1e46859

@@ -1,7 +1,8 @@
 #/bin/bash
 set -eu -o pipefail # See: https://sipb.mit.edu/doc/safe-shell/
 
-ctags -n --if0=yes --langmap=c++:+.inl --c++-kinds=+p -R --extra=q \
+# Add flag --c++-kinds=+p for tags to declaration in .h files too.
+ctags -n --if0=yes --langmap=c++:+.inl -R --extra=q \
     --exclude=.git \
     --exclude=obj \
     --exclude=lib \
@@ -16,7 +17,7 @@ find . -mindepth 1 \
     -or -type d -print | while read i
 do
     pushd "$i" 1> /dev/null
-    ctags -n --if0=yes --langmap=c++:+.inl --c++-kinds=+p -R --extra=q \
+    ctags -n --if0=yes --langmap=c++:+.inl -R --extra=q \
         --exclude=obj \
         --exclude='*generated/*'
     popd 1> /dev/null

my_lib/my_lib.cpp

View file @ 1e46859

@@ -3,7 +3,8 @@
 
 using namespace std;
 
-namespace {
+namespace
+{
 
   int my_lib_helper_fn(int x) {
     cout << "The function " << __func__ << " with parameter " << x << " was called." << endl;
@@ -24,12 +25,14 @@ int my_lib_rect::area() const
     return width_ * height_;
 }
 
-int my_lib_fn() {
+int my_lib_fn()
+{
     cout << "The function " << __func__ << " was called." << endl;
     return 0;
 }
 
-int my_lib_fn(int x) {
+int my_lib_fn(int x)
+{
     int a = my_lib_helper_fn(x);
     cout << "The function " << __PRETTY_FUNCTION__ << " with parameter " << x << " was called." << endl;
     return x + a;

product/main.cpp

View file @ 1e46859

@@ -57,7 +57,8 @@ int remove_duplicates(int a[], int n)
     return last + 1;
 }
 
-void test_cpp14() {
+void test_cpp14()
+{
 #if __cplusplus == 201402L
     // Store a generalized lambda, that squares a number, in a variable
     auto func = [](auto input) { return input * input; };
@@ -73,17 +74,20 @@ void test_cpp14() {
 #endif
 }
 
-struct Base {
+struct Base
+{
     virtual ~Base() {}
     virtual void f() {}
     int x_;
 };
 
-struct Derived: Base {
+struct Derived: Base
+{
     virtual void name() {}
 };
 
-int main() {
+int main()
+{
     length_of_array = 6;
     int a[6] = { 10, 20, 20, 30, 40, 40 };
     int item_to_remove = 20;

product/main_helper.cpp

View file @ 1e46859

@@ -11,7 +11,8 @@ int read( std::string const &directory, const std::vector<unsigned char> &secret
     return directory.length();
 }
 
-int main_helper_fn() {
+int main_helper_fn()
+{
     cout << "The function " << __PRETTY_FUNCTION__ << " was called." << endl;
     string                my_string("Hello");
     vector<unsigned char> secret;

product/main_helper.hpp

View file @ 1e46859

@@ -10,7 +10,8 @@ int main_helper_fn2();
 template<class T>
 using Pimpl = const std::unique_ptr<T>;
 
-class MyClass {
+class MyClass
+{
 public:
     MyClass();
     ~MyClass();

product/scoped_set_adder.cpp

View file @ 1e46859

@@ -9,17 +9,20 @@ namespace {
     std::set<scoped_set_adder *> g_items;
 }
 
-scoped_set_adder::scoped_set_adder(std::string const& name) : name_(name) {
+scoped_set_adder::scoped_set_adder(std::string const& name) : name_(name)
+{
     std::lock_guard<std::mutex> lock(g_mutex);
     g_items.insert(this);
 }
 
-scoped_set_adder::~scoped_set_adder() {
+scoped_set_adder::~scoped_set_adder()
+{
     std::lock_guard<std::mutex> lock(g_mutex);
     g_items.erase(this);
 }
 
-bool scoped_set_adder::dump() {
+bool scoped_set_adder::dump()
+{
     std::lock_guard<std::mutex> lock(g_mutex);
     bool ret = (g_items.size() > 0);
     std::cout << "Scoped sets exist: " << ret << ", count: " << g_items.size() << std::endl;

product/scoped_set_adder.hpp

View file @ 1e46859

@@ -2,7 +2,8 @@
 
 #include <string>
 
-class scoped_set_adder {
+class scoped_set_adder
+{
 public:
     scoped_set_adder(const std::string& name);
     ~scoped_set_adder();

product/thread_manager.hpp

View file @ 1e46859

@@ -4,7 +4,8 @@
 #include <condition_variable>
 #include <thread>
 
-struct Manager {
+struct Manager
+{
     Manager();
     ~Manager();
 

product/thread_with_lambda.cpp

View file @ 1e46859

@@ -4,7 +4,8 @@
 #include "thread_with_lambda.hpp"
 
 
-namespace {
+namespace
+{
 
 std::mutex my_mutex;
 std::thread worker;

product/ui/widget.cpp

View file @ 1e46859

@@ -7,7 +7,8 @@ using namespace std;
 
 namespace UI {
 
-int widget_cb() {
+int widget_cb()
+{
     cout << "The function " << __PRETTY_FUNCTION__ << " was called." << endl;
     return 0;
 }


...	...	@@ -5,7 +5,8 @@
5	5
6	6	namespace MY_LIB {
7	7
8		-class my_lib_rect {
	8	+class my_lib_rect
	9	+{
9	10	int width_, height_;
10	11	public:
11	12	my_lib_rect(int width, int height);

...	...	@@ -1,7 +1,8 @@
1	1	#/bin/bash
2	2	set -eu -o pipefail # See: https://sipb.mit.edu/doc/safe-shell/
3	3
4		-ctags -n --if0=yes --langmap=c++:+.inl --c++-kinds=+p -R --extra=q \
	4	+# Add flag --c++-kinds=+p for tags to declaration in .h files too.
	5	+ctags -n --if0=yes --langmap=c++:+.inl -R --extra=q \
5	6	--exclude=.git \
6	7	--exclude=obj \
7	8	--exclude=lib \
...	...	@@ -16,7 +17,7 @@ find . -mindepth 1 \
16	17	-or -type d -print \| while read i
17	18	do
18	19	pushd "$i" 1> /dev/null
19		- ctags -n --if0=yes --langmap=c++:+.inl --c++-kinds=+p -R --extra=q \
	20	+ ctags -n --if0=yes --langmap=c++:+.inl -R --extra=q \
20	21	--exclude=obj \
21	22	--exclude='generated/'
22	23	popd 1> /dev/null

...	...	@@ -3,7 +3,8 @@
3	3
4	4	using namespace std;
5	5
6		-namespace {
	6	+namespace
	7	+{
7	8
8	9	int my_lib_helper_fn(int x) {
9	10	cout << "The function " << __func__ << " with parameter " << x << " was called." << endl;
...	...	@@ -24,12 +25,14 @@ int my_lib_rect::area() const
24	25	return width_ * height_;
25	26	}
26	27
27		-int my_lib_fn() {
	28	+int my_lib_fn()
	29	+{
28	30	cout << "The function " << __func__ << " was called." << endl;
29	31	return 0;
30	32	}
31	33
32		-int my_lib_fn(int x) {
	34	+int my_lib_fn(int x)
	35	+{
33	36	int a = my_lib_helper_fn(x);
34	37	cout << "The function " << __PRETTY_FUNCTION__ << " with parameter " << x << " was called." << endl;
35	38	return x + a;

...	...	@@ -57,7 +57,8 @@ int remove_duplicates(int a[], int n)
57	57	return last + 1;
58	58	}
59	59
60		-void test_cpp14() {
	60	+void test_cpp14()
	61	+{
61	62	#if __cplusplus == 201402L
62	63	// Store a generalized lambda, that squares a number, in a variable
63	64	auto func = [](auto input) { return input * input; };
...	...	@@ -73,17 +74,20 @@ void test_cpp14() {
73	74	#endif
74	75	}
75	76
76		-struct Base {
	77	+struct Base
	78	+{
77	79	virtual ~Base() {}
78	80	virtual void f() {}
79	81	int x_;
80	82	};
81	83
82		-struct Derived: Base {
	84	+struct Derived: Base
	85	+{
83	86	virtual void name() {}
84	87	};
85	88
86		-int main() {
	89	+int main()
	90	+{
87	91	length_of_array = 6;
88	92	int a[6] = { 10, 20, 20, 30, 40, 40 };
89	93	int item_to_remove = 20;

...	...	@@ -11,7 +11,8 @@ int read( std::string const &directory, const std::vector<unsigned char> &secret
11	11	return directory.length();
12	12	}
13	13
14		-int main_helper_fn() {
	14	+int main_helper_fn()
	15	+{
15	16	cout << "The function " << __PRETTY_FUNCTION__ << " was called." << endl;
16	17	string my_string("Hello");
17	18	vector<unsigned char> secret;

...	...	@@ -10,7 +10,8 @@ int main_helper_fn2();
10	10	template<class T>
11	11	using Pimpl = const std::unique_ptr<T>;
12	12
13		-class MyClass {
	13	+class MyClass
	14	+{
14	15	public:
15	16	MyClass();
16	17	~MyClass();

...	...	@@ -9,17 +9,20 @@ namespace {
9	9	std::set<scoped_set_adder *> g_items;
10	10	}
11	11
12		-scoped_set_adder::scoped_set_adder(std::string const& name) : name_(name) {
	12	+scoped_set_adder::scoped_set_adder(std::string const& name) : name_(name)
	13	+{
13	14	std::lock_guard<std::mutex> lock(g_mutex);
14	15	g_items.insert(this);
15	16	}
16	17
17		-scoped_set_adder::~scoped_set_adder() {
	18	+scoped_set_adder::~scoped_set_adder()
	19	+{
18	20	std::lock_guard<std::mutex> lock(g_mutex);
19	21	g_items.erase(this);
20	22	}
21	23
22		-bool scoped_set_adder::dump() {
	24	+bool scoped_set_adder::dump()
	25	+{
23	26	std::lock_guard<std::mutex> lock(g_mutex);
24	27	bool ret = (g_items.size() > 0);
25	28	std::cout << "Scoped sets exist: " << ret << ", count: " << g_items.size() << std::endl;

...	...	@@ -2,7 +2,8 @@
2	2
3	3	#include <string>
4	4
5		-class scoped_set_adder {
	5	+class scoped_set_adder
	6	+{
6	7	public:
7	8	scoped_set_adder(const std::string& name);
8	9	~scoped_set_adder();

...	...	@@ -4,7 +4,8 @@
4	4	#include <condition_variable>
5	5	#include <thread>
6	6
7		-struct Manager {
	7	+struct Manager
	8	+{
8	9	Manager();
9	10	~Manager();
10	11

...	...	@@ -4,7 +4,8 @@
4	4	#include "thread_with_lambda.hpp"
5	5
6	6
7		-namespace {
	7	+namespace
	8	+{
8	9
9	10	std::mutex my_mutex;
10	11	std::thread worker;

...	...	@@ -7,7 +7,8 @@ using namespace std;
7	7
8	8	namespace UI {
9	9
10		-int widget_cb() {
	10	+int widget_cb()
	11	+{
11	12	cout << "The function " << __PRETTY_FUNCTION__ << " was called." << endl;
12	13	return 0;
13	14	}
14	15

testcode.git