commit f0b18f883cc6f440e982db83fe2e8535b4ecd11a
author David Pursehouse <david.pursehouse@sonymobile.com> Mon Mar 16 15:13:56 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Wed Mar 18 15:53:40 2015 +0900
tree 7475900c11f54f1fc7d402123fd85c9b24b9891e
parent b991b9250152262f761e434e1d243292e69e207f

Fix 'unnecessary cast' warnings

Change-Id: I2cab1dc9c85ee082bfe76ed97e0c07e9dd42d025

src/builtin/PRED_$read_token0_3.java

diff --git a/src/builtin/PRED_$read_token0_3.java b/src/builtin/PRED_$read_token0_3.java
index 1369a3d..2a48321 100644
--- a/src/builtin/PRED_$read_token0_3.java
+++ b/src/builtin/PRED_$read_token0_3.java
@@ -66,7 +66,7 @@
 		char[] chars = (s.toString()).toCharArray();
 		token = Prolog.Nil;
 		for (int i=chars.length; i>0; i--){
-		    token = new ListTerm(new IntegerTerm((int)chars[i-1]), token);
+		    token = new ListTerm(new IntegerTerm(chars[i-1]), token);
 		}
 		break;
 	    default :

src/builtin/PRED_atom_codes_2.java

diff --git a/src/builtin/PRED_atom_codes_2.java b/src/builtin/PRED_atom_codes_2.java
index 0687bba..602681a 100644
--- a/src/builtin/PRED_atom_codes_2.java
+++ b/src/builtin/PRED_atom_codes_2.java
@@ -54,7 +54,7 @@
 	    char[] chars = ((SymbolTerm)a1).name().toCharArray();
 	    Term x = Prolog.Nil;
 	    for (int i=chars.length; i>0; i--) {
-		x = new ListTerm(new IntegerTerm((int)chars[i-1]), x);
+		x = new ListTerm(new IntegerTerm(chars[i-1]), x);
 	    }
 	    if(! a2.unify(x, engine.trail)) 
 		return engine.fail();

src/builtin/PRED_char_code_2.java

diff --git a/src/builtin/PRED_char_code_2.java b/src/builtin/PRED_char_code_2.java
index f04ef1b..e25bfc8 100644
--- a/src/builtin/PRED_char_code_2.java
+++ b/src/builtin/PRED_char_code_2.java
@@ -40,7 +40,7 @@
 	    String s = ((SymbolTerm)a1).name();
 	    if (s.length() != 1)
 		throw new IllegalTypeException(this, 1, "character", a1);
-	    if(! a2.unify(new IntegerTerm((int)s.charAt(0)), engine.trail)) 
+	    if(! a2.unify(new IntegerTerm(s.charAt(0)), engine.trail))
 		return engine.fail();
 	} else {
 	    return engine.fail();

src/builtin/PRED_number_codes_2.java

diff --git a/src/builtin/PRED_number_codes_2.java b/src/builtin/PRED_number_codes_2.java
index f93be07..738800f 100644
--- a/src/builtin/PRED_number_codes_2.java
+++ b/src/builtin/PRED_number_codes_2.java
@@ -64,7 +64,7 @@
 	    char[] chars = a1.toString().toCharArray();
 	    Term y = Prolog.Nil;
 	    for (int i=chars.length; i>0; i--) {
-		y = new ListTerm(new IntegerTerm((int)chars[i-1]), y);
+		y = new ListTerm(new IntegerTerm(chars[i-1]), y);
 	    }
 	    if (! a2.unify(y, engine.trail) ) 
 		return engine.fail();

src/builtin/PRED_read_line_2.java

diff --git a/src/builtin/PRED_read_line_2.java b/src/builtin/PRED_read_line_2.java
index c32d8c5..72a9258 100644
--- a/src/builtin/PRED_read_line_2.java
+++ b/src/builtin/PRED_read_line_2.java
@@ -59,7 +59,7 @@
 	    for (int i=chars.length; i>0; i--) {
 		if (! Character.isDefined((int)chars[i-1]))
 		    throw new RepresentationException(this, 0, "character");
-		t = new ListTerm(new IntegerTerm((int)chars[i-1]), t);
+		t = new ListTerm(new IntegerTerm(chars[i-1]), t);
 	    }
 	    if(! a2.unify(t, engine.trail))
 		return engine.fail();

src/lang/IntegerTerm.java

diff --git a/src/lang/IntegerTerm.java b/src/lang/IntegerTerm.java
index 3eb84f5..24536f2 100644
--- a/src/lang/IntegerTerm.java
+++ b/src/lang/IntegerTerm.java
@@ -118,10 +118,10 @@
     public int intValue() { return this.val; }
 
     @Override
-    public long longValue() { return (long)(this.val); }
+    public long longValue() { return (this.val); }
 
     @Override
-    public double doubleValue() { return (double)(this.val); }
+    public double doubleValue() { return (this.val); }
 
     @Override
     public int arithCompareTo(NumberTerm t) {
@@ -206,7 +206,7 @@
 	    throw new IllegalTypeException("integer", t);
 	if (t.intValue() == 0)
 	    throw new EvaluationException("zero_divisor");
-	return new IntegerTerm((int) (this.val / t.intValue()));
+	return new IntegerTerm(this.val / t.intValue());
     }
 
     /** 
@@ -334,7 +334,7 @@
     public NumberTerm toDegrees() { return new DoubleTerm(Math.toDegrees(this.doubleValue())); }
 
     @Override
-    public NumberTerm toFloat() { return new DoubleTerm((double) this.val); }
+    public NumberTerm toFloat() { return new DoubleTerm(this.val); }
 
     @Override
     public NumberTerm toRadians() { return new DoubleTerm(Math.toRadians(this.doubleValue())); }

src/lang/Token.java

diff --git a/src/lang/Token.java b/src/lang/Token.java
index 4fabdb7..b65fb9a 100644
--- a/src/lang/Token.java
+++ b/src/lang/Token.java
@@ -429,14 +429,14 @@
 	p = s.toCharArray(); // string --> chars[]
 	if (Character.isLowerCase(p[0])){
 	    for (int i=1; i<p.length; i++){
-		if (! Character.isLetterOrDigit(p[i]) && ((int)p[i]) != '_')
+		if (! Character.isLetterOrDigit(p[i]) && (p[i]) != '_')
 		    return 3;
 	    }
 	    return 0;
 	}
-	if (isSymbol((int) p[0])){
+	if (isSymbol(p[0])){
 	    for (int i=1; i<p.length; i++){
-		if (! isSymbol((int) p[i]))
+		if (! isSymbol(p[i]))
 		    return 3;
 	    }
 	    return 1;