Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit dfc7c13

Browse files
bzzbzz
authored
Merge pull request #29 from bzz/fix-npe-27
Fix native driver NPE
2 parents 53e003a + bf7743c commit dfc7c13

File tree

7 files changed

+218
-14
lines changed

7 files changed

+218
-14
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ target
66
native/.idea/*
77
native/src/main/java/tech/sourced/babelfish/j2cpp/*
88
vendor/
9-
fixtures/*_got
109
.idea/*
10+
*.iml

‎fixtures/issue_27.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#if E
2+
3+
#ifndef F
4+
#define F
5+
#endif
6+
7+
#endif

‎fixtures/issue_27.cpp.native‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
IASTClass: "CPPASTTranslationUnit",
3+
LocOffsetEnd: 41,
4+
LocOffsetStart: 0,
5+
'Prop_BuiltinMacroDefinitions': [],
6+
'Prop_PreprocStatements': [
7+
{
8+
Condition: "E",
9+
IASTClass: "ASTIf",
10+
IsTaken: false,
11+
LocOffsetEnd: 5,
12+
LocOffsetStart: 0,
13+
},
14+
{
15+
Condition: "F",
16+
IASTClass: "ASTIfndef",
17+
IsTaken: false,
18+
LocOffsetEnd: 16,
19+
LocOffsetStart: 7,
20+
},
21+
{
22+
IASTClass: "ASTEndif",
23+
LocOffsetEnd: 33,
24+
LocOffsetStart: 27,
25+
},
26+
{
27+
IASTClass: "ASTEndif",
28+
LocOffsetEnd: 41,
29+
LocOffsetStart: 35,
30+
},
31+
],
32+
}

‎fixtures/issue_27.cpp.sem.uast‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
{ '@type': "cpp:CPPASTTranslationUnit",
2+
'@role': [File, Module],
3+
'@pos': { '@type': "uast:Positions",
4+
start: { '@type': "uast:Position",
5+
offset: 0,
6+
line: 1,
7+
col: 1,
8+
},
9+
end: { '@type': "uast:Position",
10+
offset: 41,
11+
line: 7,
12+
col: 7,
13+
},
14+
},
15+
'Prop_BuiltinMacroDefinitions': [],
16+
'Prop_PreprocStatements': [
17+
{ '@type': "cpp:ASTIf",
18+
'@role': [Unannotated],
19+
'@pos': { '@type': "uast:Positions",
20+
start: { '@type': "uast:Position",
21+
offset: 0,
22+
line: 1,
23+
col: 1,
24+
},
25+
end: { '@type': "uast:Position",
26+
offset: 5,
27+
line: 1,
28+
col: 6,
29+
},
30+
},
31+
Condition: "E",
32+
IsTaken: false,
33+
},
34+
{ '@type': "cpp:ASTIfndef",
35+
'@role': [Unannotated],
36+
'@pos': { '@type': "uast:Positions",
37+
start: { '@type': "uast:Position",
38+
offset: 7,
39+
line: 3,
40+
col: 1,
41+
},
42+
end: { '@type': "uast:Position",
43+
offset: 16,
44+
line: 3,
45+
col: 10,
46+
},
47+
},
48+
Condition: "F",
49+
IsTaken: false,
50+
},
51+
{ '@type': "cpp:ASTEndif",
52+
'@role': [Incomplete, Noop],
53+
'@pos': { '@type': "uast:Positions",
54+
start: { '@type': "uast:Position",
55+
offset: 27,
56+
line: 5,
57+
col: 1,
58+
},
59+
end: { '@type': "uast:Position",
60+
offset: 33,
61+
line: 5,
62+
col: 7,
63+
},
64+
},
65+
},
66+
{ '@type': "cpp:ASTEndif",
67+
'@role': [Incomplete, Noop],
68+
'@pos': { '@type': "uast:Positions",
69+
start: { '@type': "uast:Position",
70+
offset: 35,
71+
line: 7,
72+
col: 1,
73+
},
74+
end: { '@type': "uast:Position",
75+
offset: 41,
76+
line: 7,
77+
col: 7,
78+
},
79+
},
80+
},
81+
],
82+
}

‎fixtures/issue_27.cpp.uast‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
{ '@type': "CPPASTTranslationUnit",
2+
'@role': [File, Module],
3+
'@pos': { '@type': "uast:Positions",
4+
start: { '@type': "uast:Position",
5+
offset: 0,
6+
line: 1,
7+
col: 1,
8+
},
9+
end: { '@type': "uast:Position",
10+
offset: 41,
11+
line: 7,
12+
col: 7,
13+
},
14+
},
15+
'Prop_BuiltinMacroDefinitions': [],
16+
'Prop_PreprocStatements': [
17+
{ '@type': "ASTIf",
18+
'@role': [Unannotated],
19+
'@pos': { '@type': "uast:Positions",
20+
start: { '@type': "uast:Position",
21+
offset: 0,
22+
line: 1,
23+
col: 1,
24+
},
25+
end: { '@type': "uast:Position",
26+
offset: 5,
27+
line: 1,
28+
col: 6,
29+
},
30+
},
31+
Condition: "E",
32+
IsTaken: false,
33+
},
34+
{ '@type': "ASTIfndef",
35+
'@role': [Unannotated],
36+
'@pos': { '@type': "uast:Positions",
37+
start: { '@type': "uast:Position",
38+
offset: 7,
39+
line: 3,
40+
col: 1,
41+
},
42+
end: { '@type': "uast:Position",
43+
offset: 16,
44+
line: 3,
45+
col: 10,
46+
},
47+
},
48+
Condition: "F",
49+
IsTaken: false,
50+
},
51+
{ '@type': "ASTEndif",
52+
'@role': [Incomplete, Noop],
53+
'@pos': { '@type': "uast:Positions",
54+
start: { '@type': "uast:Position",
55+
offset: 27,
56+
line: 5,
57+
col: 1,
58+
},
59+
end: { '@type': "uast:Position",
60+
offset: 33,
61+
line: 5,
62+
col: 7,
63+
},
64+
},
65+
},
66+
{ '@type': "ASTEndif",
67+
'@role': [Incomplete, Noop],
68+
'@pos': { '@type': "uast:Positions",
69+
start: { '@type': "uast:Position",
70+
offset: 35,
71+
line: 7,
72+
col: 1,
73+
},
74+
end: { '@type': "uast:Position",
75+
offset: 41,
76+
line: 7,
77+
col: 7,
78+
},
79+
},
80+
},
81+
],
82+
}

‎native/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,7 @@
127127
<plugin>
128128
<groupId>org.apache.maven.plugins</groupId>
129129
<artifactId>maven-surefire-plugin</artifactId>
130-
<configuration>
131-
<useSystemClassLoader>false</useSystemClassLoader>
132-
</configuration>
130+
<version>3.0.0-M3</version>
133131
</plugin>
134132
</plugins>
135133
</build>

‎native/src/main/java/tech/sourced/babelfish/JsonASTVisitor.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@
77
import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap;
88

99
import java.io.IOException;
10+
import java.lang.reflect.InvocationTargetException;
11+
import java.lang.reflect.Method;
1012
import java.util.Arrays;
1113
import java.util.Collections;
12-
import java.util.List;
13-
import java.util.Vector;
14-
import java.util.Hashtable;
1514
import java.util.HashSet;
15+
import java.util.Hashtable;
16+
import java.util.List;
1617
import java.util.Stack;
17-
import java.lang.Comparable;
18-
import java.lang.reflect.Method;
19-
import java.lang.reflect.InvocationTargetException;
18+
import java.util.Vector;
2019

2120
/// Visitor pattern implementation for the CPP AST. This will write every
2221
/// node in the Json output. Since CDT unfortunately doesnt have something like JDT
@@ -25,10 +24,10 @@
2524
/// children that derive for IASTNode (including all the ones returned by any method
2625
/// of that node returning an IASTNode-derived object), a lot of nodes also have
2726
/// other methods that return something not derived from IASTNode and thus not returned
28-
/// by getChildren. So for all these IASTNode subinterfaces we must call and store the
27+
/// by getChildren. So for all these IASTNode sub-interfaces we must call and store the
2928
/// value of those non-IASTNode-returning methods. The most infamous is probably the
3029
/// getOperator of some nodes that return an int than then you have to match in a switch
31-
/// because the possible values are not even declarated in an enum but as final int
30+
/// because the possible values are not even declared in an enum but as final int
3231
/// class members.
3332

3433
public class JsonASTVisitor extends ASTVisitor {
@@ -1293,12 +1292,16 @@ private void serializePreproStatements(IASTTranslationUnit unit) throws IOExcept
12931292
IASTPreprocessorIfndefStatement s = (IASTPreprocessorIfndefStatement)stmt;
12941293
json.writeStringField("Condition", new String(s.getCondition()));
12951294
json.writeBooleanField("IsTaken", s.taken());
1296-
json.writeStringField("MacroReference", s.getMacroReference().toString());
1295+
if (s.getMacroReference() != null ) {
1296+
json.writeStringField("MacroReference", s.getMacroReference().toString());
1297+
}
12971298
} else if (stmt instanceof IASTPreprocessorIfdefStatement) {
12981299
IASTPreprocessorIfdefStatement s = (IASTPreprocessorIfdefStatement)stmt;
12991300
json.writeStringField("Condition", new String(s.getCondition()));
13001301
json.writeBooleanField("IsTaken", s.taken());
1301-
json.writeStringField("MacroReference", s.getMacroReference().toString());
1302+
if (s.getMacroReference() != null ) {
1303+
json.writeStringField("MacroReference", s.getMacroReference().toString());
1304+
}
13021305
} else if (stmt instanceof IASTPreprocessorElifStatement) {
13031306
IASTPreprocessorElifStatement s = (IASTPreprocessorElifStatement)stmt;
13041307
json.writeStringField("Condition", new String(s.getCondition()));

0 commit comments

Comments
 (0)