From 14f194cdfca4ab26c246b1c38da9aacf40b9f635 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 24 Jan 2021 22:16:57 +1100 Subject: [PATCH] Remove built-in range reset methods --- internal/cgen/expr.go | 29 +++++------------------------ lang/builtin/builtin.go | 4 ---- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/internal/cgen/expr.go b/internal/cgen/expr.go index 9d6fdf60..272d5764 100644 --- a/internal/cgen/expr.go +++ b/internal/cgen/expr.go @@ -118,31 +118,12 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, sideEffectsOnly bool, depth u } qid := recvTyp.QID() - if isBaseRangeType(qid) { - if !sideEffectsOnly { - // Generate a two part expression using the comma operator: - // "(etc, return_empty_struct call)". The final part is a - // function call (to a static inline function) instead of a - // struct literal, to avoid a "expression result unused" - // compiler error. - b.writes("(") - } - b.printf("memset(%s", addr) - if err := g.writeExpr(b, recv, false, depth); err != nil { - return err - } - b.printf(", 0, sizeof (%s%s))", g.packagePrefix(qid), qid[1].Str(g.tm)) - if !sideEffectsOnly { - b.writes(", wuffs_base__make_empty_struct())") - } - } else { - b.printf("wuffs_base__ignore_status("+ - "%s%s__initialize(%s", g.packagePrefix(qid), qid[1].Str(g.tm), addr) - if err := g.writeExpr(b, recv, false, depth); err != nil { - return err - } - b.printf(", sizeof (%s%s), WUFFS_VERSION, 0))", g.packagePrefix(qid), qid[1].Str(g.tm)) + b.printf("wuffs_base__ignore_status("+ + "%s%s__initialize(%s", g.packagePrefix(qid), qid[1].Str(g.tm), addr) + if err := g.writeExpr(b, recv, false, depth); err != nil { + return err } + b.printf(", sizeof (%s%s), WUFFS_VERSION, 0))", g.packagePrefix(qid), qid[1].Str(g.tm)) return nil } diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 596f3d30..0717000f 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -290,25 +290,21 @@ var Funcs = []string{ // ---- ranges - "range_ie_u32.reset!()", "range_ie_u32.get_min_incl() u32", "range_ie_u32.get_max_excl() u32", "range_ie_u32.intersect(r: range_ie_u32) range_ie_u32", "range_ie_u32.unite(r: range_ie_u32) range_ie_u32", - "range_ii_u32.reset!()", "range_ii_u32.get_min_incl() u32", "range_ii_u32.get_max_incl() u32", "range_ii_u32.intersect(r: range_ii_u32) range_ii_u32", "range_ii_u32.unite(r: range_ii_u32) range_ii_u32", - "range_ie_u64.reset!()", "range_ie_u64.get_min_incl() u64", "range_ie_u64.get_max_excl() u64", "range_ie_u64.intersect(r: range_ie_u64) range_ie_u64", "range_ie_u64.unite(r: range_ie_u64) range_ie_u64", - "range_ii_u64.reset!()", "range_ii_u64.get_min_incl() u64", "range_ii_u64.get_max_incl() u64", "range_ii_u64.intersect(r: range_ii_u64) range_ii_u64",