coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2026-02-07 18:26:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better constexpr for comment types

Browse Source
This commit is contained in:
Jason Turner 2017-09-10 07:12:33 -06:00
parent 8568b61014
commit e38b05ff9a
1 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
include/chaiscript/language/chaiscript_parser.hpp
View File

@ -281,35 +281,11 @@ namespace chaiscript
return operators; return operators;
} }
constexpr static utility::Static_String multiline_comment_end() noexcept constexpr static utility::Static_String m_multiline_comment_end{"*/"};
{ constexpr static utility::Static_String m_multiline_comment_begin{"/*"};
constexpr utility::Static_String s("*/"); constexpr static utility::Static_String m_singleline_comment{"//"};
return s; constexpr static utility::Static_String m_annotation{"#"};
} constexpr static utility::Static_String m_cr_lf{"\r\n"};
constexpr static utility::Static_String multiline_comment_begin() noexcept
{
constexpr utility::Static_String s("/*");
return s;
}
constexpr static utility::Static_String singleline_comment() noexcept
{
constexpr utility::Static_String s("//");
return s;
}
constexpr static utility::Static_String annotation() noexcept
{
constexpr utility::Static_String s("#");
return s;
}
constexpr static utility::Static_String cr_lf() noexcept
{
constexpr utility::Static_String s("\r\n");
return s;
}
std::shared_ptr<std::string> m_filename; std::shared_ptr<std::string> m_filename;
@ -532,18 +508,18 @@ namespace chaiscript
/// Skips any multi-line or single-line comment /// Skips any multi-line or single-line comment
bool SkipComment() { bool SkipComment() {
if (Symbol_(multiline_comment_begin())) { if (Symbol_(m_multiline_comment_begin)) {
while (m_position.has_more()) { while (m_position.has_more()) {
if (Symbol_(multiline_comment_end())) { if (Symbol_(m_multiline_comment_end)) {
break; break;
} else if (!Eol_()) { } else if (!Eol_()) {
++m_position; ++m_position;
} }
} }
return true; return true;
} else if (Symbol_(singleline_comment())) { } else if (Symbol_(m_singleline_comment)) {
while (m_position.has_more()) { while (m_position.has_more()) {
if (Symbol_(cr_lf())) { if (Symbol_(m_cr_lf)) {
m_position -= 2; m_position -= 2;
break; break;
} else if (Char_('\n')) { } else if (Char_('\n')) {
@ -554,9 +530,9 @@ namespace chaiscript
} }
} }
return true; return true;
} else if (Symbol_(annotation())) { } else if (Symbol_(m_annotation)) {
while (m_position.has_more()) { while (m_position.has_more()) {
if (Symbol_(cr_lf())) { if (Symbol_(m_cr_lf)) {
m_position -= 2; m_position -= 2;
break; break;
} else if (Char_('\n')) { } else if (Char_('\n')) {
@ -1472,7 +1448,7 @@ namespace chaiscript
bool Eol_(const bool t_eos = false) { bool Eol_(const bool t_eos = false) {
bool retval = false; bool retval = false;
if (m_position.has_more() && (Symbol_(cr_lf()) || Char_('\n'))) { if (m_position.has_more() && (Symbol_(m_cr_lf) || Char_('\n'))) {
retval = true; retval = true;
//++m_position.line; //++m_position.line;
m_position.col = 1; m_position.col = 1;