X-Git-Url: http://nitlanguage.org

diff --git a/src/literal.nit b/src/literal.nit
index 5d69035..ef4851b 100644
--- a/src/literal.nit
+++ b/src/literal.nit
@@ -17,12 +17,8 @@
 # Parsing of literal values in the abstract syntax tree.
 module literal
 
-import parser
-import toolcontext
 import phase
 
-import modelbuilder #FIXME useless
-
 redef class ToolContext
 	var literal_phase: Phase = new LiteralPhase(self, null)
 end
@@ -55,10 +51,8 @@ private class LiteralVisitor
 
 	redef fun visit(n)
 	do
-		if n != null then
-			n.accept_literal(self)
-			n.visit_all(self)
-		end
+		n.accept_literal(self)
+		n.visit_all(self)
 	end
 end
 
@@ -69,12 +63,22 @@ end
 redef class AIntExpr
 	# The value of the literal int once computed.
 	var value: nullable Int
+end
+
+redef class ADecIntExpr
 	redef fun accept_literal(v)
 	do
 		self.value = self.n_number.text.to_i
 	end
 end
 
+redef class AHexIntExpr
+	redef fun accept_literal(v)
+	do
+		self.value = self.n_hex_number.text.substring_from(2).to_hex
+	end
+end
+
 redef class AFloatExpr
 	# The value of the literal float once computed.
 	var value: nullable Float
@@ -94,7 +98,7 @@ redef class ACharExpr
 			v.toolcontext.error(self.hot_location, "Invalid character literal {txt}")
 			return
 		end
-		self.value = txt[1]
+		self.value = txt.chars[1]
 	end
 end
 
@@ -103,55 +107,14 @@ redef class AStringFormExpr
 	var value: nullable String
 	redef fun accept_literal(v)
 	do
-		var txt
-		if self isa AStringExpr then
-			txt = self.n_string.text
-		else if self isa AStartStringExpr then
-			txt = self.n_string.text
-		else if self isa AMidStringExpr then
-			txt = self.n_string.text
-		else if self isa AEndStringExpr then
-			txt = self.n_string.text
-		else abort
-		self.value = txt.substring(1, txt.length-2).unescape_nit
-	end
-end
-
-redef class String
-	# Return a string where Nit escape sequences are transformed.
-	#
-	# Example:
-	#     var s = "\\n"
-	#     print s.length # -> 2
-	#     var u = s.unescape_nit
-	#     print s.length # -> 1
-	#     print s[0].ascii # -> 10 (the ASCII value of the "new line" character)
-	fun unescape_nit: String
-	do
-		var res = new Buffer.with_capacity(self.length)
-		var was_slash = false
-		for c in self do
-			if not was_slash then
-				if c == '\\' then
-					was_slash = true
-				else
-					res.add(c)
-				end
-				continue
-			end
-			was_slash = false
-			if c == 'n' then
-				res.add('\n')
-			else if c == 'r' then
-				res.add('\r')
-			else if c == 't' then
-				res.add('\t')
-			else if c == '0' then
-				res.add('\0')
-			else
-				res.add(c)
-			end
+		var txt = self.n_string.text
+		var behead = 1
+		var betail = 1
+		if txt.chars[0] == txt.chars[1] and txt.length >= 6 then
+			behead = 3
+			betail = 3
+			if txt.chars[0] == '"' and txt.chars[3] == '\n' then behead = 4 # ignore first \n in """
 		end
-		return res.to_s
+		self.value = txt.substring(behead, txt.length - behead - betail).unescape_nit
 	end
 end