Allow conversion to dynamic arrays and update grammar.

1 files changed, 21 insertions, 1 deletions

diff --git a/AST.cpp b/AST.cpp
index 4e4fe7d5..17946115 100644
--- a/AST.cpp
+++ b/AST.cpp
@@ -614,6 +614,8 @@ void IndexAccess::checkTypeRequirements()
 	case Type::Category::Array:
 	{
 		ArrayType const& type = dynamic_cast<ArrayType const&>(*m_base->getType());
+		if (!m_index)
+			BOOST_THROW_EXCEPTION(createTypeError("Index expression cannot be omitted."));
 		m_index->expectType(IntegerType(256));
 		m_type = type.getBaseType();
 		m_isLValue = true;
@@ -622,14 +624,32 @@ void IndexAccess::checkTypeRequirements()
 	case Type::Category::Mapping:
 	{
 		MappingType const& type = dynamic_cast<MappingType const&>(*m_base->getType());
+		if (!m_index)
+			BOOST_THROW_EXCEPTION(createTypeError("Index expression cannot be omitted."));
 		m_index->expectType(*type.getKeyType());
 		m_type = type.getValueType();
 		m_isLValue = true;
 		break;
 	}
+	case Type::Category::TypeType:
+	{
+		TypeType const& type = dynamic_cast<TypeType const&>(*m_base->getType());
+		if (!m_index)
+			m_type = make_shared<TypeType>(make_shared<ArrayType>(ArrayType::Location::Memory, type.getActualType()));
+		else
+		{
+			m_index->checkTypeRequirements();
+			auto length = dynamic_cast<IntegerConstantType const*>(m_index->getType().get());
+			if (!length)
+				BOOST_THROW_EXCEPTION(m_index->createTypeError("Integer constant expected."));
+			m_type = make_shared<TypeType>(make_shared<ArrayType>(
+				ArrayType::Location::Memory, type.getActualType(), length->literalValue(nullptr)));
+		}
+		break;
+	}
 	default:
 		BOOST_THROW_EXCEPTION(m_base->createTypeError(
-			"Indexed expression has to be a mapping or array (is " + m_base->getType()->toString() + ")"));
+			"Indexed expression has to be a type, mapping or array (is " + m_base->getType()->toString() + ")"));
 	}
 }