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

diff --git a/src/compiler/java_compiler.nit b/src/compiler/java_compiler.nit
index c229f88..84b5a47 100644
--- a/src/compiler/java_compiler.nit
+++ b/src/compiler/java_compiler.nit
@@ -1330,7 +1330,7 @@ end
 redef class MClass
 
 	# Runtime name
-	private fun rt_name: String do return "RTClass_{intro.mmodule.jname}_{jname}"
+	private fun rt_name: String do return "RTClass_{intro_mmodule.jname}_{jname}"
 
 	# Generate a Java RTClass for a Nit MClass
 	fun compile_to_java(v: JavaCompilerVisitor) do
@@ -1588,10 +1588,10 @@ redef class AMethPropdef
 			else if pname == "%" then
 				v.ret(v.new_expr("{arguments[0]} % {arguments[1]}", ret.as(not null)))
 				return true
-			else if pname == "lshift" then
+			else if pname == "<<" then
 				v.ret(v.new_expr("{arguments[0]} << {arguments[1]}", ret.as(not null)))
 				return true
-			else if pname == "rshift" then
+			else if pname == ">>" then
 				v.ret(v.new_expr("{arguments[0]} >> {arguments[1]}", ret.as(not null)))
 				return true
 			else if pname == "==" then
@@ -1692,10 +1692,10 @@ redef class AMethPropdef
 			else if pname == "%" then
 				v.ret(v.new_expr("(byte)({arguments[0]} % {arguments[1]})", ret.as(not null)))
 				return true
-			else if pname == "lshift" then
+			else if pname == "<<" then
 				v.ret(v.new_expr("(byte)({arguments[0]} << {arguments[1]})", ret.as(not null)))
 				return true
-			else if pname == "rshift" then
+			else if pname == ">>" then
 				v.ret(v.new_expr("(byte)({arguments[0]} >> {arguments[1]})", ret.as(not null)))
 				return true
 			else if pname == "==" then
@@ -2230,12 +2230,17 @@ redef class ANotExpr
 	end
 end
 
-redef class AIntExpr
-	redef fun expr(v) do return v.int_instance(self.value.as(not null))
-end
-
-redef class AByteExpr
-	redef fun expr(v) do return v.byte_instance(self.value.as(not null))
+redef class AIntegerExpr
+	redef fun expr(v) do
+		if value isa Int then
+			return v.int_instance(self.value.as(Int))
+		else if value isa Byte then
+			return v.byte_instance(self.value.as(Byte))
+		else
+			# Should not happen
+			abort
+		end
+	end
 end
 
 redef class AFloatExpr