ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-02 12:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update demo.odin

Browse Source
This commit is contained in:
gingerBill
2019-09-08 19:15:12 +01:00
parent 42bbd31df1
commit 5fc42bf9c9
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/demo/demo.odin
+16 -2
View File
@@ -1095,7 +1095,7 @@ inline_for_statement :: proc() {
} }
} }
procedure_where_clauses :: proc() { where_clauses :: proc() {
fmt.println("\n#procedure 'where' clauses"); fmt.println("\n#procedure 'where' clauses");
{ // Sanity checks { // Sanity checks
@@ -1156,6 +1156,20 @@ procedure_where_clauses :: proc() {
assert(ok_x == true); assert(ok_x == true);
assert(ok_y == false); assert(ok_y == false);
} }
{ // Record types
Foo :: struct(T: typeid, N: int)
where intrinsics.type_is_integer(T),
N > 2 {
x: [N]T,
y: [N-2]T,
}
T :: i32;
N :: 5;
f: Foo(T, N);
#assert(size_of(f) == (N+N-2)*size_of(T));
}
} }
main :: proc() { main :: proc() {
@@ -1179,6 +1193,6 @@ main :: proc() {
reflection(); reflection();
quaternions(); quaternions();
inline_for_statement(); inline_for_statement();
procedure_where_clauses(); where_clauses();
} }
} }
src/check_type.cpp
+2 -2
View File
@@ -503,7 +503,7 @@ void check_struct_type(CheckerContext *ctx, Type *struct_type, Ast *node, Array<
struct_type->Struct.is_poly_specialized = is_poly_specialized; struct_type->Struct.is_poly_specialized = is_poly_specialized;
if (!is_polymorphic) { if (!is_polymorphic) {
if (st->where_clauses.count > 0 && st->polymorphic_params != nullptr) { if (st->where_clauses.count > 0 && st->polymorphic_params == nullptr) {
error(st->where_clauses[0], "'where' clauses can only be used on structures with polymorphic parameters"); error(st->where_clauses[0], "'where' clauses can only be used on structures with polymorphic parameters");
} else { } else {
bool where_clause_ok = evaluate_where_clauses(ctx, ctx->scope, &st->where_clauses, true); bool where_clause_ok = evaluate_where_clauses(ctx, ctx->scope, &st->where_clauses, true);
@@ -690,7 +690,7 @@ void check_union_type(CheckerContext *ctx, Type *union_type, Ast *node, Array<Op
union_type->Union.is_polymorphic = is_polymorphic; union_type->Union.is_polymorphic = is_polymorphic;
union_type->Union.is_poly_specialized = is_poly_specialized; union_type->Union.is_poly_specialized = is_poly_specialized;
if (ut->where_clauses.count > 0 && ut->polymorphic_params != nullptr) { if (ut->where_clauses.count > 0 && ut->polymorphic_params == nullptr) {
error(ut->where_clauses[0], "'where' clauses can only be used on unions with polymorphic parameters"); error(ut->where_clauses[0], "'where' clauses can only be used on unions with polymorphic parameters");
} else { } else {
bool where_clause_ok = evaluate_where_clauses(ctx, ctx->scope, &ut->where_clauses, true); bool where_clause_ok = evaluate_where_clauses(ctx, ctx->scope, &ut->where_clauses, true);