[pmd-devel] pmd/src/net/sourceforge/pmd/ast ASTType.java,1.4,1.5 JavaParser.java,1.53,1.54

[Tom C. <tom...@us...>]

Update of /cvsroot/pmd/pmd/src/net/sourceforge/pmd/ast
In directory sc8-pr-cvs1:/tmp/cvs-serv21954/src/net/sourceforge/pmd/ast

Modified Files:
	ASTType.java JavaParser.java 
Log Message:
Added getDimensions() to ASTType

Index: ASTType.java
===================================================================
RCS file: /cvsroot/pmd/pmd/src/net/sourceforge/pmd/ast/ASTType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ASTType.java	28 Aug 2003 16:00:43 -0000	1.4
--- ASTType.java	8 Oct 2003 13:08:24 -0000	1.5
***************
*** 13,16 ****
--- 13,17 ----
  
      private boolean isArray;
+     private int dimensions;
  
      public boolean isArray() {
***************
*** 20,23 ****
--- 21,36 ----
      public void setIsArray() {
          this.isArray = true;
+     }
+ 
+     public void addDimension() {
+         dimensions++;
+     }
+ 
+     /**
+      * Note that this is only valid for array types.  It'd
+      * be better to have a ASTType subclass for this.
+      */
+     public int getDimensions() {
+         return dimensions;
      }
  

Index: JavaParser.java
===================================================================
RCS file: /cvsroot/pmd/pmd/src/net/sourceforge/pmd/ast/JavaParser.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** JavaParser.java	17 Sep 2003 19:48:45 -0000	1.53
--- JavaParser.java	8 Oct 2003 13:08:24 -0000	1.54
***************
*** 1698,1702 ****
          jj_consume_token(LBRACKET);
          jj_consume_token(RBRACKET);
!                                           jjtn000.setIsArray();
        }
      } catch (Throwable jjte000) {
--- 1698,1703 ----
          jj_consume_token(LBRACKET);
          jj_consume_token(RBRACKET);
!     jjtn000.addDimension();
!     jjtn000.setIsArray();
        }
      } catch (Throwable jjte000) {
***************
*** 4611,4626 ****
    }
  
-   final private boolean jj_3R_216() {
-     if (jj_3R_232()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     Token xsp;
-     while (true) {
-       xsp = jj_scanpos;
-       if (jj_3R_242()) { jj_scanpos = xsp; break; }
-       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     }
-     return false;
-   }
- 
    final private boolean jj_3R_209() {
      if (jj_3R_216()) return true;
--- 4612,4615 ----
***************
*** 4854,4863 ****
    }
  
-   final private boolean jj_3R_134() {
-     if (jj_3R_47()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3R_129() {
      if (jj_scan_token(VOID)) return true;
--- 4843,4846 ----
***************
*** 4877,4880 ****
--- 4860,4869 ----
    }
  
+   final private boolean jj_3R_134() {
+     if (jj_3R_47()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
    final private boolean jj_3R_125() {
      if (jj_scan_token(DOUBLE)) return true;
***************
*** 6399,6402 ****
--- 6388,6399 ----
    }
  
+   final private boolean jj_3R_376() {
+     if (jj_scan_token(COLON)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_3R_61()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
    final private boolean jj_3R_69() {
      if (jj_scan_token(PUBLIC)) return true;
***************
*** 6413,6424 ****
    }
  
-   final private boolean jj_3R_376() {
-     if (jj_scan_token(COLON)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_3R_61()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3R_162() {
      if (jj_scan_token(CLASS)) return true;
--- 6410,6413 ----
***************
*** 6456,6459 ****
--- 6445,6462 ----
    }
  
+   final private boolean jj_3R_181() {
+     if (jj_scan_token(IDENTIFIER)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_3R_61()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     Token xsp;
+     xsp = jj_scanpos;
+     if (jj_3R_376()) jj_scanpos = xsp;
+     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_scan_token(SEMICOLON)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
    final private boolean jj_3R_395() {
      if (jj_scan_token(FINAL)) return true;
***************
*** 6497,6514 ****
    }
  
-   final private boolean jj_3R_181() {
-     if (jj_scan_token(IDENTIFIER)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_3R_61()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     Token xsp;
-     xsp = jj_scanpos;
-     if (jj_3R_376()) jj_scanpos = xsp;
-     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_scan_token(SEMICOLON)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3R_42() {
      Token xsp;
--- 6500,6503 ----
***************
*** 6534,6549 ****
    }
  
-   final private boolean jj_3_1() {
-     Token xsp;
-     while (true) {
-       xsp = jj_scanpos;
-       if (jj_3R_42()) { jj_scanpos = xsp; break; }
-       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     }
-     if (jj_scan_token(CLASS)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3R_386() {
      if (jj_scan_token(FINALLY)) return true;
--- 6523,6526 ----
***************
*** 6554,6559 ****
    }
  
!   final private boolean jj_3R_373() {
!     if (jj_scan_token(SEMICOLON)) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
--- 6531,6542 ----
    }
  
!   final private boolean jj_3_1() {
!     Token xsp;
!     while (true) {
!       xsp = jj_scanpos;
!       if (jj_3R_42()) { jj_scanpos = xsp; break; }
!       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
!     }
!     if (jj_scan_token(CLASS)) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
***************
*** 6574,6583 ****
    }
  
-   final private boolean jj_3R_372() {
-     if (jj_3R_375()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3R_194() {
      if (jj_scan_token(TRY)) return true;
--- 6557,6560 ----
***************
*** 6597,6600 ****
--- 6574,6589 ----
    }
  
+   final private boolean jj_3R_373() {
+     if (jj_scan_token(SEMICOLON)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3R_372() {
+     if (jj_3R_375()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
    final private boolean jj_3R_371() {
      if (jj_3R_374()) return true;
***************
*** 8375,8378 ****
--- 8364,8379 ----
      if (jj_3R_132()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3R_216() {
+     if (jj_3R_232()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     Token xsp;
+     while (true) {
+       xsp = jj_scanpos;
+       if (jj_3R_242()) { jj_scanpos = xsp; break; }
+       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     }
      return false;
    }