parsh understands constant sized arrays

This commit is contained in:
Andrew Kelley 2016-01-28 16:09:06 -07:00
parent ed3117a77f
commit 13220ccb51
3 changed files with 51 additions and 3 deletions

View File

@ -587,7 +587,15 @@ static void render_node(AstRender *ar, AstNode *node) {
case NodeTypeUnwrapErrorExpr: case NodeTypeUnwrapErrorExpr:
zig_panic("TODO"); zig_panic("TODO");
case NodeTypeNumberLiteral: case NodeTypeNumberLiteral:
zig_panic("TODO"); switch (node->data.number_literal.kind) {
case NumLitUInt:
fprintf(ar->f, "%" PRIu64, node->data.number_literal.data.x_uint);
break;
case NumLitFloat:
fprintf(ar->f, "%f", node->data.number_literal.data.x_float);
break;
}
break;
case NodeTypeStringLiteral: case NodeTypeStringLiteral:
zig_panic("TODO"); zig_panic("TODO");
case NodeTypeCharLiteral: case NodeTypeCharLiteral:
@ -682,7 +690,18 @@ static void render_node(AstRender *ar, AstNode *node) {
case NodeTypeStructValueField: case NodeTypeStructValueField:
zig_panic("TODO"); zig_panic("TODO");
case NodeTypeArrayType: case NodeTypeArrayType:
zig_panic("TODO"); {
fprintf(ar->f, "[");
if (node->data.array_type.size) {
render_node(ar, node->data.array_type.size);
}
fprintf(ar->f, "]");
if (node->data.array_type.is_const) {
fprintf(ar->f, "const ");
}
render_node(ar, node->data.array_type.child_type);
break;
}
case NodeTypeErrorType: case NodeTypeErrorType:
zig_panic("TODO"); zig_panic("TODO");
} }

View File

@ -121,6 +121,25 @@ static AstNode *create_struct_field_node(Context *c, const char *name, AstNode *
return node; return node;
} }
static AstNode *create_num_lit_unsigned(Context *c, uint64_t x) {
AstNode *node = create_node(c, NodeTypeNumberLiteral);
node->data.number_literal.kind = NumLitUInt;
node->data.number_literal.data.x_uint = x;
normalize_parent_ptrs(node);
return node;
}
static AstNode *create_array_type_node(Context *c, AstNode *child_type_node, uint64_t size, bool is_const) {
AstNode *node = create_node(c, NodeTypeArrayType);
node->data.array_type.size = create_num_lit_unsigned(c, size);
node->data.array_type.child_type = child_type_node;
node->data.array_type.is_const = is_const;
normalize_parent_ptrs(node);
return node;
}
static const char *decl_name(const Decl *decl) { static const char *decl_name(const Decl *decl) {
const NamedDecl *named_decl = static_cast<const NamedDecl *>(decl); const NamedDecl *named_decl = static_cast<const NamedDecl *>(decl);
return (const char *)named_decl->getName().bytes_begin(); return (const char *)named_decl->getName().bytes_begin();
@ -330,11 +349,17 @@ static AstNode *make_type_node(Context *c, const Type *ty, const Decl *decl,
return nullptr; return nullptr;
} }
} }
case Type::ConstantArray:
{
const ConstantArrayType *const_arr_ty = static_cast<const ConstantArrayType *>(ty);
AstNode *child_type_node = make_qual_type_node(c, const_arr_ty->getElementType(), decl);
uint64_t size = const_arr_ty->getSize().getLimitedValue();
return create_array_type_node(c, child_type_node, size, false);
}
case Type::BlockPointer: case Type::BlockPointer:
case Type::LValueReference: case Type::LValueReference:
case Type::RValueReference: case Type::RValueReference:
case Type::MemberPointer: case Type::MemberPointer:
case Type::ConstantArray:
case Type::IncompleteArray: case Type::IncompleteArray:
case Type::VariableArray: case Type::VariableArray:
case Type::DependentSizedArray: case Type::DependentSizedArray:

View File

@ -1863,6 +1863,10 @@ pub const BarB = enum_Bar.B;
pub extern fn func(a: ?&struct_Foo, b: ?&?&enum_Bar); pub extern fn func(a: ?&struct_Foo, b: ?&?&enum_Bar);
pub const Foo = struct_Foo; pub const Foo = struct_Foo;
pub const Bar = enum_Bar;)OUTPUT"); pub const Bar = enum_Bar;)OUTPUT");
add_parseh_case("constant size array", R"SOURCE(
void func(int array[20]);
)SOURCE", R"OUTPUT(pub extern fn func(array: [20]c_int);)OUTPUT");
} }
static void print_compiler_invocation(TestCase *test_case) { static void print_compiler_invocation(TestCase *test_case) {