Skip to content

Commit 5ddf28c

Browse files
manticore-projectsmanticore-projects
committed
style: fix Q/A exceptions
Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
1 parent e14d7eb commit 5ddf28c

File tree

4 files changed

+74
-81
lines changed

4 files changed

+74
-81
lines changed

‎build.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ pmd {
318318
pmdMain {
319319
excludes = [
320320
"build/generated/*"
321+
, "**/net/sf/jsqlparser/parser/SimpleCharStream.java"
321322
]
322323
}
323324
}
@@ -327,6 +328,12 @@ checkstyle {
327328
configFile = rootProject.file('config/checkstyle/checkstyle.xml')
328329
}
329330

331+
tasks.named('checkstyleMain') {
332+
source = source.filter {
333+
!it.absolutePath.contains('net/sf/jsqlparser/parser/SimpleCharStream.java')
334+
}
335+
}
336+
330337
spotless {
331338
// optional: limit format enforcement to just the files changed by this feature branch
332339
ratchetFrom 'origin/master'

‎src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java‎

Lines changed: 64 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
package net.sf.jsqlparser.parser;
33

44
/**
5-
* An implementation of interface CharStream, where the stream is assumed to
6-
* contain only ASCII characters (without unicode processing).
5+
* An implementation of interface CharStream, where the stream is assumed to contain only ASCII
6+
* characters (without unicode processing).
77
*/
88

99
public class SimpleCharStream {
@@ -92,9 +92,8 @@ protected void ExpandBuff(boolean wrapAround) {
9292
System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
9393
bufcolumn = newbufcolumn;
9494

95-
maxNextCharInd = (bufpos += (bufsize - tokenBegin));
96-
}
97-
else {
95+
maxNextCharInd = bufpos += bufsize - tokenBegin;
96+
} else {
9897
System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
9998
buffer = newbuffer;
10099

@@ -104,7 +103,7 @@ protected void ExpandBuff(boolean wrapAround) {
104103
System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
105104
bufcolumn = newbufcolumn;
106105

107-
maxNextCharInd = (bufpos -= tokenBegin);
106+
maxNextCharInd = bufpos -= tokenBegin;
108107
}
109108
} catch (Throwable t) {
110109
throw new Error(t.getMessage());
@@ -122,40 +121,34 @@ protected void FillBuff() throws java.io.IOException {
122121
if (tokenBegin > 2048) {
123122
bufpos = maxNextCharInd = 0;
124123
available = tokenBegin;
124+
} else if (tokenBegin < 0) {
125+
bufpos = maxNextCharInd = 0;
126+
} else {
127+
ExpandBuff(false);
125128
}
126-
else if (tokenBegin < 0) {
127-
bufpos = maxNextCharInd = 0;
128-
}
129-
else {
130-
ExpandBuff(false);
131-
}
132-
}
133-
else if (available > tokenBegin) {
134-
available = bufsize;
135-
}
136-
else if ((tokenBegin - available) < 2048) {
137-
ExpandBuff(true);
138-
}
139-
else {
140-
available = tokenBegin;
129+
} else if (available > tokenBegin) {
130+
available = bufsize;
131+
} else if ((tokenBegin - available) < 2048) {
132+
ExpandBuff(true);
133+
} else {
134+
available = tokenBegin;
141135
}
142136
}
143137

144138
int i;
145139
try {
146-
if ((i = inputStream.read(buffer, maxNextCharInd, available - maxNextCharInd)) == -1) {
147-
inputStream.close();
148-
throw new java.io.IOException();
149-
}
150-
else {
151-
maxNextCharInd += i;
152-
}
140+
if ((i = inputStream.read(buffer, maxNextCharInd, available - maxNextCharInd)) == -1) {
141+
inputStream.close();
142+
throw new java.io.IOException();
143+
} else {
144+
maxNextCharInd += i;
145+
}
153146
} catch (java.io.IOException e) {
154147
--bufpos;
155148
backup(0);
156-
if (tokenBegin == -1) {
157-
tokenBegin = bufpos;
158-
}
149+
if (tokenBegin == -1) {
150+
tokenBegin = bufpos;
151+
}
159152
throw e;
160153
}
161154
}
@@ -178,16 +171,14 @@ protected void UpdateLineColumn(char c) {
178171

179172
if (prevCharIsLF) {
180173
prevCharIsLF = false;
181-
line += (column = 1);
182-
}
183-
else if (prevCharIsCR) {
174+
line += column = 1;
175+
} else if (prevCharIsCR) {
184176
prevCharIsCR = false;
185-
if (c == '\n') {
186-
prevCharIsLF = true;
187-
}
188-
else {
189-
line += (column = 1);
190-
}
177+
if (c == '\n') {
178+
prevCharIsLF = true;
179+
} else {
180+
line += column = 1;
181+
}
191182
}
192183

193184
switch (c) {
@@ -199,7 +190,7 @@ else if (prevCharIsCR) {
199190
break;
200191
case '\t':
201192
column--;
202-
column += (tabSize - (column % tabSize));
193+
column += tabSize - column % tabSize;
203194
break;
204195
default:
205196
break;
@@ -216,18 +207,18 @@ public char readChar() throws java.io.IOException {
216207
if (inBuf > 0) {
217208
--inBuf;
218209

219-
if (++bufpos == bufsize) {
220-
bufpos = 0;
221-
}
210+
if (++bufpos == bufsize) {
211+
bufpos = 0;
212+
}
222213

223214
totalCharsRead++;
224215

225216
return buffer[bufpos];
226217
}
227218

228-
if (++bufpos >= maxNextCharInd) {
229-
FillBuff();
230-
}
219+
if (++bufpos >= maxNextCharInd) {
220+
FillBuff();
221+
}
231222

232223
totalCharsRead++;
233224

@@ -292,9 +283,9 @@ public void backup(int amount) {
292283

293284
inBuf += amount;
294285
totalCharsRead -= amount;
295-
if ((bufpos -= amount) < 0) {
296-
bufpos += bufsize;
297-
}
286+
if ((bufpos -= amount) < 0) {
287+
bufpos += bufsize;
288+
}
298289
}
299290

300291
/**
@@ -335,12 +326,12 @@ public void ReInit(Provider dstream) {
335326
* Get token literal value.
336327
*/
337328
public String GetImage() {
338-
if (bufpos >= tokenBegin) {
339-
return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
340-
}
341-
else {
342-
return new String(buffer, tokenBegin, bufsize - tokenBegin) + new String(buffer, 0, bufpos + 1);
343-
}
329+
if (bufpos >= tokenBegin) {
330+
return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
331+
} else {
332+
return new String(buffer, tokenBegin, bufsize - tokenBegin)
333+
+ new String(buffer, 0, bufpos + 1);
334+
}
344335
}
345336

346337
/**
@@ -349,13 +340,12 @@ public String GetImage() {
349340
public char[] GetSuffix(int len) {
350341
char[] ret = new char[len];
351342

352-
if ((bufpos + 1) >= len) {
353-
System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
354-
}
355-
else {
356-
System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0, len - bufpos - 1);
357-
System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
358-
}
343+
if ((bufpos + 1) >= len) {
344+
System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
345+
} else {
346+
System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0, len - bufpos - 1);
347+
System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
348+
}
359349

360350
return ret;
361351
}
@@ -378,13 +368,15 @@ public void adjustBeginLineColumn(int newLine, int newCol) {
378368

379369
if (bufpos >= tokenBegin) {
380370
len = bufpos - tokenBegin + inBuf + 1;
381-
}
382-
else {
371+
} else {
383372
len = bufsize - tokenBegin + bufpos + 1 + inBuf;
384373
}
385374

386-
int i = 0, j = 0, k = 0;
387-
int nextColDiff = 0, columnDiff = 0;
375+
int i = 0;
376+
int j = 0;
377+
int k;
378+
int nextColDiff;
379+
int columnDiff = 0;
388380

389381
while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize]) {
390382
bufline[j] = newLine;
@@ -399,12 +391,11 @@ public void adjustBeginLineColumn(int newLine, int newCol) {
399391
bufcolumn[j] = newCol + columnDiff;
400392

401393
while (i++ < len) {
402-
if (bufline[j = start % bufsize] != bufline[++start % bufsize]) {
403-
bufline[j] = newLine++;
404-
}
405-
else {
406-
bufline[j] = newLine;
407-
}
394+
if (bufline[j = start % bufsize] != bufline[++start % bufsize]) {
395+
bufline[j] = newLine++;
396+
} else {
397+
bufline[j] = newLine;
398+
}
408399
}
409400
}
410401

‎src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ options {
1818
// FORCE_LA_CHECK = true;
1919
UNICODE_INPUT = true;
2020
JAVA_TEMPLATE_TYPE = "modern";
21-
JDK_VERSION = "1.8";
21+
// JDK_VERSION = "1.8";
2222
TOKEN_EXTENDS = "BaseToken";
2323
COMMON_TOKEN_ACTION = true;
2424
NODE_DEFAULT_VOID = true;
2525
TRACK_TOKENS = true;
2626
VISITOR = true;
2727
GRAMMAR_ENCODING = "UTF-8";
2828
KEEP_LINE_COLUMN = true;
29-
// USER_CHAR_STREAM = false;
29+
// USER_CHAR_STREAM = false;
3030
}
3131

3232
PARSER_BEGIN(CCJSqlParser)

‎src/test/java/net/sf/jsqlparser/parser/ParserKeywordsUtilsTest.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@
99
*/
1010
package net.sf.jsqlparser.parser;
1111

12-
import net.sf.jsqlparser.JSQLParserException;
13-
import net.sf.jsqlparser.test.TestUtils;
1412
import org.javacc.jjtree.JJTree;
1513
import org.javacc.parser.Context;
16-
import org.javacc.parser.JavaCCErrors;
17-
import org.javacc.parser.JavaCCGlobals;
1814
import org.javacc.parser.JavaCCParser;
1915
import org.javacc.parser.RCharacterList;
2016
import org.javacc.parser.RChoice;
@@ -40,7 +36,6 @@
4036
import java.util.Arrays;
4137
import java.util.List;
4238
import java.util.Map;
43-
import java.util.ServiceLoader;
4439
import java.util.Set;
4540
import java.util.TreeSet;
4641
import java.util.logging.Logger;
@@ -154,7 +149,7 @@ public static TreeSet<String> getAllKeywordsUsingJavaCC(File file) throws Except
154149
parser.javacc_input(context);
155150

156151
// needed for filling JavaCCGlobals
157-
//JavaCCErrors.reInit();
152+
// JavaCCErrors.reInit();
158153
Semanticize.start(context);
159154

160155
// read all the Token and get the String image

0 commit comments

Comments
 (0)