[WebMacro-cvs] webmacro/src/org/webmacro/parser WMParser_impl.java,1.48,1.49 WMParser_impl.jj,1.46,1.47

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv22015/src/org/webmacro/parser

Modified Files:
	WMParser_impl.java WMParser_impl.jj 
Log Message:
rollback "multi-line arguments" changes to the parser, except for maps.  
I plan on making this work, but I also want to keep something useable in CVS


Index: WMParser_impl.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** WMParser_impl.java	14 May 2003 05:01:19 -0000	1.48
--- WMParser_impl.java	21 May 2003 23:04:55 -0000	1.49
***************
*** 712,743 ****
      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
      case WS:
!     case NEWLINE:
!       label_2:
!       while (true) {
!         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
!         case WS:
!           jj_consume_token(WS);
!           break;
!         case NEWLINE:
[...4267 lines suppressed...]
    }
--- 3233,3237 ----
      jj_ntk = -1;
      jj_gen = 0;
!     for (int i = 0; i < 120; i++) jj_la1[i] = -1;
      for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
    }
***************
*** 4468,4472 ****
        jj_kind = -1;
      }
!     for (int i = 0; i < 156; i++) {
        if (jj_la1[i] == jj_gen) {
          for (int j = 0; j < 32; j++) {
--- 3348,3352 ----
        jj_kind = -1;
      }
!     for (int i = 0; i < 120; i++) {
        if (jj_la1[i] == jj_gen) {
          for (int j = 0; j < 32; j++) {

Index: WMParser_impl.jj
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.jj,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** WMParser_impl.jj	14 May 2003 05:01:20 -0000	1.46
--- WMParser_impl.jj	21 May 2003 23:04:55 -0000	1.47
***************
*** 716,720 ****
  }
  {
!   <LPAREN> [(<WS>|<NEWLINE>)+] e=Expression() [(<WS>|<NEWLINE>)+] <RPAREN> { return e; }
  }
  
--- 716,720 ----
  }
  {
!   <LPAREN> [<WS>] e=Expression() [<WS>] <RPAREN> { return e; }
  }
  
***************
*** 854,860 ****
  }
  {
!   [ [(<WS>|<NEWLINE>)+] e=Expression() [(<WS>|<NEWLINE>)+] { list.addElement(e); }
      (
!       <COMMA> [(<WS>|<NEWLINE>)+] e=Expression() [(<WS>|<NEWLINE>)+] { list.addElement(e); }
      ) *
    ]
--- 854,860 ----
  }
  {
!   [ [<WS>] e=Expression() [<WS>] { list.addElement(e); }
      (
!       <COMMA> [<WS>] e=Expression() [<WS>] { list.addElement(e); }
      ) *
    ]
***************
*** 876,882 ****
  {
    [ <LPAREN>
!     [ [(<WS>|<NEWLINE>)+] <DOLLAR> name=<WORD> [(<WS>|<NEWLINE>)+] { list.add(name.image); }
      (
!       <COMMA> [(<WS>|<NEWLINE>)+] <DOLLAR> name=<WORD> [(<WS>|<NEWLINE>)+] { list.add(name.image); }
      ) *
    ]
--- 876,882 ----
  {
    [ <LPAREN>
!     [ [<WS>] <DOLLAR> name=<WORD> [<WS>] { list.add(name.image); }
      (
!       <COMMA> [<WS>] <DOLLAR> name=<WORD> [<WS>] { list.add(name.image); }
      ) *
    ]
***************
*** 902,906 ****
    (
      e=VariableReference()
!     | <LPAREN> [(<WS>|<NEWLINE>)+] e=Expression() [(<WS>|<NEWLINE>)+] <RPAREN>
      | e=QuotedString()
      | e=BracketList()
--- 902,906 ----
    (
      e=VariableReference()
!     | <LPAREN> [<WS>] e=Expression() [<WS>] <RPAREN>
      | e=QuotedString()
      | e=BracketList()
***************
*** 982,986 ****
  {
    e1=AExpression()
!   [ LOOKAHEAD(4) [(<WS>|<NEWLINE>)+] op=RelOp() [(<WS>|<NEWLINE>)+] e2=AExpression() ]
    {
      if (op == null)
--- 982,986 ----
  {
    e1=AExpression()
!   [ LOOKAHEAD(2) [<WS>] op=RelOp() [<WS>] e2=AExpression() ]
    {
      if (op == null)
***************
*** 1006,1010 ****
    e=CExpression()
    (
!     LOOKAHEAD(4) [(<WS>|<NEWLINE>)+] <OP_AND> [(<WS>|<NEWLINE>)+] e2=CExpression()
      {
        e = new Expression.AndBuilder(e, e2);
--- 1006,1010 ----
    e=CExpression()
    (
!     LOOKAHEAD(2) [<WS>] <OP_AND> [<WS>] e2=CExpression()
      {
        e = new Expression.AndBuilder(e, e2);
***************
*** 1020,1024 ****
    e=AndExpression()
    (
!     LOOKAHEAD(4) [(<WS>|<NEWLINE>)+] <OP_OR> [(<WS>|<NEWLINE>)+] e2=AndExpression()
      {
        e = new Expression.OrBuilder(e, e2);
--- 1020,1024 ----
    e=AndExpression()
    (
!     LOOKAHEAD(2) [<WS>] <OP_OR> [<WS>] e2=AndExpression()
      {
        e = new Expression.OrBuilder(e, e2);