From 9dc59d198e4a7bd4c38e3e0b8aeddd0e21fa1058 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Christophe=20Beaupr=C3=A9?=
 <jcbrinfo@users.noreply.github.com>
Date: Fri, 24 Mar 2017 22:44:44 -0400
Subject: [PATCH] compiler: Merge `maybenull` and `maybe_null`
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
---
 src/compiler/abstract_compiler.nit |   10 +++++-----
 src/compiler/separate_compiler.nit |    8 +-------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/compiler/abstract_compiler.nit b/src/compiler/abstract_compiler.nit
index 4ce8024..0d04167 100644
--- a/src/compiler/abstract_compiler.nit
+++ b/src/compiler/abstract_compiler.nit
@@ -1450,7 +1450,7 @@ abstract class AbstractCompilerVisitor
 	# Checks
 
 	# Can value be null? (according to current knowledge)
-	fun maybenull(value: RuntimeVariable): Bool
+	fun maybe_null(value: RuntimeVariable): Bool
 	do
 		return value.mcasttype isa MNullableType or value.mcasttype isa MNullType
 	end
@@ -1460,7 +1460,7 @@ abstract class AbstractCompilerVisitor
 	do
 		if self.compiler.modelbuilder.toolcontext.opt_no_check_null.value then return
 
-		if maybenull(recv) then
+		if maybe_null(recv) then
 			self.add("if (unlikely({recv} == NULL)) \{")
 			self.add_abort("Receiver is null")
 			self.add("\}")
@@ -3211,7 +3211,7 @@ redef class AAttrPropdef
 			assert arguments.length == 2
 			var recv = arguments.first
 			var arg = arguments[1]
-			if is_optional and v.maybenull(arg) then
+			if is_optional and v.maybe_null(arg) then
 				var value = v.new_var(self.mpropdef.static_mtype.as(not null))
 				v.add("if ({arg} == NULL) \{")
 				v.assign(value, evaluate_expr(v, recv))
@@ -3645,7 +3645,7 @@ redef class AOrElseExpr
 		var res = v.new_var(self.mtype.as(not null))
 		var i1 = v.expr(self.n_expr, null)
 
-		if not v.maybenull(i1) then return i1
+		if not v.maybe_null(i1) then return i1
 
 		v.add("if ({i1}!=NULL) \{")
 		v.assign(res, i1)
@@ -3898,7 +3898,7 @@ redef class AAsNotnullExpr
 		var i = v.expr(self.n_expr, null)
 		if v.compiler.modelbuilder.toolcontext.opt_no_check_assert.value then return i
 
-		if not v.maybenull(i) then return i
+		if not v.maybe_null(i) then return i
 
 		v.add("if (unlikely({i} == NULL)) \{")
 		v.add_abort("Cast failed")
diff --git a/src/compiler/separate_compiler.nit b/src/compiler/separate_compiler.nit
index e486b64..45790b3 100644
--- a/src/compiler/separate_compiler.nit
+++ b/src/compiler/separate_compiler.nit
@@ -1405,7 +1405,7 @@ class SeparateCompilerVisitor
 		var res: nullable RuntimeVariable = null
 		var recv = arguments.first
 		var consider_null = not self.compiler.modelbuilder.toolcontext.opt_no_check_null.value or mmethod.name == "==" or mmethod.name == "!="
-		if maybenull(recv) and consider_null then
+		if maybe_null(recv) and consider_null then
 			self.add("if ({recv} == NULL) \{")
 			if mmethod.name == "==" or mmethod.name == "is_same_instance" then
 				res = self.new_var(bool_type)
@@ -2061,12 +2061,6 @@ class SeparateCompilerVisitor
 		return k == interface_kind or t.is_c_primitive
 	end
 
-	fun maybe_null(value: RuntimeVariable): Bool
-	do
-		var t = value.mcasttype
-		return t isa MNullableType or t isa MNullType
-	end
-
 	redef fun array_instance(array, elttype)
 	do
 		var nclass = mmodule.native_array_class
-- 
1.7.9.5