jrman-commit

[<ega...@us...>]

Update of /cvsroot/jrman/drafts/javacc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20035

Modified Files:
	SLParser.java SLParser.jj 
Log Message:
Fixed bug in tripe and sixteenntuple.


Index: SLParser.java
===================================================================
RCS file: /cvsroot/jrman/drafts/javacc/SLParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SLParser.java	2 Feb 2004 05:45:30 -0000	1.1
--- SLParser.java	3 Feb 2004 15:39:34 -0000	1.2
***************
*** 365,376 ****
            ;
          }
-       } else if (jj_2_6(3)) {
-         single();
-       } else if (jj_2_7(3)) {
-         triple();
        } else {
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
          case LPAREN:
!           sixteentuple();
[...2072 lines suppressed...]
    static final private void jj_rescan_token() {
      jj_rescan = true;
!     for (int i = 0; i < 22; i++) {
        JJCalls p = jj_2_rtns[i];
        do {
--- 2456,2460 ----
    static final private void jj_rescan_token() {
      jj_rescan = true;
!     for (int i = 0; i < 20; i++) {
        JJCalls p = jj_2_rtns[i];
        do {
***************
*** 2511,2516 ****
              case 18: jj_3_19(); break;
              case 19: jj_3_20(); break;
-             case 20: jj_3_21(); break;
-             case 21: jj_3_22(); break;
            }
          }
--- 2482,2485 ----

Index: SLParser.jj
===================================================================
RCS file: /cvsroot/jrman/drafts/javacc/SLParser.jj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SLParser.jj	2 Feb 2004 05:45:30 -0000	1.4
--- SLParser.jj	3 Feb 2004 15:39:34 -0000	1.5
***************
*** 380,388 ****
          //assignExpression(), identifier()
          |
!         LOOKAHEAD(3) single()
!         |
!         LOOKAHEAD(3) triple()
!         |
!         sixteentuple()
  }
  
--- 380,385 ----
          //assignExpression(), identifier()
          |
!         single()
!         //triple(), sixteentuple()
  }
  
***************
*** 468,472 ****
  {}
  {
!     "("expression()")"
  }
  
--- 465,469 ----
  {}
  {
!     "("expression() [triple()]")"
  }
  
***************
*** 474,478 ****
  {}
  {
!     "("expression()","expression()","expression()")"
  }
  
--- 471,475 ----
  {}
  {
!     ","expression()","expression() [sixteentuple()]
  }
  
***************
*** 480,487 ****
  {}
  {
!     "("expression()","expression()","expression()","expression()
          ","expression()","expression()","expression()","expression()
          ","expression()","expression()","expression()","expression()
-         ","expression()","expression()","expression()","expression()")"
  }
  
--- 477,484 ----
  {}
  {
!         ","expression()
!         ","expression()","expression()","expression()","expression()
          ","expression()","expression()","expression()","expression()
          ","expression()","expression()","expression()","expression()
  }