Skip to content

Commit 6896cb5

Browse files
flagardeflagarde
committed
clean
1 parent f22719e commit 6896cb5

13 files changed

+552
-552
lines changed

‎apps/parser.cpp

+13-12
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "cpp-terminfo/Parser.hpp"
1111

1212
#include "cpp-terminfo/Print.hpp"
13+
#include "cpp-terminfo/Terminfo.hpp"
1314

1415
#include <fstream>
1516
#include <iostream>
@@ -49,33 +50,33 @@ void Writer::writeCPP()
4950
std::string description = m_infos[i].getType().description();
5051
std::string aliases = "\"" + m_infos[i].getType().name() + "\"";
5152
for(std::size_t j = 0; j != m_infos[i].getType().aliases().size(); ++j) { aliases += ",\"" + m_infos[i].getType().aliases()[j] + "\""; }
52-
std::string booleans = "{";
53-
const std::set<Terminfo::Boolean> bools = m_infos[i].getBooleans();
54-
for(std::set<Terminfo::Boolean>::const_iterator it = bools.cbegin(); it != bools.cend(); ++it)
53+
std::string booleans = "{";
54+
const Terminfo::Terminfo::BooleansContainer bools = m_infos[i].getBooleans();
55+
for(Terminfo::Terminfo::BooleansContainer::const_iterator it = bools.cbegin(); it != bools.cend(); ++it)
5556
{
56-
booleans += "Terminfo::Boolean(";
57+
booleans += "Terminfo::BooleanId(";
5758
booleans += std::to_string(static_cast<std::uint8_t>(*it));
5859
booleans += "),";
5960
}
6061
if(booleans.size() > 1) booleans.pop_back();
6162
booleans += "}";
62-
std::string inte = "{";
63-
const std::map<Terminfo::Integer, std::uint16_t> integers = m_infos[i].getIntegers();
64-
for(std::map<Terminfo::Integer, std::uint16_t>::const_iterator it = integers.cbegin(); it != integers.cend(); ++it)
63+
std::string inte = "{";
64+
const Terminfo::Terminfo::IntegersContainer integers = m_infos[i].getIntegers();
65+
for(Terminfo::Terminfo::IntegersContainer::const_iterator it = integers.cbegin(); it != integers.cend(); ++it)
6566
{
66-
inte += "{Terminfo::Integer(";
67+
inte += "{Terminfo::IntegerId(";
6768
inte += std::to_string(static_cast<std::uint8_t>(it->first));
6869
inte += "),";
6970
inte += std::to_string(it->second);
7071
inte += "},";
7172
}
7273
if(inte.size() > 1) inte.pop_back();
7374
inte += "}";
74-
const std::map<Terminfo::String, std::string> strings = m_infos[i].getStrings();
75-
std::string str = "{";
76-
for(std::map<Terminfo::String, std::string>::const_iterator it = strings.cbegin(); it != strings.cend(); ++it)
75+
const Terminfo::Terminfo::StringsContainer strings = m_infos[i].getStrings();
76+
std::string str = "{";
77+
for(Terminfo::Terminfo::StringsContainer::const_iterator it = strings.cbegin(); it != strings.cend(); ++it)
7778
{
78-
str += "{Terminfo::String(";
79+
str += "{Terminfo::StringId(";
7980
str += std::to_string(static_cast<std::uint16_t>(it->first));
8081
str += "),R\"(";
8182
str += it->second;

‎examples/terminal.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ int main(int argc, char* argv[])
2424
std::cout << terminfo;
2525
std::cout << "Insert a terminal name " << std::endl;
2626

27-
std::cout << "Number of lines: " << terminfo.get(Terminfo::Integer::columns) << std::endl;
28-
std::cout << "Has automatic margins: " << terminfo.get(Terminfo::Boolean::auto_right_margin) << std::endl;
27+
std::cout << "Number of lines: " << terminfo.get(Terminfo::IntegerId::columns) << std::endl;
28+
std::cout << "Has automatic margins: " << terminfo.get(Terminfo::BooleanId::auto_right_margin) << std::endl;
2929
std::cout << "Terminal description: " << terminfo.getType().description() << std::endl;
3030
}
3131
catch(const std::out_of_range& e)

