Skip to content

Commit 728d442

Browse files
committed
drop .hpp on primary interface
1 parent e0fd207 commit 728d442

32 files changed

+61
-45
lines changed

.gitattributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*.h linguist-language=cpp
2-
include/repr linguist-language=cpp
1+
# *.h linguist-language=cpp
2+
include/erl/info linguist-language=cpp
33

44
* text=auto eol=lf

NOTES.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Notes
2+
3+
4+
## VSCode recognize files with no suffix as C++
5+
Files with no extension aren't recognized as C++ by default. To fix this add the following to .vscode/settings.json in the repository root:
6+
7+
```json
8+
"files.associations": {
9+
"**/include/erl/{[!.],[!.][!.],[!.][!.][!.],[!.][!.][!.][!.],[!.][!.][!.][!.][!.]}{[],[!.],[!.][!.][!.][!.][!.],[!.][!.][!.][!.][!.][!.][!.][!.][!.][!.]}": "cpp"
10+
}
11+
```

example/args.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <erl/_impl/config/args.hpp>
2-
#include <erl/print.hpp>
2+
#include <erl/print>
33

44
struct [[= erl::clap::description("Example program.")]] Args : erl::clap {
55
std::string text;

example/format.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <erl/print.hpp>
1+
#include <erl/print>
22

33
struct Foo {
44
int x;

example/logging.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#include <thread>
44
#include <vector>
55

6-
#include <erl/print.hpp>
6+
#include <erl/print>
77
#include <erl/_impl/log/sinks/terminal.hpp>
8-
#include <erl/thread.hpp>
8+
#include <erl/info>
99

1010
#include <iostream>
1111
#include "erl/_impl/log/format/log.hpp"

example/plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <print>
2-
#include <erl/plugin.hpp>
2+
#include <erl/plugin>
33

44
int main() {
55
auto plugin = erl::load_plugin("libdemo_plugin.so");

example/rpc.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include <thread>
22
#include <unordered_map>
3-
#include <erl/print.hpp>
3+
#include <erl/print>
44
#include <erl/_impl/log/sinks/terminal.hpp>
55
#include <erl/_impl/log/format/color.hpp>
6-
#include <erl/thread.hpp>
7-
#include <erl/print.hpp>
8-
#include <erl/logging.hpp>
6+
#include <erl/info>
7+
#include <erl/print>
8+
#include <erl/logging>
99
constexpr static auto message_format =
1010
"[{timestamp:%H:%M:%S}] [{level:>5}] [{file_name}:{line}:{column}] {message}";
1111

include/erl/_impl/config/args.hpp

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#include <erl/_impl/util/meta.hpp>
1616
#include <erl/_impl/log/format/color.hpp>
1717

18+
#include <erl/info>
19+
1820
namespace erl {
1921
template <typename T>
2022
T parse_value(std::string_view value) {
@@ -325,23 +327,7 @@ class Spec {
325327
, options(std::meta::define_static_array(get_options())) {}
326328
};
327329

328-
struct Program {
329-
private:
330-
static std::string& get_name() {
331-
static std::string name;
332-
return name;
333-
}
334330

335-
public:
336-
static void set_name(std::string_view arg0) {
337-
if (arg0.empty()) {
338-
return;
339-
}
340-
auto path = std::filesystem::path(arg0);
341-
get_name() = path.stem().string();
342-
}
343-
static std::string_view name() { return get_name(); }
344-
};
345331

346332
struct clap {
347333
static constexpr annotations::Option option;

include/erl/_impl/config/default_construct.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <experimental/meta>
66

77
#include <erl/_impl/util/stamp.hpp>
8-
#include <erl/tuple.hpp>
8+
#include <erl/tuple>
99
#include <tuple>
1010
#include <utility>
1111

include/erl/_impl/config/expect.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <string>
77
#include <format>
88

9-
#include <erl/tuple.hpp>
9+
#include <erl/tuple>
1010
#include <erl/_impl/util/string.hpp>
1111
#include <erl/_impl/util/concepts.hpp>
1212
#include <erl/_impl/util/meta.hpp>

include/erl/_impl/log/format/log.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <filesystem>
66
#include <experimental/meta>
77

8-
#include <erl/kwargs.hpp>
8+
#include <erl/kwargs>
99
#include <erl/_impl/util/string.hpp>
1010
#include <erl/_impl/util/meta.hpp>
1111
#include <string>

include/erl/_impl/log/logger.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#include <unordered_map>
44

55
#include <erl/_impl/net/message/buffer.hpp>
6-
#include <erl/rpc.hpp>
6+
#include <erl/rpc>
77
#include <erl/_impl/rpc/proxy.hpp>
8-
#include <erl/clock.hpp>
8+
#include <erl/time>
99

1010
#include "sinks/sink.hpp"
1111
#include "message.hpp"

include/erl/_impl/log/message.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#include <ctime>
66
#include <chrono>
77

8-
#include <erl/clock.hpp>
9-
#include <erl/thread.hpp>
8+
#include <erl/time>
9+
#include <erl/info>
1010

1111
namespace erl::logging {
1212
struct Location {

include/erl/_impl/log/sinks/terminal.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <format>
44
#include <unordered_map>
55

6-
#include <erl/thread.hpp>
6+
#include <erl/info>
77
#include <erl/_impl/log/message.hpp>
88
#include <erl/_impl/log/format/log.hpp>
99
#include <erl/_impl/log/format/color.hpp>

include/erl/_impl/plugin/impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22
#include "cinterface.h"
33
#include <erl/version.h>
4-
#include <erl/autoload.hpp>
4+
#include <erl/autoload>
55
#include <stdexcept>
66

77
namespace erl::plugin {

include/erl/_impl/rpc/protocol.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <span>
55

66
#include <erl/_impl/rpc/proxy.hpp>
7-
#include <erl/reflect.hpp>
7+
#include <erl/reflect>
88
#include <erl/_impl/net/message/reader.hpp>
99

1010
#include <print>

include/erl/_impl/rpc/proxy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <ranges>
88
#include <experimental/meta>
99

10-
#include <erl/reflect.hpp>
10+
#include <erl/reflect>
1111
#include <erl/_impl/util/meta.hpp>
1212
#include <erl/_impl/util/stamp.hpp>
1313
#include <erl/_impl/net/message/buffer.hpp>
File renamed without changes.

include/erl/thread.hpp renamed to include/erl/info

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22
#include <cstdint>
33
#include <string>
4+
#include <filesystem>
45

56
namespace erl {
67
struct ThreadInfo {
@@ -18,4 +19,22 @@ struct ThreadInfo {
1819
};
1920

2021
inline thread_local ThreadInfo const this_thread{ThreadInfo::current()};
21-
} // namespace erl
22+
23+
struct Program {
24+
private:
25+
static std::string& get_name() {
26+
static std::string name;
27+
return name;
28+
}
29+
30+
public:
31+
static void set_name(std::string_view arg0) {
32+
if (arg0.empty()) {
33+
return;
34+
}
35+
auto path = std::filesystem::path(arg0);
36+
get_name() = path.stem().string();
37+
}
38+
static std::string_view name() { return get_name(); }
39+
};
40+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/clock.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <erl/clock.hpp>
1+
#include <erl/time>
22

33
namespace erl {
44
timestamp_t current_time(){

src/logging/logger.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include <erl/_impl/log/logger.hpp>
44
#include <erl/_impl/log/message.hpp>
55
#include <erl/_impl/net/message/reader.hpp>
6-
#include <erl/thread.hpp>
7-
#include <erl/clock.hpp>
6+
#include <erl/info>
7+
#include <erl/time>
88

99

1010
namespace erl::logging {

src/platform/library.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# include <dlfcn.h>
1515
#endif
1616

17-
#include <erl/autoload.hpp>
17+
#include <erl/autoload>
1818

1919
namespace erl::platform {
2020
#if (defined(_WIN32) || defined(_WIN64))

src/plugins/plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <erl/plugin.hpp>
1+
#include <erl/plugin>
22

33
namespace erl {
44

src/threading/info.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <shared_mutex>
66

77
#include <erl/_impl/log/logger.hpp>
8-
#include <erl/thread.hpp>
8+
#include <erl/info>
99

1010
#include "platform/info.h"
1111
#include <iostream>

0 commit comments

Comments
 (0)