Implement comparison operators
This commit is contained in:
@ -204,7 +204,8 @@ namespace elna::source
|
||||
{
|
||||
return of() == type::identifier
|
||||
|| of() == type::term_operator
|
||||
|| of() == type::factor_operator;
|
||||
|| of() == type::factor_operator
|
||||
|| of() == type::comparison_operator;
|
||||
}
|
||||
|
||||
bool token::is_numeric() const noexcept
|
||||
@ -218,51 +219,53 @@ namespace elna::source
|
||||
switch (this->m_type)
|
||||
{
|
||||
case type::number:
|
||||
return "«number»";
|
||||
return "«number»";
|
||||
case type::boolean:
|
||||
return "«boolean»";
|
||||
return "«boolean»";
|
||||
case type::term_operator:
|
||||
return "«term_operator»";
|
||||
return "«term_operator»";
|
||||
case type::let:
|
||||
return "«const»";
|
||||
return "«const»";
|
||||
case type::identifier:
|
||||
return "«identifier»";
|
||||
return "«identifier»";
|
||||
case type::equals:
|
||||
return "«=»";
|
||||
return "«=»";
|
||||
case type::var:
|
||||
return "«var»";
|
||||
return "«var»";
|
||||
case type::semicolon:
|
||||
return "«;»";
|
||||
return "«;»";
|
||||
case type::left_paren:
|
||||
return "«(»";
|
||||
return "«(»";
|
||||
case type::right_paren:
|
||||
return "«)»";
|
||||
return "«)»";
|
||||
case type::dot:
|
||||
return "«)»";
|
||||
return "«)»";
|
||||
case type::comma:
|
||||
return "«,»";
|
||||
return "«,»";
|
||||
case type::factor_operator:
|
||||
return "«*»";
|
||||
return "«*»";
|
||||
case type::eof:
|
||||
return "«EOF»";
|
||||
return "«EOF»";
|
||||
case type::begin:
|
||||
return "«begin»";
|
||||
return "«begin»";
|
||||
case type::end:
|
||||
return "«end»";
|
||||
return "«end»";
|
||||
case type::assignment:
|
||||
return "«:=»";
|
||||
return "«:=»";
|
||||
case type::colon:
|
||||
return "«:»";
|
||||
return "«:»";
|
||||
case type::when:
|
||||
return "«if»";
|
||||
return "«if»";
|
||||
case type::then:
|
||||
return "«then»";
|
||||
case type::_while:
|
||||
return "«while»";
|
||||
return "«then»";
|
||||
case type::loop:
|
||||
return "«while»";
|
||||
case type::_do:
|
||||
return "«do»";
|
||||
return "«do»";
|
||||
case type::procedure:
|
||||
return "«proc»";
|
||||
return "«proc»";
|
||||
case type::comparison_operator:
|
||||
return "«comparison_operator»";
|
||||
};
|
||||
assert(false);
|
||||
}
|
||||
@ -446,7 +449,7 @@ namespace elna::source
|
||||
}
|
||||
else if (word == "while")
|
||||
{
|
||||
tokens.emplace_back(token::type::_while, iterator.position());
|
||||
tokens.emplace_back(token::type::loop, iterator.position());
|
||||
}
|
||||
else if (word == "do")
|
||||
{
|
||||
@ -477,12 +480,49 @@ namespace elna::source
|
||||
|
||||
tokens.emplace_back(token::type::term_operator, _operator.c_str(), iterator.position());
|
||||
}
|
||||
else if (*iterator == '/' && iterator + 1 != text_end && *(iterator + 1) == '=')
|
||||
{
|
||||
tokens.emplace_back(token::type::comparison_operator, "n", iterator.position());
|
||||
++iterator;
|
||||
}
|
||||
else if (*iterator == '*' || *iterator == '/')
|
||||
{
|
||||
std::string _operator{ *iterator };
|
||||
|
||||
tokens.emplace_back(token::type::factor_operator, _operator.c_str(), iterator.position());
|
||||
}
|
||||
else if (*iterator == '<')
|
||||
{
|
||||
std::string _operator;
|
||||
auto operator_position = iterator.position();
|
||||
|
||||
if (iterator + 1 == text_end || *(iterator + 1) != '=')
|
||||
{
|
||||
_operator.push_back(*iterator);
|
||||
}
|
||||
else
|
||||
{
|
||||
++iterator;
|
||||
_operator.push_back('l');
|
||||
}
|
||||
tokens.emplace_back(token::type::comparison_operator, _operator.c_str(), operator_position);
|
||||
}
|
||||
else if (*iterator == '>')
|
||||
{
|
||||
std::string _operator;
|
||||
auto operator_position = iterator.position();
|
||||
|
||||
if (iterator + 1 == text_end || *(iterator + 1) != '=')
|
||||
{
|
||||
_operator.push_back(*iterator);
|
||||
}
|
||||
else
|
||||
{
|
||||
++iterator;
|
||||
_operator.push_back('g');
|
||||
}
|
||||
tokens.emplace_back(token::type::comparison_operator, _operator.c_str(), operator_position);
|
||||
}
|
||||
else if (*iterator == ':' && iterator + 1 != text_end && *(iterator + 1) == '=')
|
||||
{
|
||||
tokens.emplace_back(token::type::assignment, iterator.position());
|
||||
|
Reference in New Issue
Block a user