[WebMacro-cvs] webmacro/src/org/webmacro/parser WMParser_impl.java, 1.59, 1.60

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15451/src/org/webmacro/parser

Modified Files:
	WMParser_impl.java 
Log Message:
Fix dead code warnings: maybe they will not come back when we regenerate with latest javacc

Index: WMParser_impl.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser_impl.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** WMParser_impl.java	18 Mar 2008 21:00:41 -0000	1.59
--- WMParser_impl.java	18 Feb 2010 21:16:54 -0000	1.60
***************
*** 567,572 ****
        ;
      }
!                                              {if (true) return lv;}
!     throw new Error("Missing return statement in function");
    }
  
--- 567,571 ----
        ;
      }
!     return lv;
    }
  
***************
*** 590,595 ****
        ;
      }
!                                       {if (true) return rv;}
!     throw new Error("Missing return statement in function");
    }
  
--- 589,593 ----
        ;
      }
!     return rv;
    }
  
***************
*** 717,722 ****
        ;
      }
!     {if (true) return t.image;}
!     throw new Error("Missing return statement in function");
    }
  
--- 715,719 ----
        ;
      }
!     return t.image;
    }
  
***************
*** 742,747 ****
      }
      jj_consume_token(RPAREN);
!                                                    {if (true) return e;}
!     throw new Error("Missing return statement in function");
    }
  
--- 739,743 ----
      }
      jj_consume_token(RPAREN);
!     return e;
    }
  
***************
*** 775,780 ****
        }
      }
!     {if (true) return element;}
!     throw new Error("Missing return statement in function");
    }
  
--- 771,775 ----
        }
      }
!     return element;
    }
  
***************
*** 845,850 ****
      }
      Object[] names = v.toArray();
!     {if (true) return new VariableBuilder(names);}
!     throw new Error("Missing return statement in function");
    }
  
--- 840,844 ----
      }
      Object[] names = v.toArray();
!     return new VariableBuilder(names);
    }
  
***************
*** 953,958 ****
      }
      SetState(entryState);
!     {if (true) return qs;}
!     throw new Error("Missing return statement in function");
    }
  
--- 947,951 ----
      }
      SetState(entryState);
!     return qs;
    }
  
***************
*** 973,978 ****
        throw new ParseException();
      }
!     {if (true) return b;}
!     throw new Error("Missing return statement in function");
    }
  
--- 966,970 ----
        throw new ParseException();
      }
!     return b;
    }
  
***************
*** 1243,1248 ****
        ;
      }
!       {if (true) return map;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1235,1239 ----
        ;
      }
!     return map;
    }
  
***************
*** 1286,1291 ****
      jj_consume_token(RBRACE);
                                                                                   SetState(WM);
!       {if (true) return map;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1277,1281 ----
      jj_consume_token(RBRACE);
                                                                                   SetState(WM);
!     return map;
    }
  
***************
*** 1361,1366 ****
        ;
      }
!     {if (true) return list;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1351,1355 ----
        ;
      }
!     return list;
    }
  
***************
*** 1370,1375 ****
      list = ArgList();
      jj_consume_token(RBRACKET);
!     {if (true) return list;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1359,1363 ----
      list = ArgList();
      jj_consume_token(RBRACKET);
!     return list;
    }
  
***************
*** 1444,1449 ****
        ;
      }
!     {if (true) return list.toArray();}
!     throw new Error("Missing return statement in function");
    }
  
--- 1432,1436 ----
        ;
      }
!     return list.toArray();
    }
  
***************
*** 1460,1465 ****
        ;
      }
!     {if (true) return list;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1447,1451 ----
        ;
      }
!     return list;
    }
  
***************
*** 1547,1552 ****
        throw new ParseException();
      }
!     {if (true) return e;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1533,1537 ----
        throw new ParseException();
      }
!     return e;
    }
  
***************
*** 1598,1603 ****
          {if (true) throw new ParseException("internal parser error in Factor()");}
      }
!     {if (true) return e;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1583,1587 ----
          {if (true) throw new ParseException("internal parser error in Factor()");}
      }
!     return e;
    }
  
***************
*** 1649,1654 ****
          {if (true) throw new ParseException("internal parser error in AExpression()");}
      }
!     {if (true) return e;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1633,1637 ----
          {if (true) throw new ParseException("internal parser error in AExpression()");}
      }
!     return e;
    }
  
***************
*** 1682,1687 ****
        throw new ParseException();
      }
!     {if (true) return t;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1665,1669 ----
        throw new ParseException();
      }
!     return t;
    }
  
***************
*** 1717,1721 ****
      }
      if (op == null)
!       {if (true) return e1;}
      else switch (op.kind) {
        case OP_EQ:  {if (true) return new Expression.CompareEqBuilder(e1, e2);}
--- 1699,1703 ----
      }
      if (op == null)
!       return e1;
      else switch (op.kind) {
        case OP_EQ:  {if (true) return new Expression.CompareEqBuilder(e1, e2);}
***************
*** 1727,1733 ****
        case OP_LT:  {if (true) return new Expression.CompareLtBuilder(e1, e2);}
        default:
!         {if (true) throw new ParseException("internal parser error in CExpression()");}
      }
-     throw new Error("Missing return statement in function");
    }
  
--- 1709,1714 ----
        case OP_LT:  {if (true) return new Expression.CompareLtBuilder(e1, e2);}
        default:
!         throw new ParseException("internal parser error in CExpression()");
      }
    }
  
***************
*** 1762,1767 ****
        e = new Expression.AndBuilder(e, e2);
      }
!     {if (true) return e;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1743,1747 ----
        e = new Expression.AndBuilder(e, e2);
      }
!     return e;
    }
  
***************
*** 1796,1801 ****
        e = new Expression.OrBuilder(e, e2);
      }
!     {if (true) return e;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1776,1780 ----
        e = new Expression.OrBuilder(e, e2);
      }
!     return e;
    }
  
***************
*** 1803,1808 ****
    Object e=null;
      e = OrExpression();
!                      {if (true) return e;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1782,1786 ----
    Object e=null;
      e = OrExpression();
!     return e;
    }
  
***************
*** 1879,1884 ****
      }
      SetState(entryState);
!     {if (true) return o;}
!     throw new Error("Missing return statement in function");
    }
  
--- 1857,1861 ----
      }
      SetState(entryState);
!     return o;
    }
  
***************
*** 2122,2127 ****
        }
      }
!     {if (true) return block;}
!     throw new Error("Missing return statement in function");
    }
  
--- 2099,2103 ----
        }
      }
!     return block;
    }
  
***************
*** 2209,2214 ****
          case 0:
            jj_consume_token(0);
!                     {if (true) throw new ParseException("Unclosed block beginning at line " + token.beginLine + ".  Check for invalid directive options or missing a #end");}
!           break;
          case RBRACE:
          case LBRACE:
--- 2185,2189 ----
          case 0:
            jj_consume_token(0);
!           throw new ParseException("Unclosed block beginning at line " + token.beginLine + ".  Check for invalid directive options or missing a #end");
          case RBRACE:
          case LBRACE:
***************
*** 2248,2253 ****
      }
      blockStack.pop();
!     {if (true) return block;}
!     throw new Error("Missing return statement in function");
    }
  
--- 2223,2227 ----
      }
      blockStack.pop();
!     return block;
    }
  
***************
*** 2314,2319 ****
      }
      jj_consume_token(0);
!     {if (true) return block;}
!     throw new Error("Missing return statement in function");
    }
  
--- 2288,2292 ----
      }
      jj_consume_token(0);
!     return block;
    }