Tweak cgen for an_array[i .. j]

This commit is contained in:
Nigel Tao committed 2022-05-17 00:00:25 +10:00
1 parent f1350825cc
commit 84ef91dda8
3 files changed
+122 -75

No files matched your search

+32
View File
@@ -1192,6 +1192,38 @@ wuffs_base__make_slice_u64(uint64_t* ptr, size_t len) {
return ret;
}
static inline wuffs_base__slice_u8 //
wuffs_base__make_slice_u8_ij(uint8_t* ptr, size_t i, size_t j) {
wuffs_base__slice_u8 ret;
ret.ptr = ptr + i;
ret.len = j - i;
return ret;
}
static inline wuffs_base__slice_u16 //
wuffs_base__make_slice_u16_ij(uint16_t* ptr, size_t i, size_t j) {
wuffs_base__slice_u16 ret;
ret.ptr = ptr + i;
ret.len = j - i;
return ret;
}
static inline wuffs_base__slice_u32 //
wuffs_base__make_slice_u32_ij(uint32_t* ptr, size_t i, size_t j) {
wuffs_base__slice_u32 ret;
ret.ptr = ptr + i;
ret.len = j - i;
return ret;
}
static inline wuffs_base__slice_u64 //
wuffs_base__make_slice_u64_ij(uint64_t* ptr, size_t i, size_t j) {
wuffs_base__slice_u64 ret;
ret.ptr = ptr + i;
ret.len = j - i;
return ret;
}
static inline wuffs_base__slice_u8 //
wuffs_base__empty_slice_u8() {
wuffs_base__slice_u8 ret;
+35 -49
View File
@@ -16,7 +16,6 @@ package cgen
import (
"fmt"
"math/big"
"strings"
a "github.com/google/wuffs/lang/ast"
@@ -153,22 +152,47 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, sideEffectsOnly bool, depth u
case t.IDDotDot:
// n is a slice.
//
// TODO: don't assume that the slice is a slice of base.u8.
lhs := n.LHS().AsExpr()
mhs := n.MHS().AsExpr()
rhs := n.RHS().AsExpr()
mcv := (*big.Int)(nil)
rcv := (*big.Int)(nil)
lhsIsArray := lhs.MType().IsArrayType()
if lhsIsArray {
if (mhs != nil) && (mhs.ConstValue() != nil) {
mcv = mhs.ConstValue()
mhs = nil
comma := ", "
if (mhs != nil) && (mhs.Operator() != 0) &&
(rhs != nil) && (rhs.Operator() != 0) {
comma = ",\n"
}
if lhs.MType().IsArrayType() {
if mhs == nil {
b.writes("wuffs_base__make_slice_u8(")
} else {
b.writes("wuffs_base__make_slice_u8_ij(")
}
if (rhs != nil) && (rhs.ConstValue() != nil) {
rcv = rhs.ConstValue()
rhs = nil
if err := g.writeExpr(b, lhs, false, depth); err != nil {
return err
}
if mhs == nil {
// No-op.
} else {
b.writes(comma)
if mcv := mhs.ConstValue(); mcv != nil {
b.writes(mcv.String())
} else if err := g.writeExpr(b, mhs, false, depth); err != nil {
return err
}
}
b.writes(comma)
if rhs == nil {
b.writes(lhs.MType().ArrayLength().ConstValue().String())
} else if rcv := rhs.ConstValue(); rcv != nil {
b.writes(rcv.String())
} else if err := g.writeExpr(b, rhs, false, depth); err != nil {
return err
}
b.writes(")")
return nil
}
switch {
@@ -180,40 +204,9 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, sideEffectsOnly bool, depth u
b.writes("wuffs_base__slice_u8__subslice_ij(")
}
comma := ", "
if (mhs != nil) && (mhs.Operator() != 0) &&
(rhs != nil) && (rhs.Operator() != 0) {
comma = ",\n"
}
if lhsIsArray {
// TODO: don't assume that the slice is a slice of base.u8.
b.writes("wuffs_base__make_slice_u8(")
if mcv != nil {
b.writeb('(')
}
}
if err := g.writeExpr(b, lhs, false, depth); err != nil {
return err
}
if lhsIsArray {
if mcv != nil {
b.writes(") + ")
b.writes(mcv.String())
}
b.writes(comma)
length := lhs.MType().ArrayLength().ConstValue()
if rcv != nil {
length = rcv
}
if mcv != nil {
length = big.NewInt(0).Sub(length, mcv)
}
b.writes(length.String())
b.writeb(')')
}
if mhs != nil {
b.writes(comma)
if err := g.writeExpr(b, mhs, false, depth); err != nil {
@@ -222,16 +215,9 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, sideEffectsOnly bool, depth u
}
if rhs != nil {
b.writes(comma)
if lhsIsArray && (mcv != nil) && (mcv.Sign() != 0) {
b.writeb('(')
}
if err := g.writeExpr(b, rhs, false, depth); err != nil {
return err
}
if lhsIsArray && (mcv != nil) && (mcv.Sign() != 0) {
b.writes(") - ")
b.writes(mcv.String())
}
}
if mhs != nil || rhs != nil {
b.writeb(')')