add PCLOC annotations. all three benchmarks are type-checked now.

[IRC.git] / Robust / src / ClassLibrary / SSJava / Math.java

diff --git a/Robust/src/ClassLibrary/SSJava/Math.java b/Robust/src/ClassLibrary/SSJava/Math.java
index b6f4a13011213e37be08e5c6e52dc17d7b06cb97..355caf9b023fc72eb087ab47cdfcf72a01889276 100644 (file)
--- a/Robust/src/ClassLibrary/SSJava/Math.java
+++ b/Robust/src/ClassLibrary/SSJava/Math.java
@@ -1,5 +1,5 @@
 @LATTICE("B<T")
-@METHODDEFAULT("OUT<IN,THISLOC=IN")
+@METHODDEFAULT("OUT<IN,OUT<THIS,,IN*,THISLOC=THIS,RETURNLOC=OUT")
 public class Math {
   @LOC("T")
   static final double PI = 3.14159265358979323846;
@@ -10,7 +10,7 @@ public class Math {
     return PI;
   }
 
-  public static int abs(int x) {
+  public static int abs(@LOC("IN") int x) {
     return (x < 0) ? -x : x;
   }
 
@@ -22,7 +22,7 @@ public class Math {
     return (x < 0) ? -x : x;
   }
 
-  public static float abs(float x) {
+  public static float abs(@LOC("IN") float x) {
     return (x < 0) ? -x : x;
   }
 
@@ -30,11 +30,11 @@ public class Math {
     return (a > b) ? a : b;
   }
 
-  public static float max(float a, float b) {
+  public static float max(@LOC("IN") float a, @LOC("IN") float b) {
     return (a > b) ? a : b;
   }
 
-  public static int max(int a, int b) {
+  public static int max(@LOC("IN") int a, @LOC("IN") int b) {
     return (a > b) ? a : b;
   }
 
@@ -52,7 +52,8 @@ public class Math {
     return (a < b) ? a : b;
   }
 
-  @RETURNLOC("IN")
+  @RETURNLOC("OUT")
+  @PCLOC("IN")
   public static int min(@LOC("IN") int a, @LOC("IN") int b) {
     return (a < b) ? a : b;
   }
@@ -77,7 +78,7 @@ public class Math {
     return r;
   }
 
-  public static int round(float a) {
+  public static int round(@LOC("IN") float a) {
     // this check for NaN, from JLS 15.21.1, saves a method call
     return (int) floor(a + 0.5f);
   }