fix #159, Map field type fixed

boalang · Jan 22, 2018 · 1a582b6 · 1a582b6
1 parent 1316b9e
commit 1a582b6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/java/boa/compiler/visitors/CodeGeneratingVisitor.java b/src/java/boa/compiler/visitors/CodeGeneratingVisitor.java
@@ -230,7 +230,7 @@ public void visit(final FunctionType n) {
 
 			for (final Component c : params) {
 				args.add(c.getIdentifier().getToken());
-				types.add(c.getType().type.toJavaType());
+				types.add(c.getType().type.toInterfaceJavaType());
 			}
 
 			st.add("name", funcType.toJavaType());
@@ -1583,7 +1583,7 @@ public void visit(final FunctionExpression n) {
 			if (!(c instanceof BoaName))
 				continue;
 			args.add(((BoaName)c).getId());
-			types.add(((BoaName)c).getType().toJavaType());
+			types.add(((BoaName)c).getType().toInterfaceJavaType());
 		}
 
 		this.varDecl.start(n);
@@ -1815,7 +1815,7 @@ public void visit(final FunctionType n) {
 
 		for (int i = 0; i < paramTypes.length; i++) {
 			args.add(((BoaName) paramTypes[i]).getId());
-			types.add(paramTypes[i].toJavaType());
+			types.add(paramTypes[i].toInterfaceJavaType());
 		}
 
 		st.add("name", funcType.toJavaType());

diff --git a/src/java/boa/types/BoaMap.java b/src/java/boa/types/BoaMap.java
@@ -154,7 +154,13 @@ public String toJavaType() {
 	/** {@inheritDoc} */
 	@Override
 	public String toInterfaceJavaType() {
-		return "java.util.HashMap<" + this.indexType.toParameterJavaType() + ", " + this.valueType.toParameterJavaType() + ">";
+		return "java.util.Map<" + this.indexType.toParameterJavaType() + ", " + this.valueType.toParameterJavaType() + ">";
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public String toParameterJavaType() {
+		return "java.util.Map<" + this.indexType.toParameterJavaType() + ", " + this.valueType.toParameterJavaType() + ">";
 	}
 
 	/** {@inheritDoc} */