added testcase, little refactoring

Author: wumpz

src/main/java/net/sf/jsqlparser/statement/select/Top.java

@@ -26,50 +26,47 @@
  */
 public class Top {
 
-	private long rowCount;
-	private boolean rowCountJdbcParameter = false;
-	private boolean hasParenthesis = false;
+    private long rowCount;
+    private boolean rowCountJdbcParameter = false;
+    private boolean hasParenthesis = false;
 
-	public long getRowCount() {
-		return rowCount;
-	}
+    public long getRowCount() {
+        return rowCount;
+    }
 
     // TODO instead of a plain number, an expression should be added, which could be a NumberExpression, a GroupedExpression or a JdbcParameter
     public void setRowCount(long rowCount) {
-		this.rowCount = rowCount;
-	}
+        this.rowCount = rowCount;
+    }
 
-	public boolean isRowCountJdbcParameter() {
-		return rowCountJdbcParameter;
-	}
+    public boolean isRowCountJdbcParameter() {
+        return rowCountJdbcParameter;
+    }
 
-	public void setRowCountJdbcParameter(boolean rowCountJdbcParameter) {
-		this.rowCountJdbcParameter = rowCountJdbcParameter;
-	}
+    public void setRowCountJdbcParameter(boolean rowCountJdbcParameter) {
+        this.rowCountJdbcParameter = rowCountJdbcParameter;
+    }
 
-    public boolean hasParenthesis()
-    {
+    public boolean hasParenthesis() {
         return hasParenthesis;
     }
 
-    public void setParenthesis(boolean hasParenthesis)
-    {
+    public void setParenthesis(boolean hasParenthesis) {
         this.hasParenthesis = hasParenthesis;
     }
 
     @Override
     public String toString() {
         String result = "TOP ";
 
-        if ( hasParenthesis) {
+        if (hasParenthesis) {
             result += "(";
         }
 
         result += rowCountJdbcParameter ? "?"
-                                        : rowCount;
+                : rowCount;
 
-        if (hasParenthesis)
-        {
+        if (hasParenthesis) {
             result += ")";
         }
 

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -1097,9 +1097,11 @@ Top Top():
 	   |
 	 	"?"                                 { top.setRowCountJdbcParameter(true);}
 	   |
-	 	LOOKAHEAD(2) "(" token=<S_LONG> ")" { top.setRowCount(Long.parseLong(token.image)); top.setParenthesis(true);}
-	   |
-	 	LOOKAHEAD(2) "(" "?" ")"            { top.setRowCountJdbcParameter(true); top.setParenthesis(true);}
+	   "(" 
+            ( token=<S_LONG>                { top.setRowCount(Long.parseLong(token.image)); } 
+              | "?"                         { top.setRowCountJdbcParameter(true);} ) 
+            { top.setParenthesis(true);}
+       ")"
 	)
 	{
 		return top;

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

@@ -272,6 +272,14 @@ public void testTopWithParenthesis() throws JSQLParserException {
         assertEquals(5, ((PlainSelect) select.getSelectBody()).getTop().getRowCount());
         assertStatementCanBeDeparsedAs(select, statement);
     }
+    
+    public void testTopWithParenthesisJDBC() throws JSQLParserException {
+		final String statement = "SELECT TOP (?) col1 FROM mytab";
+        final Select select = (Select) parserManager.parse(new StringReader(statement));
+
+        assertTrue(((PlainSelect) select.getSelectBody()).getTop().isRowCountJdbcParameter());
+        assertStatementCanBeDeparsedAs(select, statement);
+    }
 
 	public void testSelectItems() throws JSQLParserException {
 		String statement = "SELECT myid AS MYID, mycol, tab.*, schema.tab.*, mytab.mycol2, myschema.mytab.mycol, myschema.mytab.* FROM mytable WHERE mytable.col = 9";