From: Jean Privat <jean@pryen.org>
Date: Sat, 21 Mar 2015 05:21:03 +0000 (+0700)
Subject: compiler: introduce and use char_instance, float_instance and null_instance
X-Git-Tag: v0.7.3~15^2
X-Git-Url: http://nitlanguage.org

compiler: introduce and use char_instance, float_instance and null_instance

Signed-off-by: Jean Privat <jean@pryen.org>
---

diff --git a/src/compiler/abstract_compiler.nit b/src/compiler/abstract_compiler.nit
index 40ac105..4dc34c8 100644
--- a/src/compiler/abstract_compiler.nit
+++ b/src/compiler/abstract_compiler.nit
@@ -1426,6 +1426,24 @@ abstract class AbstractCompilerVisitor
 		return res
 	end
 
+	# Generate a char value
+	fun char_instance(value: Char): RuntimeVariable
+	do
+		var t = mmodule.char_type
+		var res = new RuntimeVariable("'{value.to_s.escape_to_c}'", t, t)
+		return res
+	end
+
+	# Generate a float value
+	#
+	# FIXME pass a Float, not a string
+	fun float_instance(value: String): RuntimeVariable
+	do
+		var t = mmodule.float_type
+		var res = new RuntimeVariable("{value}", t, t)
+		return res
+	end
+
 	# Generate an integer value
 	fun bool_instance(value: Bool): RuntimeVariable
 	do
@@ -1434,6 +1452,14 @@ abstract class AbstractCompilerVisitor
 		return res
 	end
 
+	# Generate the `null` value
+	fun null_instance: RuntimeVariable
+	do
+		var t = compiler.mainmodule.model.null_type
+		var res = new RuntimeVariable("((val*)NULL)", t, t)
+		return res
+	end
+
 	# Generate a string value
 	fun string_instance(string: String): RuntimeVariable
 	do
@@ -2696,11 +2722,11 @@ redef class AIntExpr
 end
 
 redef class AFloatExpr
-	redef fun expr(v) do return v.new_expr("{self.n_float.text}", self.mtype.as(not null)) # FIXME use value, not n_float
+	redef fun expr(v) do return v.float_instance("{self.n_float.text}") # FIXME use value, not n_float
 end
 
 redef class ACharExpr
-	redef fun expr(v) do return v.new_expr("'{self.value.to_s.escape_to_c}'", self.mtype.as(not null))
+	redef fun expr(v) do return v.char_instance(self.value.as(not null))
 end
 
 redef class AArrayExpr
@@ -2773,7 +2799,7 @@ redef class AFalseExpr
 end
 
 redef class ANullExpr
-	redef fun expr(v) do return v.new_expr("NULL", self.mtype.as(not null))
+	redef fun expr(v) do return v.null_instance
 end
 
 redef class AIsaExpr