This commit is contained in:
Dmitry Jemerov
2012-05-21 17:39:28 +02:00
committed by Pavel V. Talanov
parent 112d64b228
commit 3f04672270
@@ -21,8 +21,8 @@ public open class ArrayWithoutInitializationExpression(val `type` : Type, val ex
return oneDim(hostType, expressions[0]) return oneDim(hostType, expressions[0])
} }
var innerType : Type? = hostType.elementType val innerType = hostType.elementType
if (expressions.size() > 1 && innerType?.getKind() == INode.Kind.ARRAY_TYPE) if (expressions.size() > 1 && innerType.getKind() == INode.Kind.ARRAY_TYPE)
{ {
return oneDim(hostType, expressions[0], "{" + constructInnerType(innerType as ArrayType, expressions.subList(1, expressions.size())) + "}") return oneDim(hostType, expressions[0], "{" + constructInnerType(innerType as ArrayType, expressions.subList(1, expressions.size())) + "}")
} }
@@ -36,7 +36,7 @@ public open class ArrayWithoutInitializationExpression(val `type` : Type, val ex
} }
private open fun oneDim(`type` : Type, size : Expression, init : String) : String { private open fun oneDim(`type` : Type, size : Expression, init : String) : String {
var commaWithInit : String? = (if (init.isEmpty()) val commaWithInit = (if (init.isEmpty())
"" ""
else else
", " + init) ", " + init)