Rename [i..j] to [i ..= j], the same as Rust

This commit is contained in:
Nigel Tao committed 2019-10-12 18:40:53 +11:00
1 parent 18c6e5716a
commit d501daddc3
18 files changed
+219 -206

No files matched your search

+3 -3
View File
@@ -636,7 +636,7 @@ func NewJump(keyword t.ID, label t.ID) *Jump {
// MaxTypeExprDepth is an advisory limit for a TypeExpr's recursion depth.
const MaxTypeExprDepth = 63
// TypeExpr is a type expression, such as "base.u32", "base.u32[..8]", "foo",
// TypeExpr is a type expression, such as "base.u32", "base.u32[..= 8]", "foo",
// "pkg.bar", "ptr T", "array[8] T", "slice T" or "table T":
// - ID0: <0|IDArray|IDFunc|IDNptr|IDPtr|IDSlice|IDTable>
// - ID1: <0|pkg>
@@ -662,8 +662,8 @@ const MaxTypeExprDepth = 63
// A zero ID0 means a (possibly package-qualified) type like "pkg.foo" or
// "foo". ID1 is the "pkg" or zero, ID2 is the "foo".
//
// Numeric types can be refined as "foo[LHS..MHS]". LHS and MHS are Expr's,
// possibly nil. For example, the LHS for "base.u32[..4095]" is nil.
// Numeric types can be refined as "foo[LHS ..= MHS]". LHS and MHS are Expr's,
// possibly nil. For example, the LHS for "base.u32[..= 4095]" is nil.
//
// TODO: struct types, list types, nptr vs ptr.
type TypeExpr Node
+9 -3
View File
@@ -234,9 +234,15 @@ func (n *TypeExpr) appendStr(buf []byte, tm *t.Map, depth uint32) []byte {
}
if n.Min() != nil || n.Max() != nil {
buf = append(buf, '[')
buf = n.Min().appendStr(buf, tm, false, 0)
buf = append(buf, ".."...)
buf = n.Max().appendStr(buf, tm, false, 0)
if n.Min() != nil {
buf = n.Min().appendStr(buf, tm, false, 0)
buf = append(buf, ' ')
}
buf = append(buf, "..="...)
if n.Max() != nil {
buf = append(buf, ' ')
buf = n.Max().appendStr(buf, tm, false, 0)
}
buf = append(buf, ']')
}
return buf
+4 -4
View File
@@ -62,13 +62,13 @@ func TestString(tt *testing.T) {
"x as base.u32",
"x as T",
"x as T",
"x as T[i..]",
"x as T[..j]",
"x as T[i..j]",
"x as T[i ..=]",
"x as T[..= j]",
"x as T[i ..= j]",
"x as pkg.T",
"x as ptr T",
"x as array[4] T",
"x as array[8 + (2 * N)] ptr array[4] ptr pkg.T[i..j]",
"x as array[8 + (2 * N)] ptr array[4] ptr pkg.T[i ..= j]",
}
tm := &t.Map{}
+63 -63
View File
@@ -88,23 +88,23 @@ var Types = []string{
}
var Funcs = []string{
"u8.high_bits(n u32[..8]) u8",
"u8.low_bits(n u32[..8]) u8",
"u8.high_bits(n u32[..= 8]) u8",
"u8.low_bits(n u32[..= 8]) u8",
"u8.max(a u8) u8",
"u8.min(a u8) u8",
"u16.high_bits(n u32[..16]) u16",
"u16.low_bits(n u32[..16]) u16",
"u16.high_bits(n u32[..= 16]) u16",
"u16.low_bits(n u32[..= 16]) u16",
"u16.max(a u16) u16",
"u16.min(a u16) u16",
"u32.high_bits(n u32[..32]) u32",
"u32.low_bits(n u32[..32]) u32",
"u32.high_bits(n u32[..= 32]) u32",
"u32.low_bits(n u32[..= 32]) u32",
"u32.max(a u32) u32",
"u32.min(a u32) u32",
"u64.high_bits(n u32[..64]) u64",
"u64.low_bits(n u32[..64]) u64",
"u64.high_bits(n u32[..= 64]) u64",
"u64.low_bits(n u32[..= 64]) u64",
"u64.max(a u64) u64",
"u64.min(a u64) u64",
@@ -156,27 +156,27 @@ var Funcs = []string{
"io_reader.read_u16be?() u16",
"io_reader.read_u16le?() u16",
"io_reader.read_u8_as_u32?() u32[..0xFF]",
"io_reader.read_u16be_as_u32?() u32[..0xFFFF]",
"io_reader.read_u16le_as_u32?() u32[..0xFFFF]",
"io_reader.read_u24be_as_u32?() u32[..0xFFFFFF]",
"io_reader.read_u24le_as_u32?() u32[..0xFFFFFF]",
"io_reader.read_u8_as_u32?() u32[..= 0xFF]",
"io_reader.read_u16be_as_u32?() u32[..= 0xFFFF]",
"io_reader.read_u16le_as_u32?() u32[..= 0xFFFF]",
"io_reader.read_u24be_as_u32?() u32[..= 0xFFFFFF]",
"io_reader.read_u24le_as_u32?() u32[..= 0xFFFFFF]",
"io_reader.read_u32be?() u32",
"io_reader.read_u32le?() u32",
"io_reader.read_u8_as_u64?() u64[..0xFF]",
"io_reader.read_u16be_as_u64?() u64[..0xFFFF]",
"io_reader.read_u16le_as_u64?() u64[..0xFFFF]",
"io_reader.read_u24be_as_u64?() u64[..0xFFFFFF]",
"io_reader.read_u24le_as_u64?() u64[..0xFFFFFF]",
"io_reader.read_u32be_as_u64?() u64[..0xFFFFFFFF]",
"io_reader.read_u32le_as_u64?() u64[..0xFFFFFFFF]",
"io_reader.read_u40be_as_u64?() u64[..0xFFFFFFFFFF]",
"io_reader.read_u40le_as_u64?() u64[..0xFFFFFFFFFF]",
"io_reader.read_u48be_as_u64?() u64[..0xFFFFFFFFFFFF]",
"io_reader.read_u48le_as_u64?() u64[..0xFFFFFFFFFFFF]",
"io_reader.read_u56be_as_u64?() u64[..0xFFFFFFFFFFFFFF]",
"io_reader.read_u56le_as_u64?() u64[..0xFFFFFFFFFFFFFF]",
"io_reader.read_u8_as_u64?() u64[..= 0xFF]",
"io_reader.read_u16be_as_u64?() u64[..= 0xFFFF]",
"io_reader.read_u16le_as_u64?() u64[..= 0xFFFF]",
"io_reader.read_u24be_as_u64?() u64[..= 0xFFFFFF]",
"io_reader.read_u24le_as_u64?() u64[..= 0xFFFFFF]",
"io_reader.read_u32be_as_u64?() u64[..= 0xFFFFFFFF]",
"io_reader.read_u32le_as_u64?() u64[..= 0xFFFFFFFF]",
"io_reader.read_u40be_as_u64?() u64[..= 0xFFFFFFFFFF]",
"io_reader.read_u40le_as_u64?() u64[..= 0xFFFFFFFFFF]",
"io_reader.read_u48be_as_u64?() u64[..= 0xFFFFFFFFFFFF]",
"io_reader.read_u48le_as_u64?() u64[..= 0xFFFFFFFFFFFF]",
"io_reader.read_u56be_as_u64?() u64[..= 0xFFFFFFFFFFFFFF]",
"io_reader.read_u56le_as_u64?() u64[..= 0xFFFFFFFFFFFFFF]",
"io_reader.read_u64be?() u64",
"io_reader.read_u64le?() u64",
@@ -192,27 +192,27 @@ var Funcs = []string{
"io_reader.peek_u16be() u16",
"io_reader.peek_u16le() u16",
"io_reader.peek_u8_as_u32() u32[..0xFF]",
"io_reader.peek_u16be_as_u32() u32[..0xFFFF]",
"io_reader.peek_u16le_as_u32() u32[..0xFFFF]",
"io_reader.peek_u24be_as_u32() u32[..0xFFFFFF]",
"io_reader.peek_u24le_as_u32() u32[..0xFFFFFF]",
"io_reader.peek_u8_as_u32() u32[..= 0xFF]",
"io_reader.peek_u16be_as_u32() u32[..= 0xFFFF]",
"io_reader.peek_u16le_as_u32() u32[..= 0xFFFF]",
"io_reader.peek_u24be_as_u32() u32[..= 0xFFFFFF]",
"io_reader.peek_u24le_as_u32() u32[..= 0xFFFFFF]",
"io_reader.peek_u32be() u32",
"io_reader.peek_u32le() u32",
"io_reader.peek_u8_as_u64() u64[..0xFF]",
"io_reader.peek_u16be_as_u64() u64[..0xFFFF]",
"io_reader.peek_u16le_as_u64() u64[..0xFFFF]",
"io_reader.peek_u24be_as_u64() u64[..0xFFFFFF]",
"io_reader.peek_u24le_as_u64() u64[..0xFFFFFF]",
"io_reader.peek_u32be_as_u64() u64[..0xFFFFFFFF]",
"io_reader.peek_u32le_as_u64() u64[..0xFFFFFFFF]",
"io_reader.peek_u40be_as_u64() u64[..0xFFFFFFFFFF]",
"io_reader.peek_u40le_as_u64() u64[..0xFFFFFFFFFF]",
"io_reader.peek_u48be_as_u64() u64[..0xFFFFFFFFFFFF]",
"io_reader.peek_u48le_as_u64() u64[..0xFFFFFFFFFFFF]",
"io_reader.peek_u56be_as_u64() u64[..0xFFFFFFFFFFFFFF]",
"io_reader.peek_u56le_as_u64() u64[..0xFFFFFFFFFFFFFF]",
"io_reader.peek_u8_as_u64() u64[..= 0xFF]",
"io_reader.peek_u16be_as_u64() u64[..= 0xFFFF]",
"io_reader.peek_u16le_as_u64() u64[..= 0xFFFF]",
"io_reader.peek_u24be_as_u64() u64[..= 0xFFFFFF]",
"io_reader.peek_u24le_as_u64() u64[..= 0xFFFFFF]",
"io_reader.peek_u32be_as_u64() u64[..= 0xFFFFFFFF]",
"io_reader.peek_u32le_as_u64() u64[..= 0xFFFFFFFF]",
"io_reader.peek_u40be_as_u64() u64[..= 0xFFFFFFFFFF]",
"io_reader.peek_u40le_as_u64() u64[..= 0xFFFFFFFFFF]",
"io_reader.peek_u48be_as_u64() u64[..= 0xFFFFFFFFFFFF]",
"io_reader.peek_u48le_as_u64() u64[..= 0xFFFFFFFFFFFF]",
"io_reader.peek_u56be_as_u64() u64[..= 0xFFFFFFFFFFFFFF]",
"io_reader.peek_u56le_as_u64() u64[..= 0xFFFFFFFFFFFFFF]",
"io_reader.peek_u64be() u64",
"io_reader.peek_u64le() u64",
@@ -236,16 +236,16 @@ var Funcs = []string{
"io_writer.write_u8?(a u8)",
"io_writer.write_u16be?(a u16)",
"io_writer.write_u16le?(a u16)",
"io_writer.write_u24be?(a u32[..0xFFFFFF])",
"io_writer.write_u24le?(a u32[..0xFFFFFF])",
"io_writer.write_u24be?(a u32[..= 0xFFFFFF])",
"io_writer.write_u24le?(a u32[..= 0xFFFFFF])",
"io_writer.write_u32be?(a u32)",
"io_writer.write_u32le?(a u32)",
"io_writer.write_u40be?(a u64[..0xFFFFFFFFFF])",
"io_writer.write_u40le?(a u64[..0xFFFFFFFFFF])",
"io_writer.write_u48be?(a u64[..0xFFFFFFFFFFFF])",
"io_writer.write_u48le?(a u64[..0xFFFFFFFFFFFF])",
"io_writer.write_u56be?(a u64[..0xFFFFFFFFFFFFFF])",
"io_writer.write_u56le?(a u64[..0xFFFFFFFFFFFFFF])",
"io_writer.write_u40be?(a u64[..= 0xFFFFFFFFFF])",
"io_writer.write_u40le?(a u64[..= 0xFFFFFFFFFF])",
"io_writer.write_u48be?(a u64[..= 0xFFFFFFFFFFFF])",
"io_writer.write_u48le?(a u64[..= 0xFFFFFFFFFFFF])",
"io_writer.write_u56be?(a u64[..= 0xFFFFFFFFFFFFFF])",
"io_writer.write_u56le?(a u64[..= 0xFFFFFFFFFFFFFF])",
"io_writer.write_u64be?(a u64)",
"io_writer.write_u64le?(a u64)",
@@ -257,16 +257,16 @@ var Funcs = []string{
"io_writer.write_fast_u8!(a u8)",
"io_writer.write_fast_u16be!(a u16)",
"io_writer.write_fast_u16le!(a u16)",
"io_writer.write_fast_u24be!(a u32[..0xFFFFFF])",
"io_writer.write_fast_u24le!(a u32[..0xFFFFFF])",
"io_writer.write_fast_u24be!(a u32[..= 0xFFFFFF])",
"io_writer.write_fast_u24le!(a u32[..= 0xFFFFFF])",
"io_writer.write_fast_u32be!(a u32)",
"io_writer.write_fast_u32le!(a u32)",
"io_writer.write_fast_u40be!(a u64[..0xFFFFFFFFFF])",
"io_writer.write_fast_u40le!(a u64[..0xFFFFFFFFFF])",
"io_writer.write_fast_u48be!(a u64[..0xFFFFFFFFFFFF])",
"io_writer.write_fast_u48le!(a u64[..0xFFFFFFFFFFFF])",
"io_writer.write_fast_u56be!(a u64[..0xFFFFFFFFFFFFFF])",
"io_writer.write_fast_u56le!(a u64[..0xFFFFFFFFFFFFFF])",
"io_writer.write_fast_u40be!(a u64[..= 0xFFFFFFFFFF])",
"io_writer.write_fast_u40le!(a u64[..= 0xFFFFFFFFFF])",
"io_writer.write_fast_u48be!(a u64[..= 0xFFFFFFFFFFFF])",
"io_writer.write_fast_u48le!(a u64[..= 0xFFFFFFFFFFFF])",
"io_writer.write_fast_u56be!(a u64[..= 0xFFFFFFFFFFFFFF])",
"io_writer.write_fast_u56le!(a u64[..= 0xFFFFFFFFFFFFFF])",
"io_writer.write_fast_u64be!(a u64)",
"io_writer.write_fast_u64le!(a u64)",
@@ -302,11 +302,11 @@ var Funcs = []string{
"frame_config.blend() u8",
"frame_config.disposal() u8",
"frame_config.duration() u64[..0x7FFFFFFFFFFFFFFF]",
"frame_config.duration() u64[..= 0x7FFFFFFFFFFFFFFF]",
"frame_config.index() u64",
"frame_config.io_position() u64",
"frame_config.update!(bounds rect_ie_u32, duration u64[..0x7FFFFFFFFFFFFFFF], " +
"frame_config.update!(bounds rect_ie_u32, duration u64[..= 0x7FFFFFFFFFFFFFFF], " +
"index u64, io_position u64, blend u8, disposal u8, background_color u32)",
// ---- image_config
@@ -318,7 +318,7 @@ var Funcs = []string{
"pixel_buffer.palette() slice u8",
"pixel_buffer.pixel_format() u32",
"pixel_buffer.plane(p u32[..3]) table u8",
"pixel_buffer.plane(p u32[..= 3]) table u8",
// ---- pixel_swizzler
+4 -4
View File
@@ -66,12 +66,12 @@ func TestCheck(tt *testing.T) {
pri func foo.bar() {
var x base.u8
var y base.i32
var z base.u64[..123]
var z base.u64[..= 123]
var a array[4] base.u8
var b base.bool
var p base.i32
var q base.i32[0..8]
var q base.i32[0 ..= 8]
x = 0
x = 1 + (x * 0)
@@ -158,11 +158,11 @@ func TestCheck(tt *testing.T) {
{"b", "base.bool"},
{"coroutine_resumed", "base.bool"},
{"p", "base.i32"},
{"q", "base.i32[0..8]"},
{"q", "base.i32[0 ..= 8]"},
{"this", "ptr foo"},
{"x", "base.u8"},
{"y", "base.i32"},
{"z", "base.u64[..123]"},
{"z", "base.u64[..= 123]"},
}
if !reflect.DeepEqual(got, want) {
tt.Fatalf("\ngot %v\nwant %v", got, want)
+5 -5
View File
@@ -432,7 +432,7 @@ func (p *parser) parseTypeExpr() (*a.TypeExpr, error) {
lhs, mhs := (*a.Expr)(nil), (*a.Expr)(nil)
if p.peek1() == t.IDOpenBracket {
_, lhs, mhs, err = p.parseBracket(t.IDDotDot)
_, lhs, mhs, err = p.parseBracket(t.IDDotDotEq)
if err != nil {
return nil, err
}
@@ -441,8 +441,8 @@ func (p *parser) parseTypeExpr() (*a.TypeExpr, error) {
return a.NewTypeExpr(0, pkg, name, lhs.AsNode(), mhs, nil), nil
}
// parseBracket parses "[i:j]", "[i:]", "[:j]" and "[:]". A double dot replaces
// the colon if sep is t.IDDotDot instead of t.IDColon. If sep is t.IDColon, it
// parseBracket parses "[i:j]", "[i:]", "[:j]" and "[:]". A "..=" replaces the
// ":" if sep is t.IDDotDotEq instead of t.IDColon. If sep is t.IDColon, it
// also parses "[x]". The returned op is sep for a range or refinement and
// t.IDOpenBracket for an index.
func (p *parser) parseBracket(sep t.ID) (op t.ID, ei *a.Expr, ej *a.Expr, err error) {
@@ -934,7 +934,7 @@ func (p *parser) parseIterateBlock(label t.ID, assigns []*a.Node) (*a.Iterate, e
length := p.peek1()
if length.SmallPowerOf2Value() == 0 {
return nil, fmt.Errorf(`parse: expected power-of-2 length count in [1..256], got %q at %s:%d`,
return nil, fmt.Errorf(`parse: expected power-of-2 length count in [1 ..= 256], got %q at %s:%d`,
p.tm.ByID(length), p.filename, p.line())
}
p.src = p.src[1:]
@@ -959,7 +959,7 @@ func (p *parser) parseIterateBlock(label t.ID, assigns []*a.Node) (*a.Iterate, e
unroll := p.peek1()
if unroll.SmallPowerOf2Value() == 0 {
return nil, fmt.Errorf(`parse: expected power-of-2 unroll count in [1..256], got %q at %s:%d`,
return nil, fmt.Errorf(`parse: expected power-of-2 unroll count in [1 ..= 256], got %q at %s:%d`,
p.tm.ByID(unroll), p.filename, p.line())
}
p.src = p.src[1:]
+20 -16
View File
@@ -201,7 +201,8 @@ const (
)
const (
IDInvalid = ID(0)
IDInvalid = ID(0)
IDSemicolon = ID(0x01)
minOpen = 0x02
maxOpen = 0x04
@@ -217,14 +218,14 @@ const (
IDCloseBracket = ID(0x06)
IDCloseCurly = ID(0x07)
IDDot = ID(0x08)
IDDotDot = ID(0x09)
IDComma = ID(0x0A)
IDExclam = ID(0x0B)
IDQuestion = ID(0x0C)
IDColon = ID(0x0D)
IDSemicolon = ID(0x0E)
IDDollar = ID(0x0F)
IDDot = ID(0x08)
IDDotDot = ID(0x09)
IDDotDotEq = ID(0x0A)
IDComma = ID(0x0B)
IDExclam = ID(0x0C)
IDQuestion = ID(0x0D)
IDColon = ID(0x0E)
IDDollar = ID(0x0F)
)
const (
@@ -614,6 +615,7 @@ var builtInsByID = [nBuiltInIDs]string{
IDDot: ".",
IDDotDot: "..",
IDDotDotEq: "..=",
IDComma: ",",
IDExclam: "!",
IDQuestion: "?",
@@ -971,6 +973,7 @@ type suffixLexer struct {
// we want to lex greedily, longer suffixes should be earlier in the slice.
var lexers = [256][]suffixLexer{
'.': {
{".=", IDDotDotEq},
{".", IDDotDot},
{"", IDDot},
},
@@ -1165,17 +1168,18 @@ var associativeForms = [nBuiltInSymbolicIDs]ID{
}
var isTightLeft = [...]bool{
IDSemicolon: true,
IDCloseParen: true,
IDOpenBracket: true,
IDCloseBracket: true,
IDDot: true,
IDDotDot: true,
IDComma: true,
IDExclam: true,
IDQuestion: true,
IDColon: true,
IDSemicolon: true,
IDDot: true,
IDDotDot: true,
IDComma: true,
IDExclam: true,
IDQuestion: true,
IDColon: true,
}
var isTightRight = [...]bool{