Changes in / [30a1f0c:56a8eb8]

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (1 diff)
• TypeData.cc (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -296 +296 @@
         newnode->type->array.dimension = size;
         newnode->type->array.isStatic = isStatic;
-        newnode->type->array.isVarLen = size && !size->isExpressionType<ast::ConstantExpr *>();
+        if ( newnode->type->array.dimension == nullptr || newnode->type->array.dimension->isExpressionType<ast::ConstantExpr *>() ) {
+                newnode->type->array.isVarLen = false;
+        } else {
+                newnode->type->array.isVarLen = true;
+        } // if
         return newnode->addQualifiers( qualifiers );
 } // DeclarationNode::newArray

src/Parser/TypeData.cc

@@ -1291 +1291 @@
 
 
-static ast::Type * buildDefaultType( const TypeData * td ) {
-        return ( td ) ? typebuild( td ) : new ast::BasicType( ast::BasicType::SignedInt );
-} // buildDefaultType
-
-
 ast::PointerType * buildPointer( const TypeData * td ) {
-        return new ast::PointerType(
-                buildDefaultType( td->base ),
-                buildQualifiers( td )
-        );
+        ast::PointerType * pt;
+        if ( td->base ) {
+                pt = new ast::PointerType(
+                        typebuild( td->base ),
+                        buildQualifiers( td )
+                );
+        } else {
+                pt = new ast::PointerType(
+                        new ast::BasicType( ast::BasicType::SignedInt ),
+                        buildQualifiers( td )
+                );
+        } // if
+        return pt;
 } // buildPointer
 
 
 ast::ArrayType * buildArray( const TypeData * td ) {
-        return new ast::ArrayType(
-                buildDefaultType( td->base ),
-                maybeBuild( td->array.dimension ),
-                td->array.isVarLen ? ast::VariableLen : ast::FixedLen,
-                td->array.isStatic ? ast::StaticDim : ast::DynamicDim,
-                buildQualifiers( td )
-        );
+        ast::ArrayType * at;
+        if ( td->base ) {
+                at = new ast::ArrayType(
+                        typebuild( td->base ),
+                        maybeBuild( td->array.dimension ),
+                        td->array.isVarLen ? ast::VariableLen : ast::FixedLen,
+                        td->array.isStatic ? ast::StaticDim : ast::DynamicDim,
+                        buildQualifiers( td )
+                );
+        } else {
+                at = new ast::ArrayType(
+                        new ast::BasicType( ast::BasicType::SignedInt ),
+                        maybeBuild( td->array.dimension ),
+                        td->array.isVarLen ? ast::VariableLen : ast::FixedLen,
+                        td->array.isStatic ? ast::StaticDim : ast::DynamicDim,
+                        buildQualifiers( td )
+                );
+        } // if
+        return at;
 } // buildArray
 
 
 ast::ReferenceType * buildReference( const TypeData * td ) {
-        return new ast::ReferenceType(
-                buildDefaultType( td->base ),
-                buildQualifiers( td )
-        );
+        ast::ReferenceType * rt;
+        if ( td->base ) {
+                rt = new ast::ReferenceType(
+                        typebuild( td->base ),
+                        buildQualifiers( td )
+                );
+        } else {
+                rt = new ast::ReferenceType(
+                        new ast::BasicType( ast::BasicType::SignedInt ),
+                        buildQualifiers( td )
+                );
+        } // if
+        return rt;
 } // buildReference