[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser TokenMgrError.java,1.1,1.2 HiswaParserTokenManager.java,1.1,1.2 HiswaParser.java,1.1,1.2

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv16187/dodico/src/org/fudaa/dodico/hiswa/parser

Modified Files:
	TokenMgrError.java HiswaParserTokenManager.java 
	HiswaParser.java 
Log Message:
ajout commentaires
suprression des variables inutiles

Index: TokenMgrError.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/TokenMgrError.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TokenMgrError.java	29 Jan 2003 12:14:43 -0000	1.1
--- TokenMgrError.java	18 Mar 2003 12:41:17 -0000	1.2
***************
*** 108,112 ****
      * Note: You can customize the lexical error message by modifying this method.
      */
!    private static final String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
        return("Lexical error at line " +
             errorLine + ", column " +
--- 108,112 ----
      * Note: You can customize the lexical error message by modifying this method.
      */
!    private static final String LexicalError(boolean EOFSeen, /*int lexState,*/ int errorLine, int errorColumn, String errorAfter, char curChar) {
        return("Lexical error at line " +
             errorLine + ", column " +
***************
*** 141,146 ****
     }
  
!    public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
!       this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
     }
  }
--- 141,146 ----
     }
  
!    public TokenMgrError(boolean EOFSeen/*, int lexState*/, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
!       this(LexicalError(EOFSeen/*, lexState*/, errorLine, errorColumn, errorAfter, curChar), reason);
     }
  }

Index: HiswaParserTokenManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/HiswaParserTokenManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HiswaParserTokenManager.java	29 Jan 2003 12:14:43 -0000	1.1
--- HiswaParserTokenManager.java	18 Mar 2003 12:41:17 -0000	1.2
***************
*** 52,68 ****
     } while (start++ != end);
  }
! private final void jjCheckNAddStates(int start)
! {
!    jjCheckNAdd(jjnextStates[start]);
!    jjCheckNAdd(jjnextStates[start + 1]);
! }
  private final int jjMoveNfa_1(int startState, int curPos)
  {
-    int[] nextStates;
     int startsAt = 0;
     jjnewStateCnt = 3;
     int i = 1;
     jjstateSet[0] = startState;
!    int j, kind = 0x7fffffff;
     for (;;)
     {
--- 52,68 ----
     } while (start++ != end);
  }
! //private final void jjCheckNAddStates(int start)
! //{
! //   jjCheckNAdd(jjnextStates[start]);
! //   jjCheckNAdd(jjnextStates[start + 1]);
! //}
! 
  private final int jjMoveNfa_1(int startState, int curPos)
  {
     int startsAt = 0;
     jjnewStateCnt = 3;
     int i = 1;
     jjstateSet[0] = startState;
!    int kind = 0x7fffffff;
     for (;;)
     {
***************
*** 99,103 ****
        else if (curChar < 128)
        {
!          long l = 1L << (curChar & 077);
           MatchLoop: do
           {
--- 99,103 ----
        else if (curChar < 128)
        {
! //         long l = 1L << (curChar & 077);
           MatchLoop: do
           {
***************
*** 111,118 ****
        {
           int hiByte = (int)(curChar >> 8);
!          int i1 = hiByte >> 6;
!          long l1 = 1L << (hiByte & 077);
!          int i2 = (curChar & 0xff) >> 6;
!          long l2 = 1L << (curChar & 077);
           MatchLoop: do
           {
--- 111,118 ----
        {
           int hiByte = (int)(curChar >> 8);
!   //       int i1 = hiByte >> 6;
!     //     long l1 = 1L << (hiByte & 077);
!       //   int i2 = (curChar & 0xff) >> 6;
!         // long l2 = 1L << (curChar & 077);
           MatchLoop: do
           {
***************
*** 638,647 ****
  private final int jjMoveNfa_0(int startState, int curPos)
  {
!    int[] nextStates;
     int startsAt = 0;
     jjnewStateCnt = 285;
     int i = 1;
     jjstateSet[0] = startState;
!    int j, kind = 0x7fffffff;
     for (;;)
     {
--- 638,647 ----
  private final int jjMoveNfa_0(int startState, int curPos)
  {
! //   int[] nextStates;
     int startsAt = 0;
     jjnewStateCnt = 285;
     int i = 1;
     jjstateSet[0] = startState;
!    int kind = 0x7fffffff;
     for (;;)
     {
***************
*** 4212,4216 ****
          error_after = curPos <= 1 ? "" : input_stream.GetImage();
       }
!      throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
     }
    }
--- 4212,4216 ----
          error_after = curPos <= 1 ? "" : input_stream.GetImage();
       }
!      throw new TokenMgrError(EOFSeen/*, curLexState*/, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
     }
    }

Index: HiswaParser.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/HiswaParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HiswaParser.java	29 Jan 2003 12:14:43 -0000	1.1
--- HiswaParser.java	18 Mar 2003 12:41:17 -0000	1.2
***************
*** 366,370 ****
  
    final public void hiswaInput() throws ParseException {
!         String s;
      label_2:
      while (true) {
--- 366,370 ----
  
    final public void hiswaInput() throws ParseException {
! //        String s;
      label_2:
      while (true) {
***************
*** 568,572 ****
  
    final public void set() throws ParseException {
!         Token set, n,cfae=null;
          double nb;      //pour convertir le string en entier
     int i=0;     // indice du tableau
--- 568,572 ----
  
    final public void set() throws ParseException {
!         Token set, n=null;
          double nb;      //pour convertir le string en entier
     int i=0;     // indice du tableau
***************
*** 3119,3123 ****
    final public void plot() throws ParseException {
          Token plot, sname, file=null, fname=null, title=null, option=null, option1=null, n=null;
!    Token option2=null, option3=null, scale=null, dist=null, symsiz=null, places=null, lines=null;
          double nb;
     int indice=0;        // indice de liste
--- 3119,3123 ----
    final public void plot() throws ParseException {
          Token plot, sname, file=null, fname=null, title=null, option=null, option1=null, n=null;
!    Token option2=null, option3=null, /*scale=null, dist=null,*/ symsiz=null, places=null, lines=null;
          double nb;
     int indice=0;        // indice de liste
***************
*** 3793,3797 ****
    private int jj_la;
    public boolean lookingAhead = false;
!   private boolean jj_semLA;
    private int jj_gen;
    final private int[] jj_la1 = new int[191];
--- 3793,3797 ----
    private int jj_la;
    public boolean lookingAhead = false;
! //  private boolean jj_semLA;
    private int jj_gen;
    final private int[] jj_la1 = new int[191];