mp3decoder finally passes the flow-down rule checking.

[IRC.git] / Robust / src / Tests / ssJava / mp3decoder / BitReserve.java

diff --git a/Robust/src/Tests/ssJava/mp3decoder/BitReserve.java b/Robust/src/Tests/ssJava/mp3decoder/BitReserve.java
index 4f5582168ecb88948335ae3b4d1f208c6675693a..e4167f00b0048a7c334801c46521dfba40f69068 100644 (file)
--- a/Robust/src/Tests/ssJava/mp3decoder/BitReserve.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/BitReserve.java
@@ -37,7 +37,7 @@
 \r
 // REVIEW: there is no range checking, so buffer underflow or overflow\r
 // can silently occur.\r
-@LATTICE("BUF<OFF,BIT,BIT*,OFF*")\r
+@LATTICE("BUF<OFF,BUF<BIT,BIT*,OFF*")\r
 @METHODDEFAULT("OUT<THIS,THIS<IN,IN*,THISLOC=THIS,RETURNLOC=OUT")\r
 final class BitReserve {\r
   /**\r
@@ -52,7 +52,7 @@ final class BitReserve {
    */\r
   private static final int BUFSIZE_MASK = BUFSIZE - 1;\r
 \r
-  @LOC("OFF")\r
+  @LOC("BIT")\r
   private int offset;\r
 \r
   @LOC("BIT")\r
@@ -61,7 +61,7 @@ final class BitReserve {
   @LOC("BIT")\r
   private int buf_byte_idx;\r
 \r
-  @LOC("BUF")\r
+  @LOC("BIT")\r
   private final int[] buf;\r
 \r
   BitReserve() {\r
@@ -74,7 +74,7 @@ final class BitReserve {
   /**\r
    * Return totbit Field.\r
    */\r
-\r
+  @RETURNLOC("THIS,BitReserve.BIT")\r
   public int hsstell() {\r
     return (totbit);\r
   }\r
@@ -116,9 +116,10 @@ final class BitReserve {
    * \r
    * @returns 0 if next bit is reset, or 1 if next bit is set.\r
    */\r
+  @RETURNLOC("THIS,BitReserve.BIT")\r
   public int hget1bit() {\r
     totbit++;\r
-    @LOC("OUT") int val = buf[buf_byte_idx];\r
+    @LOC("THIS,BitReserve.BIT") int val = buf[buf_byte_idx];\r
     buf_byte_idx = (buf_byte_idx + 1) & BUFSIZE_MASK;\r
     return val;\r
   }\r
@@ -148,7 +149,7 @@ final class BitReserve {
   /**\r
    * Rewind N bits in Stream.\r
    */\r
-  public void rewindNbits(@LOC("IN") int N) {\r
+  public void rewindNbits(@LOC("THIS,BitReserve.BIT") int N) {\r
     totbit -= N;\r
     buf_byte_idx -= N;\r
     if (buf_byte_idx < 0)\r