belka/elna
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Replace ! with a function call writei

Browse Source
This commit is contained in:
Eugen Wissner
2024-03-19 09:35:50 +01:00
parent e7d8f9116a
commit c210c55a17
25 changed files with 315 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/lexer.cpp
View File

@ -108,20 +108,18 @@ namespace elna::source
}
token::token(const token& that)
: m_type(that.of()), m_position(that.position())
{
*this = that;
}
token::token(token&& that)
: m_type(that.of()), m_position(that.position())
{
*this = std::move(that);
}
token::~token()
{
if (m_type == type::identifier || m_type == type::term_operator || m_type == type::factor_operator)
if (has_identifier())
{
m_value.identifier.~basic_string();
}
@ -129,11 +127,15 @@ namespace elna::source
token& token::operator=(const token& that)
{
if (has_identifier())
{
m_value.identifier.~basic_string();
}
m_type = that.of();
m_position = that.position();
if (that.has_identifier())
{
m_value.identifier = that.identifier();
new((void *) &m_value.identifier) std::string(that.identifier());
}
else if (that.is_numeric())
{
@ -148,11 +150,15 @@ namespace elna::source
token& token::operator=(token&& that)
{
if (has_identifier())
{
m_value.identifier.~basic_string();
}
m_type = that.of();
m_position = that.position();
if (that.has_identifier())
{
m_value.identifier = std::move(that.identifier());
new((void *) &m_value.identifier) std::string(std::move(that.identifier()));
}
else if (that.is_numeric())
{
@ -344,10 +350,6 @@ namespace elna::source
{
tokens.emplace_back(token::type::comma, iterator.position());
}
else if (*iterator == '!')
{
tokens.emplace_back(token::type::bang, iterator.position());
}
else if (*iterator == '?')
{
tokens.emplace_back(token::type::question_mark, iterator.position());