add VALID_FIELD_FLAGS (like VALID_METHOD_FLAGS)

darcs-hash:20050702225742-24bed-86aa60249f41238dc52238fe95565f3c2e5c0df4.gz

diff --git a/src/org/ibex/classgen/CGConst.java b/src/org/ibex/classgen/CGConst.java
index 9d8d6d4..88685e0 100644 (file)
--- a/src/org/ibex/classgen/CGConst.java
+++ b/src/org/ibex/classgen/CGConst.java
@@ -25,6 +25,7 @@ public interface CGConst {
     // Field only
     public static final int VOLATILE  = 0x0040;
     public static final int TRANSIENT = 0x0080;
     // Field only
     public static final int VOLATILE  = 0x0040;
     public static final int TRANSIENT = 0x0080;

+    public static final int VALID_FIELD_FLAGS = PUBLIC|PRIVATE|PROTECTED|VOLATILE|TRANSIENT|STATIC|FINAL;

 
     
     // Constant Pool Stuff
 
     
     // Constant Pool Stuff

diff --git a/src/org/ibex/classgen/FieldGen.java b/src/org/ibex/classgen/FieldGen.java
index b657342..f29e1da 100644 (file)
--- a/src/org/ibex/classgen/FieldGen.java
+++ b/src/org/ibex/classgen/FieldGen.java
@@ -23,7 +23,7 @@ public class FieldGen implements CGConst {
     
     FieldGen(DataInput in, ConstantPool cp) throws IOException {
         flags = in.readShort();
     
     FieldGen(DataInput in, ConstantPool cp) throws IOException {
         flags = in.readShort();

-        if((flags & ~(PUBLIC|PRIVATE|PROTECTED|VOLATILE|TRANSIENT|STATIC|FINAL)) != 0)
+        if((flags & ~VALID_FIELD_FLAGS) != 0)

             throw new ClassFile.ClassReadExn("invalid flags");        
         name = cp.getUtf8KeyByIndex(in.readShort());
         type = Type.instance(cp.getUtf8KeyByIndex(in.readShort()));
             throw new ClassFile.ClassReadExn("invalid flags");        
         name = cp.getUtf8KeyByIndex(in.readShort());
         type = Type.instance(cp.getUtf8KeyByIndex(in.readShort()));

@@ -31,7 +31,7 @@ public class FieldGen implements CGConst {
     }
 
     FieldGen(ClassFile owner, String name, Type type, int flags) {
     }
 
     FieldGen(ClassFile owner, String name, Type type, int flags) {

-        if((flags & ~(PUBLIC|PRIVATE|PROTECTED|VOLATILE|TRANSIENT|STATIC|FINAL)) != 0)
+        if((flags & ~VALID_FIELD_FLAGS) != 0)

             throw new IllegalArgumentException("invalid flags");
         this.name = name;
         this.type = type;
             throw new IllegalArgumentException("invalid flags");
         this.name = name;
         this.type = type;