‎include/cpp-terminfo/Boolean.hpp renamed to ‎include/cpp-terminfo/BooleanId.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Terminfo
1414
{
1515

16-
enum class Boolean : std::uint8_t
16+
enum class BooleanId : std::uint8_t
1717
{
1818
auto_left_margin,
1919
auto_right_margin,

‎include/cpp-terminfo/Capabilities.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class Capabilities
3434
bool isBoolean(const std::string& name) const noexcept { return std::find(m_booleans.begin(), m_booleans.end(), name) != m_booleans.end(); }
3535
bool isInteger(const std::string& name) const noexcept { return std::find(m_integers.begin(), m_integers.end(), name) != m_integers.end(); }
3636
bool isString(const std::string& name) const noexcept { return std::find(m_strings.begin(), m_strings.end(), name) != m_strings.end(); }
37-
Boolean getBoolean(const std::string& str);
38-
Integer getInteger(const std::string& str);
39-
String getString(const std::string& str);
40-
BooleanCapability get(const Boolean& boolean) const { return m_booleans[static_cast<std::size_t>(boolean)]; }
41-
IntegerCapability get(const Integer& integer) const { return m_integers[static_cast<std::size_t>(integer)]; }
42-
StringCapability get(const String& string) const { return m_strings[static_cast<std::size_t>(string)]; }
37+
BooleanId getBoolean(const std::string& str);
38+
IntegerId getInteger(const std::string& str);
39+
StringId getString(const std::string& str);
40+
BooleanCapability get(const BooleanId& boolean) const { return m_booleans[static_cast<std::size_t>(boolean)]; }
41+
IntegerCapability get(const IntegerId& integer) const { return m_integers[static_cast<std::size_t>(integer)]; }
42+
StringCapability get(const StringId& string) const { return m_strings[static_cast<std::size_t>(string)]; }
4343
inline bool know(const std::string& name) const noexcept { return isBoolean(name) || isInteger(name) || isString(name); }
4444
};
4545

‎include/cpp-terminfo/Capability.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
*/
99

1010
#pragma once
11-
#include "cpp-terminfo/Boolean.hpp"
12-
#include "cpp-terminfo/Integer.hpp"
13-
#include "cpp-terminfo/String.hpp"
11+
#include "cpp-terminfo/BooleanId.hpp"
12+
#include "cpp-terminfo/IntegerId.hpp"
13+
#include "cpp-terminfo/StringId.hpp"
1414

1515
#include <string>
1616

@@ -33,8 +33,8 @@ template<typename type_id> class Capability
3333
type_id m_id;
3434
};
3535

36-
using BooleanCapability = Capability<Boolean>;
37-
using IntegerCapability = Capability<Integer>;
38-
using StringCapability = Capability<String>;
36+
using BooleanCapability = Capability<BooleanId>;
37+
using IntegerCapability = Capability<IntegerId>;
38+
using StringCapability = Capability<StringId>;
3939

4040
} // namespace Terminfo

‎include/cpp-terminfo/Get.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
#include "cpp-terminfo/Terminfo.hpp"
1313

14-
#include <functional>
15-
1614
#ifdef _WIN32
1715
#ifdef BUILDING_DLL
1816
#define DLL_EXPORT __declspec(dllexport)

