simplified lookahead

wumpz · wumpz · commit 0fc8e29a3a5d · 2015-08-01T23:33:31.000+02:00
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -648,9 +648,9 @@ PlainSelect PlainSelect():
 {
     <K_SELECT>
 
-    [LOOKAHEAD(<K_SKIP> (<S_LONG> | "?")) skip = Skip() { plainSelect.setSkip(skip);	} ]
+    [skip = Skip() { plainSelect.setSkip(skip);	} ]
 
-    [LOOKAHEAD((<K_FIRST> | <K_LIMIT>) (<S_LONG> | "?")) first = First() { plainSelect.setFirst(first);	} ]
+    [LOOKAHEAD(2) first = First() { plainSelect.setFirst(first); } ]
 
     [
     	<K_ALL>

Original file line number	Diff line number	Diff line change
`@@ -648,9 +648,9 @@ PlainSelect PlainSelect():`
`648`	`648`	`{`
`649`	`649`	`<K_SELECT>`
`650`	`650`
`651`		`- [LOOKAHEAD(<K_SKIP> (<S_LONG> \| "?")) skip = Skip() { plainSelect.setSkip(skip); } ]`
	`651`	`+ [skip = Skip() { plainSelect.setSkip(skip); } ]`
`652`	`652`
`653`		`- [LOOKAHEAD((<K_FIRST> \| <K_LIMIT>) (<S_LONG> \| "?")) first = First() { plainSelect.setFirst(first); } ]`
	`653`	`+ [LOOKAHEAD(2) first = First() { plainSelect.setFirst(first); } ]`
`654`	`654`
`655`	`655`	`[`
`656`	`656`	`<K_ALL>`