atria-tools/estyle
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[DEV] update etk null

Browse Source
This commit is contained in:
Edouard DUPIN 2018-06-19 22:13:48 +02:00
parent c63f6b3ce1
commit 1aba54f1bb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
estyle/lexer/Lexer.cpp
View File

@ -202,8 +202,8 @@ void estyle::Lexer::parse() {
tockenElement = estyle::lexer::BASIC_TYPE_BOOLEAN;
} else if (idData == "std::string") {
tockenElement = estyle::lexer::BASIC_TYPE_STD_STRING;
} else if ( idData == "std::nullptr"
|| idData == "nullptr") {
} else if ( idData == "std::null"
|| idData == "null") {
tockenElement = estyle::lexer::BASIC_TYPE_STD_NULLPTR;
} else if (idData == "void") {
tockenElement = estyle::lexer::BASIC_TYPE_VOID;

2
estyle/lexer/tocken.cpp
View File

@ -122,7 +122,7 @@ etk::String estyle::lexer::toString(estyle::lexer::tocken _token) {
case estyle::lexer::BASIC_TYPE_FLOAT_96: return "triple";
case estyle::lexer::BASIC_TYPE_BOOLEAN: return "bool";
case estyle::lexer::BASIC_TYPE_STD_STRING: return "std::string";
case estyle::lexer::BASIC_TYPE_STD_NULLPTR: return "std::nullptr";
case estyle::lexer::BASIC_TYPE_STD_NULLPTR: return "std::null";
case estyle::lexer::BASIC_TYPE_VOID: return "void";
case estyle::lexer::ELEMENT_FUNCTION: return "FUNCTION";