‎include/cpp-terminfo/Integer.hpp renamed to ‎include/cpp-terminfo/IntegerId.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Terminfo
1414
{
1515

16-
enum class Integer : std::uint8_t
16+
enum class IntegerId : std::uint8_t
1717
{
1818
columns,
1919
init_tabs,

‎include/cpp-terminfo/String.hpp renamed to ‎include/cpp-terminfo/StringId.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Terminfo
1414
{
1515

16-
enum class String : std::uint16_t
16+
enum class StringId : std::uint16_t
1717
{
1818
back_tab,
1919
bell,

‎include/cpp-terminfo/Terminfo.hpp

+26-23
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
*/
99

1010
#pragma once
11-
#include "cpp-terminfo/Boolean.hpp"
12-
#include "cpp-terminfo/Integer.hpp"
13-
#include "cpp-terminfo/String.hpp"
11+
#include "cpp-terminfo/BooleanId.hpp"
12+
#include "cpp-terminfo/IntegerId.hpp"
13+
#include "cpp-terminfo/StringId.hpp"
1414
#include "cpp-terminfo/Type.hpp"
1515

1616
#include <cstdint>
@@ -23,29 +23,32 @@ namespace Terminfo
2323
class Terminfo
2424
{
2525
public:
26+
using BooleansContainer = std::set<BooleanId>;
27+
using IntegersContainer = std::map<IntegerId, std::uint16_t>;
28+
using StringsContainer = std::map<StringId, std::string>;
2629
Terminfo() {}
27-
Terminfo(const Type& type) : m_type(type) {}
28-
Terminfo(const Type& type, const std::set<Boolean>& booleans, const std::map<Integer, std::uint16_t>& integers, const std::map<String, std::string>& strings) : m_type(type), m_booleans(booleans), m_integers(integers), m_strings(strings) {}
29-
Type getType() const { return m_type; }
30-
void addBoolean(const Boolean& boolean) { m_booleans.insert(boolean); }
31-
void addInteger(const Integer& integer, const std::uint16_t& value) { m_integers[integer] = {value}; }
32-
void addString(const String& string, const std::string& value) { m_strings[string] = {value}; }
33-
void add(const Terminfo& rhs);
34-
void remove(const Boolean& boolean) { m_booleans.erase(boolean); }
35-
void remove(const Integer& integer) { m_integers.erase(integer); }
36-
void remove(const String& string) { m_strings.erase(string); }
37-
bool get(const Boolean& boolean) const { return m_booleans.find(boolean) != m_booleans.end(); }
38-
const std::uint16_t& get(const Integer& integer) const { return m_integers.at(integer); }
39-
const std::string& get(const String& string) const { return m_strings.at(string); }
40-
std::set<Boolean> getBooleans() const { return m_booleans; }
41-
std::map<Integer, std::uint16_t> getIntegers() const { return m_integers; }
42-
std::map<String, std::string> getStrings() const { return m_strings; }
30+
explicit Terminfo(const Type& type) : m_type(type) {}
31+
Terminfo(const Type& type, const BooleansContainer& booleans, const IntegersContainer& integers, const StringsContainer& strings) : m_booleans(booleans), m_integers(integers), m_strings(strings), m_type(type) {}
32+
Type getType() const { return m_type; }
33+
void add(const BooleanId& id) { m_booleans.insert(id); }
34+
void add(const IntegerId& id, const std::uint16_t& value) { m_integers[id] = {value}; }
35+
void add(const StringId& id, const std::string& value) { m_strings[id] = {value}; }
36+
void add(const Terminfo& rhs);
37+
void remove(const BooleanId& boolean) { m_booleans.erase(boolean); }
38+
void remove(const IntegerId& integer) { m_integers.erase(integer); }
39+
void remove(const StringId& string) { m_strings.erase(string); }
40+
bool get(const BooleanId& boolean) const { return m_booleans.find(boolean) != m_booleans.end(); }
41+
const std::uint16_t& get(const IntegerId& integer) const { return m_integers.at(integer); }
42+
const std::string& get(const StringId& string) const { return m_strings.at(string); }
43+
BooleansContainer getBooleans() const { return m_booleans; }
44+
IntegersContainer getIntegers() const { return m_integers; }
45+
StringsContainer getStrings() const { return m_strings; }
4346

4447
private:
45-
std::set<Boolean> m_booleans;
46-
std::map<Integer, std::uint16_t> m_integers;
47-
std::map<String, std::string> m_strings;
48-
Type m_type;
48+
BooleansContainer m_booleans;
49+
IntegersContainer m_integers;
50+
StringsContainer m_strings;
51+
Type m_type;
4952
};
5053

5154
} // namespace Terminfo

‎include/cpp-terminfo/Type.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class Type
1919
{
2020
public:
2121
Type() = default;
22-
Type(const std::vector<std::string>& aliases, const std::string& description) : m_descritpion(description), m_aliases(aliases) {}
23-
std::string description() const noexcept { return m_descritpion; }
22+
Type(const std::vector<std::string>& aliases, const std::string& description) : m_description(description), m_aliases(aliases) {}
23+
std::string description() const noexcept { return m_description; }
2424
std::string name() const noexcept { return m_aliases[0]; }
2525
bool hasAlias() const noexcept { return m_aliases.size() - 1 != 0; }
2626
std::vector<std::string> aliases()
@@ -32,7 +32,7 @@ class Type
3232
bool isAlias(const std::string& str) const noexcept { return std::find(m_aliases.begin(), m_aliases.end(), str) != m_aliases.end(); }
3333

3434
private:
35-
std::string m_descritpion;
35+
std::string m_description;
3636
std::vector<std::string> m_aliases;
3737
};
3838
} // namespace Terminfo

0 commit comments

Comments
 (0)