Skip to content

Commit 1a582b6

Browse files
committed
fix #159, Map field type fixed
1 parent 1316b9e commit 1a582b6

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/java/boa/compiler/visitors/CodeGeneratingVisitor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public void visit(final FunctionType n) {
230230

231231
for (final Component c : params) {
232232
args.add(c.getIdentifier().getToken());
233-
types.add(c.getType().type.toJavaType());
233+
types.add(c.getType().type.toInterfaceJavaType());
234234
}
235235

236236
st.add("name", funcType.toJavaType());
@@ -1583,7 +1583,7 @@ public void visit(final FunctionExpression n) {
15831583
if (!(c instanceof BoaName))
15841584
continue;
15851585
args.add(((BoaName)c).getId());
1586-
types.add(((BoaName)c).getType().toJavaType());
1586+
types.add(((BoaName)c).getType().toInterfaceJavaType());
15871587
}
15881588

15891589
this.varDecl.start(n);
@@ -1815,7 +1815,7 @@ public void visit(final FunctionType n) {
18151815

18161816
for (int i = 0; i < paramTypes.length; i++) {
18171817
args.add(((BoaName) paramTypes[i]).getId());
1818-
types.add(paramTypes[i].toJavaType());
1818+
types.add(paramTypes[i].toInterfaceJavaType());
18191819
}
18201820

18211821
st.add("name", funcType.toJavaType());

src/java/boa/types/BoaMap.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,13 @@ public String toJavaType() {
154154
/** {@inheritDoc} */
155155
@Override
156156
public String toInterfaceJavaType() {
157-
return "java.util.HashMap<" + this.indexType.toParameterJavaType() + ", " + this.valueType.toParameterJavaType() + ">";
157+
return "java.util.Map<" + this.indexType.toParameterJavaType() + ", " + this.valueType.toParameterJavaType() + ">";
158+
}
159+
160+
/** {@inheritDoc} */
161+
@Override
162+
public String toParameterJavaType() {
163+
return "java.util.Map<" + this.indexType.toParameterJavaType() + ", " + this.valueType.toParameterJavaType() + ">";
158164
}
159165

160166
/** {@inheritDoc} */

0 commit comments

Comments
 (0)