From 1aba54f1bb039477b7aecbfc655c888a4154e501 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Tue, 19 Jun 2018 22:13:48 +0200
Subject: [PATCH] [DEV] update etk null

---
 estyle/lexer/Lexer.cpp  | 4 ++--
 estyle/lexer/tocken.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/estyle/lexer/Lexer.cpp b/estyle/lexer/Lexer.cpp
index eb2d461..802fafc 100644
--- a/estyle/lexer/Lexer.cpp
+++ b/estyle/lexer/Lexer.cpp
@@ -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;
diff --git a/estyle/lexer/tocken.cpp b/estyle/lexer/tocken.cpp
index 6a7a309..273731a 100644
--- a/estyle/lexer/tocken.cpp
+++ b/estyle/lexer/tocken.cpp
@@ -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";