From eeebd58d7b1f7d7bf77cdac2439485e8ee210e25 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 15 Apr 2018 17:57:10 +1000 Subject: [PATCH] Remove token ID/Key distinction, part 11 of N --- cmd/wuffs-c/internal/cgen/cgen.go | 18 +- cmd/wuffs-c/internal/cgen/expr.go | 206 ++--- cmd/wuffs-c/internal/cgen/func.go | 24 +- cmd/wuffs-c/internal/cgen/statement.go | 88 +- cmd/wuffs-c/internal/cgen/var.go | 26 +- lang/ast/ast.go | 32 +- lang/ast/eq.go | 4 +- lang/ast/string.go | 106 +-- lang/check/assert.go | 96 +- lang/check/bounds.go | 242 ++--- lang/check/check.go | 6 +- lang/check/data.go | 32 +- lang/check/gen.go | 2 +- lang/check/optimize.go | 76 +- lang/check/resolve.go | 2 +- lang/check/type.go | 224 ++--- lang/parse/parse.go | 252 ++--- lang/render/render.go | 8 +- lang/token/list.go | 1174 ++++++++++-------------- lang/token/token.go | 25 +- 20 files changed, 1218 insertions(+), 1425 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 8c2d55ba..671d7b77 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -254,7 +254,7 @@ func (g *gen) genHeader(b *buffer) error { for i, z := range builtin.StatusList { code := uint32(0) - if z.Keyword.Key() == t.KeyError { + if z.Keyword == t.IDError { code |= 1 << 31 } code |= uint32(i) @@ -267,7 +267,7 @@ func (g *gen) genHeader(b *buffer) error { } for i, s := range g.statusList { code := pkgID << statusCodeNamespaceShift - if s.keyword.Key() == t.KeyError { + if s.keyword == t.IDError { code |= 1 << 31 } code |= uint32(i) @@ -467,14 +467,14 @@ func (g *gen) cName(name string) string { func (g *gen) sizeof(typ *a.TypeExpr) (uint32, error) { if typ.Decorator() == 0 { if qid := typ.QID(); qid[0] == t.IDBase { - switch qid[1].Key() { - case t.KeyU8: + switch qid[1] { + case t.IDU8: return 1, nil - case t.KeyU16: + case t.IDU16: return 2, nil - case t.KeyU32: + case t.IDU32: return 4, nil - case t.KeyU64: + case t.IDU64: return 8, nil } } @@ -489,7 +489,7 @@ func (g *gen) gatherStatuses(b *buffer, n *a.Status) error { return fmt.Errorf("bad status message %q", raw) } prefix := "SUSPENSION_" - if n.Keyword().Key() == t.KeyError { + if n.Keyword() == t.IDError { prefix = "ERROR_" } s := status{ @@ -519,7 +519,7 @@ func (g *gen) writeConst(b *buffer, n *a.Const) error { } func (g *gen) writeConstList(b *buffer, n *a.Expr) error { - if n.Operator().Key() == t.KeyDollar { + if n.Operator() == t.IDDollar { b.writeb('{') for _, o := range n.Args() { if err := g.writeConstList(b, o.Expr()); err != nil { diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index e083fe70..c1acd808 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -69,9 +69,9 @@ func (g *gen) writeExpr(b *buffer, n *a.Expr, rp replacementPolicy, pp parenthes } func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, depth uint32) error { - switch n.Operator().Key() { + switch n.Operator() { case 0: - if id1 := n.Ident(); id1.Key() == t.KeyThis { + if id1 := n.Ident(); id1 == t.IDThis { b.writes("self") } else { if n.GlobalIdent() { @@ -83,10 +83,10 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare } return nil - case t.KeyOpenParen: + case t.IDOpenParen: // n is a function call. // TODO: delete this hack that only matches "foo.bar_bits(etc)". - if isThatMethod(g.tm, n, t.KeyLowBits, 1) { + if isThatMethod(g.tm, n, t.IDLowBits, 1) { // "x.low_bits(n:etc)" in C is "((x) & ((1 << (n)) - 1))". x := n.LHS().Expr().LHS().Expr() b.writes("((") @@ -100,7 +100,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writes(")) - 1))") return nil } - if isThatMethod(g.tm, n, t.KeyHighBits, 1) { + if isThatMethod(g.tm, n, t.IDHighBits, 1) { // "x.high_bits(n:etc)" in C is "((x) >> (8*sizeof(x) - (n)))". x := n.LHS().Expr().LHS().Expr() b.writes("((") @@ -120,8 +120,8 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writes(")))") return nil } - if isThatMethod(g.tm, n, t.KeyIsError, 0) || isThatMethod(g.tm, n, t.KeyIsOK, 0) || - isThatMethod(g.tm, n, t.KeyIsSuspension, 0) { + if isThatMethod(g.tm, n, t.IDIsError, 0) || isThatMethod(g.tm, n, t.IDIsOK, 0) || + isThatMethod(g.tm, n, t.IDIsSuspension, 0) { if pp == parenthesesMandatory { b.writeb('(') } @@ -129,22 +129,22 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare if err := g.writeExpr(b, x, rp, parenthesesMandatory, depth); err != nil { return err } - switch key := n.LHS().Expr().Ident().Key(); key { - case t.KeyIsError: + switch key := n.LHS().Expr().Ident(); key { + case t.IDIsError: b.writes(" < 0") - case t.KeyIsOK: + case t.IDIsOK: b.writes(" == 0") - case t.KeyIsSuspension: + case t.IDIsSuspension: b.writes(" > 0") default: - return fmt.Errorf("unrecognized token.Key (0x%X) for writeExprOther's IsXxx", key) + return fmt.Errorf("unrecognized token (0x%X) for writeExprOther's IsXxx", key) } if pp == parenthesesMandatory { b.writeb(')') } return nil } - if isThatMethod(g.tm, n, t.KeySuffix, 1) { + if isThatMethod(g.tm, n, t.IDSuffix, 1) { // TODO: don't assume that the slice is a slice of base.u8. b.writes("wuffs_base__slice_u8_suffix(") x := n.LHS().Expr().LHS().Expr() @@ -158,14 +158,14 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writes(")") return nil } - if isInSrc(g.tm, n, t.KeyLimit, 1) { + if isInSrc(g.tm, n, t.IDLimit, 1) { return fmt.Errorf(`TODO: cgen an "in.src.limit" expression`) } - if isInSrc(g.tm, n, t.KeyMark, 0) { + if isInSrc(g.tm, n, t.IDMark, 0) { b.printf("wuffs_base__io_reader__mark(&%ssrc, %srptr_src)", aPrefix, bPrefix) return nil } - if isInSrc(g.tm, n, t.KeySinceMark, 0) { + if isInSrc(g.tm, n, t.IDSinceMark, 0) { b.printf("((wuffs_base__slice_u8){ "+ ".ptr = %ssrc.private_impl.mark, "+ ".len = %ssrc.private_impl.mark ? (size_t)(%srptr_src - %ssrc.private_impl.mark) : 0, })", @@ -173,10 +173,10 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare return nil } // TODO: io_reader.is_marked, not just io_writer.is_marked? - if isInDst(g.tm, n, t.KeyLimit, 1) { + if isInDst(g.tm, n, t.IDLimit, 1) { return fmt.Errorf(`TODO: cgen an "in.dst.limit" expression`) } - if isInDst(g.tm, n, t.KeyMark, 0) { + if isInDst(g.tm, n, t.IDMark, 0) { // TODO: is a private_impl.mark the right representation? What if // the function is passed a (ptr io_writer) instead of a // (io_writer)? Do we still want to have that mark live outside of @@ -184,7 +184,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.printf("wuffs_base__io_writer__mark(&%sdst, %swptr_dst)", aPrefix, bPrefix) return nil } - if isInDst(g.tm, n, t.KeySinceMark, 0) { + if isInDst(g.tm, n, t.IDSinceMark, 0) { // Write .len as either "foo ? bar : baz" or "bar". // // TODO: drop the "true" in the "if true", provided that the @@ -200,7 +200,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare aPrefix, len0, bPrefix, aPrefix, len1) return nil } - if isInDst(g.tm, n, t.KeyIsMarked, 0) { + if isInDst(g.tm, n, t.IDIsMarked, 0) { if pp == parenthesesMandatory { b.writeb('(') } @@ -210,7 +210,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare } return nil } - if isInDst(g.tm, n, t.KeyCopyFromReader32, 2) { + if isInDst(g.tm, n, t.IDCopyFromReader32, 2) { b.printf("wuffs_base__io_writer__copy_from_reader32(&%swptr_dst, %swend_dst", bPrefix, bPrefix) // TODO: don't assume that the first argument is "in.src". @@ -222,7 +222,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writeb(')') return nil } - if isInDst(g.tm, n, t.KeyCopyFromHistory32, 2) { + if isInDst(g.tm, n, t.IDCopyFromHistory32, 2) { bco := "" if n.BoundsCheckOptimized() { bco = "__bco" @@ -239,7 +239,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writeb(')') return nil } - if isInDst(g.tm, n, t.KeyCopyFromSlice32, 2) { + if isInDst(g.tm, n, t.IDCopyFromSlice32, 2) { b.printf("wuffs_base__io_writer__copy_from_slice32("+ "&%swptr_dst, %swend_dst", bPrefix, bPrefix) for _, o := range n.Args() { @@ -251,7 +251,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writeb(')') return nil } - if isInDst(g.tm, n, t.KeyCopyFromSlice, 1) { + if isInDst(g.tm, n, t.IDCopyFromSlice, 1) { b.printf("wuffs_base__io_writer__copy_from_slice(&%swptr_dst, %swend_dst,", bPrefix, bPrefix) a := n.Args()[0].Arg().Value() if err := g.writeExpr(b, a, rp, parenthesesOptional, depth); err != nil { @@ -260,7 +260,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writeb(')') return nil } - if isThatMethod(g.tm, n, t.KeyCopyFromSlice, 1) { + if isThatMethod(g.tm, n, t.IDCopyFromSlice, 1) { b.writes("wuffs_base__slice_u8__copy_from_slice(") receiver := n.LHS().Expr().LHS().Expr() if err := g.writeExpr(b, receiver, rp, parenthesesOptional, depth); err != nil { @@ -274,7 +274,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writes(")\n") return nil } - if isThatMethod(g.tm, n, t.KeyLength, 0) { + if isThatMethod(g.tm, n, t.IDLength, 0) { if pp == parenthesesMandatory { b.writeb('(') } @@ -288,7 +288,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare } return nil } - if isThatMethod(g.tm, n, t.KeyAvailable, 0) { + if isThatMethod(g.tm, n, t.IDAvailable, 0) { if pp == parenthesesMandatory { b.writeb('(') } @@ -313,7 +313,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare } return nil } - if isThatMethod(g.tm, n, g.tm.ByName("update").Key(), 1) { + if isThatMethod(g.tm, n, g.tm.ByName("update"), 1) { // TODO: don't hard-code the class name or this.checksum. class := "wuffs_crc32__ieee" if g.pkgName == "zlib" { @@ -327,7 +327,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writes(")\n") return nil } - if isThatMethod(g.tm, n, g.tm.ByName("set_literal_width").Key(), 1) { + if isThatMethod(g.tm, n, g.tm.ByName("set_literal_width"), 1) { // TODO: don't hard-code lzw. b.printf("%slzw_decoder__set_literal_width(&self->private_impl.f_lzw, ", g.pkgPrefix) a := n.Args()[0].Arg().Value() @@ -337,22 +337,22 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writes(")\n") return nil } - if isThatMethod(g.tm, n, t.KeyLimit, 1) { + if isThatMethod(g.tm, n, t.IDLimit, 1) { return fmt.Errorf(`TODO: cgen a "foo.limit" expression`) } - if isThatMethod(g.tm, n, t.KeyMark, 0) { + if isThatMethod(g.tm, n, t.IDMark, 0) { // TODO: don't hard-code v_r or b_rptr_src. b.printf("wuffs_base__io_reader__mark(&v_r, b_rptr_src)") return nil } - if isThatMethod(g.tm, n, t.KeySinceMark, 0) { + if isThatMethod(g.tm, n, t.IDSinceMark, 0) { // TODO: don't hard-code v_r or b_rptr_src. b.printf("((wuffs_base__slice_u8){ " + ".ptr = v_r.private_impl.mark, " + ".len = v_r.private_impl.mark ? (size_t)(b_rptr_src - v_r.private_impl.mark) : 0, })") return nil } - if isThatMethod(g.tm, n, g.tm.ByName("initialize").Key(), 5) { + if isThatMethod(g.tm, n, g.tm.ByName("initialize"), 5) { // TODO: don't hard-code a_dst. b.printf("wuffs_base__image_config__initialize(a_dst") for _, o := range n.Args() { @@ -366,7 +366,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare } // TODO. - case t.KeyOpenBracket: + case t.IDOpenBracket: // n is an index. if err := g.writeExpr(b, n.LHS().Expr(), rp, parenthesesMandatory, depth); err != nil { return err @@ -382,7 +382,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writeb(']') return nil - case t.KeyColon: + case t.IDColon: // n is a slice. lhs := n.LHS().Expr() mhs := n.MHS().Expr() @@ -425,9 +425,9 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare } return nil - case t.KeyDot: + case t.IDDot: lhs := n.LHS().Expr() - if lhs.Ident().Key() == t.KeyIn { + if lhs.Ident() == t.IDIn { b.writes(aPrefix) b.writes(n.Ident().Str(g.tm)) return nil @@ -436,7 +436,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare if err := g.writeExpr(b, lhs, rp, parenthesesMandatory, depth); err != nil { return err } - if key := lhs.MType().Decorator().Key(); key == t.KeyPtr || key == t.KeyNptr { + if key := lhs.MType().Decorator(); key == t.IDPtr || key == t.IDNptr { b.writes("->") } else { b.writes(".") @@ -445,7 +445,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writes(n.Ident().Str(g.tm)) return nil - case t.KeyError, t.KeyStatus, t.KeySuspension: + case t.IDError, t.IDStatus, t.IDSuspension: status := g.statusMap[n.StatusQID()] if status.name == "" { msg, _ := t.Unescape(n.Ident().Str(g.tm)) @@ -458,17 +458,17 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writes(status.name) return nil } - return fmt.Errorf("unrecognized token.Key (0x%X) for writeExprOther", n.Operator().Key()) + return fmt.Errorf("unrecognized token (0x%X) for writeExprOther", n.Operator()) } func (g *gen) writeExprUnaryOp(b *buffer, n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, depth uint32) error { - b.writes(cOpNames[0xFF&n.Operator().Key()]) + b.writes(cOpNames[0xFF&n.Operator()]) return g.writeExpr(b, n.RHS().Expr(), rp, parenthesesMandatory, depth) } func (g *gen) writeExprBinaryOp(b *buffer, n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, depth uint32) error { op := n.Operator() - if op.Key() == t.KeyXBinaryAs { + if op == t.IDXBinaryAs { return g.writeExprAs(b, n.LHS().Expr(), n.RHS().TypeExpr(), rp, depth) } if pp == parenthesesMandatory { @@ -478,7 +478,7 @@ func (g *gen) writeExprBinaryOp(b *buffer, n *a.Expr, rp replacementPolicy, pp p return err } // TODO: does KeyXBinaryAmpHat need special consideration? - b.writes(cOpNames[0xFF&op.Key()]) + b.writes(cOpNames[0xFF&op]) if err := g.writeExpr(b, n.RHS().Expr(), rp, parenthesesMandatory, depth); err != nil { return err } @@ -507,7 +507,7 @@ func (g *gen) writeExprAssociativeOp(b *buffer, n *a.Expr, rp replacementPolicy, if pp == parenthesesMandatory { b.writeb('(') } - opName := cOpNames[0xFF&n.Operator().Key()] + opName := cOpNames[0xFF&n.Operator()] for i, o := range n.Args() { if i != 0 { b.writes(opName) @@ -549,7 +549,7 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var numPointers, innermost := 0, x for ; innermost != nil && innermost.Inner() != nil; innermost = innermost.Inner() { // TODO: "nptr T", not just "ptr T". - if p := innermost.Decorator().Key(); p == t.KeyPtr { + if p := innermost.Decorator(); p == t.IDPtr { if numPointers == maxNumPointers { return fmt.Errorf("cannot convert Wuffs type %q to C: too many ptr's", n.Str(g.tm)) } @@ -562,7 +562,7 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var fallback := true if qid := innermost.QID(); qid[0] == t.IDBase { - if key := qid[1].Key(); key < t.Key(len(cTypeNames)) { + if key := qid[1]; key < t.ID(len(cTypeNames)) { if s := cTypeNames[key]; s != "" { b.writes(s) fallback = false @@ -614,67 +614,67 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var } var cTypeNames = [...]string{ - t.KeyI8: "int8_t", - t.KeyI16: "int16_t", - t.KeyI32: "int32_t", - t.KeyI64: "int64_t", - t.KeyU8: "uint8_t", - t.KeyU16: "uint16_t", - t.KeyU32: "uint32_t", - t.KeyU64: "uint64_t", - t.KeyBool: "bool", - t.KeyIOReader: "wuffs_base__io_reader", - t.KeyIOWriter: "wuffs_base__io_writer", + t.IDI8: "int8_t", + t.IDI16: "int16_t", + t.IDI32: "int32_t", + t.IDI64: "int64_t", + t.IDU8: "uint8_t", + t.IDU16: "uint16_t", + t.IDU32: "uint32_t", + t.IDU64: "uint64_t", + t.IDBool: "bool", + t.IDIOReader: "wuffs_base__io_reader", + t.IDIOWriter: "wuffs_base__io_writer", } var cOpNames = [256]string{ - t.KeyEq: " = ", - t.KeyPlusEq: " += ", - t.KeyMinusEq: " -= ", - t.KeyStarEq: " *= ", - t.KeySlashEq: " /= ", - t.KeyShiftLEq: " <<= ", - t.KeyShiftREq: " >>= ", - t.KeyAmpEq: " &= ", - t.KeyAmpHatEq: " no_such_amp_hat_C_operator ", - t.KeyPipeEq: " |= ", - t.KeyHatEq: " ^= ", - t.KeyPercentEq: " %= ", - t.KeyTildePlusEq: " += ", + t.IDEq: " = ", + t.IDPlusEq: " += ", + t.IDMinusEq: " -= ", + t.IDStarEq: " *= ", + t.IDSlashEq: " /= ", + t.IDShiftLEq: " <<= ", + t.IDShiftREq: " >>= ", + t.IDAmpEq: " &= ", + t.IDAmpHatEq: " no_such_amp_hat_C_operator ", + t.IDPipeEq: " |= ", + t.IDHatEq: " ^= ", + t.IDPercentEq: " %= ", + t.IDTildePlusEq: " += ", - t.KeyXUnaryPlus: " + ", - t.KeyXUnaryMinus: " - ", - t.KeyXUnaryNot: " ! ", - t.KeyXUnaryRef: " & ", - t.KeyXUnaryDeref: " * ", + t.IDXUnaryPlus: " + ", + t.IDXUnaryMinus: " - ", + t.IDXUnaryNot: " ! ", + t.IDXUnaryRef: " & ", + t.IDXUnaryDeref: " * ", - t.KeyXBinaryPlus: " + ", - t.KeyXBinaryMinus: " - ", - t.KeyXBinaryStar: " * ", - t.KeyXBinarySlash: " / ", - t.KeyXBinaryShiftL: " << ", - t.KeyXBinaryShiftR: " >> ", - t.KeyXBinaryAmp: " & ", - t.KeyXBinaryAmpHat: " no_such_amp_hat_C_operator ", - t.KeyXBinaryPipe: " | ", - t.KeyXBinaryHat: " ^ ", - t.KeyXBinaryPercent: " % ", - t.KeyXBinaryNotEq: " != ", - t.KeyXBinaryLessThan: " < ", - t.KeyXBinaryLessEq: " <= ", - t.KeyXBinaryEqEq: " == ", - t.KeyXBinaryGreaterEq: " >= ", - t.KeyXBinaryGreaterThan: " > ", - t.KeyXBinaryAnd: " && ", - t.KeyXBinaryOr: " || ", - t.KeyXBinaryAs: " no_such_as_C_operator ", - t.KeyXBinaryTildePlus: " + ", + t.IDXBinaryPlus: " + ", + t.IDXBinaryMinus: " - ", + t.IDXBinaryStar: " * ", + t.IDXBinarySlash: " / ", + t.IDXBinaryShiftL: " << ", + t.IDXBinaryShiftR: " >> ", + t.IDXBinaryAmp: " & ", + t.IDXBinaryAmpHat: " no_such_amp_hat_C_operator ", + t.IDXBinaryPipe: " | ", + t.IDXBinaryHat: " ^ ", + t.IDXBinaryPercent: " % ", + t.IDXBinaryNotEq: " != ", + t.IDXBinaryLessThan: " < ", + t.IDXBinaryLessEq: " <= ", + t.IDXBinaryEqEq: " == ", + t.IDXBinaryGreaterEq: " >= ", + t.IDXBinaryGreaterThan: " > ", + t.IDXBinaryAnd: " && ", + t.IDXBinaryOr: " || ", + t.IDXBinaryAs: " no_such_as_C_operator ", + t.IDXBinaryTildePlus: " + ", - t.KeyXAssociativePlus: " + ", - t.KeyXAssociativeStar: " * ", - t.KeyXAssociativeAmp: " & ", - t.KeyXAssociativePipe: " | ", - t.KeyXAssociativeHat: " ^ ", - t.KeyXAssociativeAnd: " && ", - t.KeyXAssociativeOr: " || ", + t.IDXAssociativePlus: " + ", + t.IDXAssociativeStar: " * ", + t.IDXAssociativeAmp: " & ", + t.IDXAssociativePipe: " | ", + t.IDXAssociativeHat: " ^ ", + t.IDXAssociativeAnd: " && ", + t.IDXAssociativeOr: " || ", } diff --git a/cmd/wuffs-c/internal/cgen/func.go b/cmd/wuffs-c/internal/cgen/func.go index 8d7b05d2..677788d9 100644 --- a/cmd/wuffs-c/internal/cgen/func.go +++ b/cmd/wuffs-c/internal/cgen/func.go @@ -332,13 +332,13 @@ func (g *gen) writeFuncImplArgChecks(b *buffer, n *a.Func) error { for _, o := range n.In().Fields() { o := o.Field() oTyp := o.XType() - if oTyp.Decorator().Key() != t.KeyPtr && !oTyp.IsRefined() { + if oTyp.Decorator() != t.IDPtr && !oTyp.IsRefined() { // TODO: Also check elements, for array-typed arguments. continue } switch { - case oTyp.Decorator().Key() == t.KeyPtr: + case oTyp.Decorator() == t.IDPtr: checks = append(checks, fmt.Sprintf("!%s%s", aPrefix, o.Name().Str(g.tm))) case oTyp.IsRefined(): @@ -351,7 +351,7 @@ func (g *gen) writeFuncImplArgChecks(b *buffer, n *a.Func) error { } } if qid := oTyp.QID(); qid[0] == t.IDBase { - if key := qid[1].Key(); key < t.Key(len(numTypeBounds)) { + if key := qid[1]; key < t.ID(len(numTypeBounds)) { ntb := numTypeBounds[key] for i := 0; i < 2; i++ { if bounds[i] != nil && ntb[i] != nil && bounds[i].Cmp(ntb[i]) == 0 { @@ -401,13 +401,13 @@ func (g *gen) writeFuncImplArgChecks(b *buffer, n *a.Func) error { } var numTypeBounds = [256][2]*big.Int{ - t.KeyI8: {big.NewInt(-1 << 7), big.NewInt(1<<7 - 1)}, - t.KeyI16: {big.NewInt(-1 << 15), big.NewInt(1<<15 - 1)}, - t.KeyI32: {big.NewInt(-1 << 31), big.NewInt(1<<31 - 1)}, - t.KeyI64: {big.NewInt(-1 << 63), big.NewInt(1<<63 - 1)}, - t.KeyU8: {zero, big.NewInt(0).SetUint64(1<<8 - 1)}, - t.KeyU16: {zero, big.NewInt(0).SetUint64(1<<16 - 1)}, - t.KeyU32: {zero, big.NewInt(0).SetUint64(1<<32 - 1)}, - t.KeyU64: {zero, big.NewInt(0).SetUint64(1<<64 - 1)}, - t.KeyBool: {zero, one}, + t.IDI8: {big.NewInt(-1 << 7), big.NewInt(1<<7 - 1)}, + t.IDI16: {big.NewInt(-1 << 15), big.NewInt(1<<15 - 1)}, + t.IDI32: {big.NewInt(-1 << 31), big.NewInt(1<<31 - 1)}, + t.IDI64: {big.NewInt(-1 << 63), big.NewInt(1<<63 - 1)}, + t.IDU8: {zero, big.NewInt(0).SetUint64(1<<8 - 1)}, + t.IDU16: {zero, big.NewInt(0).SetUint64(1<<16 - 1)}, + t.IDU32: {zero, big.NewInt(0).SetUint64(1<<32 - 1)}, + t.IDU64: {zero, big.NewInt(0).SetUint64(1<<64 - 1)}, + t.IDBool: {zero, one}, } diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index bfb92c81..2242a0b5 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -82,7 +82,7 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error { return err } // TODO: does KeyAmpHatEq need special consideration? - b.writes(cOpNames[0xFF&n.Operator().Key()]) + b.writes(cOpNames[0xFF&n.Operator()]) if err := g.writeExpr(b, n.RHS(), replaceCallSuspendibles, parenthesesMandatory, depth); err != nil { return err } @@ -213,7 +213,7 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error { return err } keyword := "continue" - if n.Keyword().Key() == t.KeyBreak { + if n.Keyword() == t.IDBreak { keyword = "break" } b.printf("goto label_%d_%s;\n", jt, keyword) @@ -225,11 +225,11 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error { if g.currFunk.suspendible { b.writes("status = ") - retKeyword := t.KeyStatus + retKeyword := t.IDStatus if retExpr == nil { b.printf("%s%s", g.PKGPREFIX, "STATUS_OK") } else { - retKeyword = retExpr.Operator().Key() + retKeyword = retExpr.Operator() // TODO: check that retExpr has no call-suspendibles. if err := g.writeExpr( b, retExpr, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil { @@ -238,14 +238,14 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error { } b.writes(";") - if n.Keyword().Key() == t.KeyYield { + if n.Keyword() == t.IDYield { return g.writeCoroSuspPoint(b, true) } switch retKeyword { - case t.KeyError: + case t.IDError: b.writes("goto exit;") - case t.KeyStatus: + case t.IDStatus: b.writes("goto ok;") default: b.printf("if (status == 0) { goto ok; } else if (status > 0) { "+ @@ -443,7 +443,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { // TODO: delete these hacks that only matches "in.src.read_u8?()" etc. // // TODO: check io_reader.buf and io_writer.buf is non-NULL. - if isInSrc(g.tm, n, t.KeyReadU8, 0) { + if isInSrc(g.tm, n, t.IDReadU8, 0) { if g.currFunk.tempW > maxTemp { return fmt.Errorf("too many temporary variables required") } @@ -463,26 +463,26 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { } b.printf(" = *%srptr_src++;\n", bPrefix) - } else if isInSrc(g.tm, n, t.KeyUnreadU8, 0) { + } else if isInSrc(g.tm, n, t.IDUnreadU8, 0) { b.printf("if (%srptr_src == %srstart_src) { status = %sERROR_INVALID_I_O_OPERATION;", bPrefix, bPrefix, g.PKGPREFIX) b.writes("goto exit;") b.writes("}\n") b.printf("%srptr_src--;\n", bPrefix) - } else if isInSrc(g.tm, n, t.KeyReadU16BE, 0) { + } else if isInSrc(g.tm, n, t.IDReadU16BE, 0) { return g.writeReadUXX(b, n, "src", 16, "be") - } else if isInSrc(g.tm, n, t.KeyReadU16LE, 0) { + } else if isInSrc(g.tm, n, t.IDReadU16LE, 0) { return g.writeReadUXX(b, n, "src", 16, "le") - } else if isInSrc(g.tm, n, t.KeyReadU32BE, 0) { + } else if isInSrc(g.tm, n, t.IDReadU32BE, 0) { return g.writeReadUXX(b, n, "src", 32, "be") - } else if isInSrc(g.tm, n, t.KeyReadU32LE, 0) { + } else if isInSrc(g.tm, n, t.IDReadU32LE, 0) { return g.writeReadUXX(b, n, "src", 32, "le") - } else if isInSrc(g.tm, n, t.KeySkip32, 1) { + } else if isInSrc(g.tm, n, t.IDSkip32, 1) { g.currFunk.usesScratch = true // TODO: don't hard-code [0], and allow recursive coroutines. scratchName := fmt.Sprintf("self->private_impl.%s%s[0].scratch", @@ -508,7 +508,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { g.currFunk.shortReads = append(g.currFunk.shortReads, "src") b.printf("%srptr_src += %s;\n", bPrefix, scratchName) - } else if isInDst(g.tm, n, t.KeyWriteU8, 1) { + } else if isInDst(g.tm, n, t.IDWriteU8, 1) { if !n.ProvenNotToSuspend() { b.printf("if (%swptr_dst == %swend_dst) { status = %sSUSPENSION_SHORT_WRITE;", bPrefix, bPrefix, g.PKGPREFIX) @@ -646,8 +646,8 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { } b.writes("if (status) { goto suspend; }\n") - } else if isThatMethod(g.tm, n, g.tm.ByName("decode").Key(), 2) || - isThatMethod(g.tm, n, g.tm.ByName("decode").Key(), 3) { + } else if isThatMethod(g.tm, n, g.tm.ByName("decode"), 2) || + isThatMethod(g.tm, n, g.tm.ByName("decode"), 3) { switch g.pkgName { case "gzip", "zlib": @@ -784,74 +784,74 @@ func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endia return nil } -func isInSrc(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { - callSuspendible := methodName != t.KeySinceMark && - methodName != t.KeyMark && - methodName != t.KeyLimit - if n.Operator().Key() != t.KeyOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { +func isInSrc(tm *t.Map, n *a.Expr, methodName t.ID, nArgs int) bool { + callSuspendible := methodName != t.IDSinceMark && + methodName != t.IDMark && + methodName != t.IDLimit + if n.Operator() != t.IDOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { return false } n = n.LHS().Expr() - if n.Operator().Key() != t.KeyDot || n.Ident().Key() != methodName { + if n.Operator() != t.IDDot || n.Ident() != methodName { return false } n = n.LHS().Expr() - if n.Operator().Key() != t.KeyDot || n.Ident() != tm.ByName("src") { + if n.Operator() != t.IDDot || n.Ident() != tm.ByName("src") { return false } n = n.LHS().Expr() - return n.Operator() == 0 && n.Ident().Key() == t.KeyIn + return n.Operator() == 0 && n.Ident() == t.IDIn } -func isInDst(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { - callSuspendible := methodName != t.KeyCopyFromReader32 && - methodName != t.KeyCopyFromHistory32 && - methodName != t.KeyCopyFromSlice32 && - methodName != t.KeyCopyFromSlice && - methodName != t.KeySinceMark && - methodName != t.KeyIsMarked && - methodName != t.KeyMark && - methodName != t.KeyLimit +func isInDst(tm *t.Map, n *a.Expr, methodName t.ID, nArgs int) bool { + callSuspendible := methodName != t.IDCopyFromReader32 && + methodName != t.IDCopyFromHistory32 && + methodName != t.IDCopyFromSlice32 && + methodName != t.IDCopyFromSlice && + methodName != t.IDSinceMark && + methodName != t.IDIsMarked && + methodName != t.IDMark && + methodName != t.IDLimit // TODO: check that n.Args() is "(x:bar)". - if n.Operator().Key() != t.KeyOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { + if n.Operator() != t.IDOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { return false } n = n.LHS().Expr() - if n.Operator().Key() != t.KeyDot || n.Ident().Key() != methodName { + if n.Operator() != t.IDDot || n.Ident() != methodName { return false } n = n.LHS().Expr() - if n.Operator().Key() != t.KeyDot || n.Ident() != tm.ByName("dst") { + if n.Operator() != t.IDDot || n.Ident() != tm.ByName("dst") { return false } n = n.LHS().Expr() - return n.Operator() == 0 && n.Ident().Key() == t.KeyIn + return n.Operator() == 0 && n.Ident() == t.IDIn } func isThisMethod(tm *t.Map, n *a.Expr, methodName string, nArgs int) bool { // TODO: check that n.Args() is "(src:in.src)". - if k := n.Operator().Key(); k != t.KeyOpenParen && k != t.KeyTry { + if k := n.Operator(); k != t.IDOpenParen && k != t.IDTry { return false } if len(n.Args()) != nArgs { return false } n = n.LHS().Expr() - if n.Operator().Key() != t.KeyDot || n.Ident() != tm.ByName(methodName) { + if n.Operator() != t.IDDot || n.Ident() != tm.ByName(methodName) { return false } n = n.LHS().Expr() - return n.Operator() == 0 && n.Ident().Key() == t.KeyThis + return n.Operator() == 0 && n.Ident() == t.IDThis } // isThatMethod is like isThisMethod but for foo.bar(etc), not this.bar(etc). -func isThatMethod(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { - if k := n.Operator().Key(); k != t.KeyOpenParen && k != t.KeyTry { +func isThatMethod(tm *t.Map, n *a.Expr, methodName t.ID, nArgs int) bool { + if k := n.Operator(); k != t.IDOpenParen && k != t.IDTry { return false } if len(n.Args()) != nArgs { return false } n = n.LHS().Expr() - return n.Operator().Key() == t.KeyDot && n.Ident().Key() == methodName + return n.Operator() == t.IDDot && n.Ident() == methodName } diff --git a/cmd/wuffs-c/internal/cgen/var.go b/cmd/wuffs-c/internal/cgen/var.go index a6ec35dc..e885d587 100644 --- a/cmd/wuffs-c/internal/cgen/var.go +++ b/cmd/wuffs-c/internal/cgen/var.go @@ -32,19 +32,19 @@ func (g *gen) needDerivedVar(name t.ID) bool { return nil } q := p.Expr() - if q.Operator().Key() != t.KeyOpenParen { + if q.Operator() != t.IDOpenParen { return nil } q = q.LHS().Expr() - if q.Operator().Key() != t.KeyDot { + if q.Operator() != t.IDDot { return nil } q = q.LHS().Expr() - if q.Operator().Key() != t.KeyDot || q.Ident() != name { + if q.Operator() != t.IDDot || q.Ident() != name { return nil } q = q.LHS().Expr() - if q.Operator() != 0 || q.Ident().Key() != t.KeyIn { + if q.Operator() != 0 || q.Ident() != t.IDIn { return nil } return errNeedDerivedVar @@ -220,7 +220,7 @@ func (g *gen) writeLoadExprDerivedVars(b *buffer, n *a.Expr) error { if g.currFunk.derivedVars == nil { return nil } - if k := n.Operator().Key(); k != t.KeyOpenParen && k != t.KeyTry { + if k := n.Operator(); k != t.IDOpenParen && k != t.IDTry { return nil } for _, o := range n.Args() { @@ -240,7 +240,7 @@ func (g *gen) writeSaveExprDerivedVars(b *buffer, n *a.Expr) error { if g.currFunk.derivedVars == nil { return nil } - if k := n.Operator().Key(); k != t.KeyOpenParen && k != t.KeyTry { + if k := n.Operator(); k != t.IDOpenParen && k != t.IDTry { return nil } for _, o := range n.Args() { @@ -305,14 +305,14 @@ func (g *gen) writeResumeSuspend1(b *buffer, n *a.Var, suspend bool, initBoolTyp } rhs := "" - switch typ.Decorator().Key() { + switch typ.Decorator() { case 0: if qid := typ.QID(); qid[0] == t.IDBase { - if key := qid[1].Key(); key < t.Key(len(cTypeNames)) { + if key := qid[1]; key < t.ID(len(cTypeNames)) { rhs = cTypeNames[key] } } - case t.KeySlice: + case t.IDSlice: // TODO: don't assume that the slice is a slice of base.u8. rhs = "wuffs_base__slice_u8" } @@ -358,11 +358,11 @@ func (g *gen) writeResumeSuspend1(b *buffer, n *a.Var, suspend bool, initBoolTyp lhs, rhs = rhs, lhs } - switch typ.Decorator().Key() { + switch typ.Decorator() { case 0: b.printf("%s = %s;\n", lhs, rhs) return nil - case t.KeyArray: + case t.IDArray: inner := typ.Inner() if inner.Decorator() != 0 { break @@ -371,8 +371,8 @@ func (g *gen) writeResumeSuspend1(b *buffer, n *a.Var, suspend bool, initBoolTyp if qid[0] != t.IDBase { break } - switch qid[1].Key() { - case t.KeyU8, t.KeyU16, t.KeyU32, t.KeyU64: + switch qid[1] { + case t.IDU8, t.IDU16, t.IDU32, t.IDU64: b.printf("memcpy(%s, %s, sizeof(%s));\n", lhs, rhs, local) return nil } diff --git a/lang/ast/ast.go b/lang/ast/ast.go index f88196d6..113ec033 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -263,15 +263,15 @@ func (n *Raw) SetPackage(tm *t.Map, pkg t.ID) error { // No-op. case KExpr: - switch o.id0.Key() { + switch o.id0 { default: return nil - case t.KeyError, t.KeyStatus, t.KeySuspension: + case t.IDError, t.IDStatus, t.IDSuspension: // No-op. } case KTypeExpr: - if o.id0.Key() != 0 { + if o.id0 != 0 { return nil } } @@ -664,17 +664,17 @@ func (n *TypeExpr) Innermost() *TypeExpr { } func (n *TypeExpr) Pointee() *TypeExpr { - for ; n != nil && n.id0.Key() == t.KeyPtr; n = n.Inner() { + for ; n != nil && n.id0 == t.IDPtr; n = n.Inner() { } return n } func (n *TypeExpr) IsBool() bool { - return n.id0 == 0 && n.id2.Key() == t.KeyBool + return n.id0 == 0 && n.id2 == t.IDBool } func (n *TypeExpr) IsIdeal() bool { - return n.id0 == 0 && n.id2.Key() == t.KeyDoubleZ + return n.id0 == 0 && n.id2 == t.IDDoubleZ } func (n *TypeExpr) IsNumType() bool { @@ -682,35 +682,35 @@ func (n *TypeExpr) IsNumType() bool { } func (n *TypeExpr) IsNumTypeOrIdeal() bool { - return n.id0 == 0 && (n.id2.IsNumType() || n.id2.Key() == t.KeyDoubleZ) + return n.id0 == 0 && (n.id2.IsNumType() || n.id2 == t.IDDoubleZ) } func (n *TypeExpr) IsRefined() bool { - return n.id0.Key() != t.KeyArray && (n.lhs != nil || n.mhs != nil) + return n.id0 != t.IDArray && (n.lhs != nil || n.mhs != nil) } func (n *TypeExpr) IsArrayType() bool { - return n.id0.Key() == t.KeyArray + return n.id0 == t.IDArray } func (n *TypeExpr) IsSliceType() bool { - return n.id0.Key() == t.KeySlice + return n.id0 == t.IDSlice } func (n *TypeExpr) IsUnsignedInteger() bool { - return n.id0 == 0 && (n.id2.Key() == t.KeyU8 || n.id2.Key() == t.KeyU16 || - n.id2.Key() == t.KeyU32 || n.id2.Key() == t.KeyU64) + return n.id0 == 0 && + (n.id2 == t.IDU8 || n.id2 == t.IDU16 || n.id2 == t.IDU32 || n.id2 == t.IDU64) } func (n *TypeExpr) HasPointers() bool { for ; n != nil; n = n.Inner() { - switch n.id0.Key() { + switch n.id0 { case 0: - switch n.id2.Key() { - case t.KeyIOReader, t.KeyIOWriter: + switch n.id2 { + case t.IDIOReader, t.IDIOWriter: return true } - case t.KeyPtr, t.KeyNptr, t.KeySlice: + case t.IDPtr, t.IDNptr, t.IDSlice: return true } } diff --git a/lang/ast/eq.go b/lang/ast/eq.go index 5faa891c..bfa60a79 100644 --- a/lang/ast/eq.go +++ b/lang/ast/eq.go @@ -46,7 +46,7 @@ func (n *Expr) Eq(o *Expr) bool { return false } - if n.id0.Key() == t.KeyXBinaryAs { + if n.id0 == t.IDXBinaryAs { if !n.rhs.TypeExpr().Eq(o.rhs.TypeExpr()) { return false } @@ -72,7 +72,7 @@ func (n *Expr) Mentions(o *Expr) bool { if n.Eq(o) || n.lhs.Expr().Mentions(o) || n.mhs.Expr().Mentions(o) || - (n.id0.Key() != t.KeyXBinaryAs && n.rhs.Expr().Mentions(o)) { + (n.id0 != t.IDXBinaryAs && n.rhs.Expr().Mentions(o)) { return true } for _, x := range n.list0 { diff --git a/lang/ast/string.go b/lang/ast/string.go index a12a5332..0905b4c6 100644 --- a/lang/ast/string.go +++ b/lang/ast/string.go @@ -42,7 +42,7 @@ func (n *Expr) appendStr(buf []byte, tm *t.Map, parenthesize bool, depth uint32) if n.id0.IsXOp() { switch { case n.id0.IsXUnaryOp(): - buf = append(buf, opStrings[0xFF&n.id0.Key()]...) + buf = append(buf, opStrings[0xFF&n.id0]...) buf = n.rhs.Expr().appendStr(buf, tm, true, depth) case n.id0.IsXBinaryOp(): @@ -50,8 +50,8 @@ func (n *Expr) appendStr(buf []byte, tm *t.Map, parenthesize bool, depth uint32) buf = append(buf, '(') } buf = n.lhs.Expr().appendStr(buf, tm, true, depth) - buf = append(buf, opStrings[0xFF&n.id0.Key()]...) - if n.id0.Key() == t.KeyXBinaryAs { + buf = append(buf, opStrings[0xFF&n.id0]...) + if n.id0 == t.IDXBinaryAs { buf = append(buf, n.rhs.TypeExpr().Str(tm)...) } else { buf = n.rhs.Expr().appendStr(buf, tm, true, depth) @@ -64,7 +64,7 @@ func (n *Expr) appendStr(buf []byte, tm *t.Map, parenthesize bool, depth uint32) if parenthesize { buf = append(buf, '(') } - op := opStrings[0xFF&n.id0.Key()] + op := opStrings[0xFF&n.id0] for i, o := range n.list0 { if i != 0 { buf = append(buf, op...) @@ -77,14 +77,14 @@ func (n *Expr) appendStr(buf []byte, tm *t.Map, parenthesize bool, depth uint32) } } else { - switch n.id0.Key() { - case t.KeyError, t.KeyStatus, t.KeySuspension: - switch n.id0.Key() { - case t.KeyError: + switch n.id0 { + case t.IDError, t.IDStatus, t.IDSuspension: + switch n.id0 { + case t.IDError: buf = append(buf, "error "...) - case t.KeyStatus: + case t.IDStatus: buf = append(buf, "status "...) - case t.KeySuspension: + case t.IDSuspension: buf = append(buf, "suspension "...) } if n.id1 != 0 { @@ -96,11 +96,11 @@ func (n *Expr) appendStr(buf []byte, tm *t.Map, parenthesize bool, depth uint32) case 0: buf = append(buf, tm.ByID(n.id2)...) - case t.KeyTry: + case t.IDTry: buf = append(buf, "try "...) fallthrough - case t.KeyOpenParen: + case t.IDOpenParen: buf = n.lhs.Expr().appendStr(buf, tm, true, depth) if n.flags&FlagsSuspendible != 0 { buf = append(buf, '?') @@ -118,13 +118,13 @@ func (n *Expr) appendStr(buf []byte, tm *t.Map, parenthesize bool, depth uint32) } buf = append(buf, ')') - case t.KeyOpenBracket: + case t.IDOpenBracket: buf = n.lhs.Expr().appendStr(buf, tm, true, depth) buf = append(buf, '[') buf = n.rhs.Expr().appendStr(buf, tm, false, depth) buf = append(buf, ']') - case t.KeyColon: + case t.IDColon: buf = n.lhs.Expr().appendStr(buf, tm, true, depth) buf = append(buf, '[') buf = n.mhs.Expr().appendStr(buf, tm, false, depth) @@ -132,12 +132,12 @@ func (n *Expr) appendStr(buf []byte, tm *t.Map, parenthesize bool, depth uint32) buf = n.rhs.Expr().appendStr(buf, tm, false, depth) buf = append(buf, ']') - case t.KeyDot: + case t.IDDot: buf = n.lhs.Expr().appendStr(buf, tm, true, depth) buf = append(buf, '.') buf = append(buf, tm.ByID(n.id2)...) - case t.KeyDollar: + case t.IDDollar: buf = append(buf, "$("...) for i, o := range n.list0 { if i != 0 { @@ -153,40 +153,40 @@ func (n *Expr) appendStr(buf []byte, tm *t.Map, parenthesize bool, depth uint32) } var opStrings = [256]string{ - t.KeyXUnaryPlus: "+", - t.KeyXUnaryMinus: "-", - t.KeyXUnaryNot: "not ", - t.KeyXUnaryRef: "ref ", - t.KeyXUnaryDeref: "deref ", + t.IDXUnaryPlus: "+", + t.IDXUnaryMinus: "-", + t.IDXUnaryNot: "not ", + t.IDXUnaryRef: "ref ", + t.IDXUnaryDeref: "deref ", - t.KeyXBinaryPlus: " + ", - t.KeyXBinaryMinus: " - ", - t.KeyXBinaryStar: " * ", - t.KeyXBinarySlash: " / ", - t.KeyXBinaryShiftL: " << ", - t.KeyXBinaryShiftR: " >> ", - t.KeyXBinaryAmp: " & ", - t.KeyXBinaryAmpHat: " &^ ", - t.KeyXBinaryPipe: " | ", - t.KeyXBinaryHat: " ^ ", - t.KeyXBinaryNotEq: " != ", - t.KeyXBinaryLessThan: " < ", - t.KeyXBinaryLessEq: " <= ", - t.KeyXBinaryEqEq: " == ", - t.KeyXBinaryGreaterEq: " >= ", - t.KeyXBinaryGreaterThan: " > ", - t.KeyXBinaryAnd: " and ", - t.KeyXBinaryOr: " or ", - t.KeyXBinaryAs: " as ", - t.KeyXBinaryTildePlus: " ~+ ", + t.IDXBinaryPlus: " + ", + t.IDXBinaryMinus: " - ", + t.IDXBinaryStar: " * ", + t.IDXBinarySlash: " / ", + t.IDXBinaryShiftL: " << ", + t.IDXBinaryShiftR: " >> ", + t.IDXBinaryAmp: " & ", + t.IDXBinaryAmpHat: " &^ ", + t.IDXBinaryPipe: " | ", + t.IDXBinaryHat: " ^ ", + t.IDXBinaryNotEq: " != ", + t.IDXBinaryLessThan: " < ", + t.IDXBinaryLessEq: " <= ", + t.IDXBinaryEqEq: " == ", + t.IDXBinaryGreaterEq: " >= ", + t.IDXBinaryGreaterThan: " > ", + t.IDXBinaryAnd: " and ", + t.IDXBinaryOr: " or ", + t.IDXBinaryAs: " as ", + t.IDXBinaryTildePlus: " ~+ ", - t.KeyXAssociativePlus: " + ", - t.KeyXAssociativeStar: " * ", - t.KeyXAssociativeAmp: " & ", - t.KeyXAssociativePipe: " | ", - t.KeyXAssociativeHat: " ^ ", - t.KeyXAssociativeAnd: " and ", - t.KeyXAssociativeOr: " or ", + t.IDXAssociativePlus: " + ", + t.IDXAssociativeStar: " * ", + t.IDXAssociativeAmp: " & ", + t.IDXAssociativePipe: " | ", + t.IDXAssociativeHat: " ^ ", + t.IDXAssociativeAnd: " and ", + t.IDXAssociativeOr: " or ", } // Str returns a string form of n. @@ -209,21 +209,21 @@ func (n *TypeExpr) appendStr(buf []byte, tm *t.Map, depth uint32) []byte { return append(buf, "!invalid_type!"...) } - switch n.Decorator().Key() { + switch n.Decorator() { case 0: buf = append(buf, n.QID().Str(tm)...) - case t.KeyPtr: + case t.IDPtr: buf = append(buf, "ptr "...) return n.Inner().appendStr(buf, tm, depth) - case t.KeyArray: + case t.IDArray: buf = append(buf, "array["...) buf = n.ArrayLength().appendStr(buf, tm, false, 0) buf = append(buf, "] "...) return n.Inner().appendStr(buf, tm, depth) - case t.KeySlice: + case t.IDSlice: buf = append(buf, "slice "...) return n.Inner().appendStr(buf, tm, depth) - case t.KeyOpenParen: + case t.IDOpenParen: buf = append(buf, "func "...) buf = n.Receiver().appendStr(buf, tm, depth) buf = append(buf, '.') diff --git a/lang/check/assert.go b/lang/check/assert.go index 10167eb9..f1f774c7 100644 --- a/lang/check/assert.go +++ b/lang/check/assert.go @@ -30,18 +30,18 @@ func otherHandSide(n *a.Expr, thisHS *a.Expr) (op t.ID, thatHS *a.Expr) { op = n.Operator() reverseOp := t.ID(0) - switch op.Key() { - case t.KeyXBinaryNotEq: + switch op { + case t.IDXBinaryNotEq: reverseOp = t.IDXBinaryNotEq - case t.KeyXBinaryLessThan: + case t.IDXBinaryLessThan: reverseOp = t.IDXBinaryGreaterThan - case t.KeyXBinaryLessEq: + case t.IDXBinaryLessEq: reverseOp = t.IDXBinaryGreaterEq - case t.KeyXBinaryEqEq: + case t.IDXBinaryEqEq: reverseOp = t.IDXBinaryEqEq - case t.KeyXBinaryGreaterEq: + case t.IDXBinaryGreaterEq: reverseOp = t.IDXBinaryLessEq - case t.KeyXBinaryGreaterThan: + case t.IDXBinaryGreaterThan: reverseOp = t.IDXBinaryLessThan } @@ -66,18 +66,18 @@ func (z *facts) appendFact(fact *a.Expr) { } } - switch fact.Operator().Key() { + switch fact.Operator() { case 0: for _, x := range *z { - if op, other := otherHandSide(x, fact); op.Key() == t.KeyXBinaryEqEq { + if op, other := otherHandSide(x, fact); op == t.IDXBinaryEqEq { z.appendFact(other) } } - case t.KeyXBinaryAnd: + case t.IDXBinaryAnd: z.appendFact(fact.LHS().Expr()) z.appendFact(fact.RHS().Expr()) return - case t.KeyXAssociativeAnd: + case t.IDXAssociativeAnd: for _, a := range fact.Args() { z.appendFact(a.Expr()) } @@ -124,8 +124,8 @@ func (z facts) refine(n *a.Expr, nMin *big.Int, nMax *big.Int, tm *t.Map) (*big. } originalNMin, originalNMax, changed := nMin, nMax, false - switch op.Key() { - case t.KeyXBinaryNotEq: + switch op { + case t.IDXBinaryNotEq: if nMin.Cmp(cv) == 0 { nMin = add1(nMin) changed = true @@ -133,25 +133,25 @@ func (z facts) refine(n *a.Expr, nMin *big.Int, nMax *big.Int, tm *t.Map) (*big. nMax = sub1(nMax) changed = true } - case t.KeyXBinaryLessThan: + case t.IDXBinaryLessThan: if nMax.Cmp(cv) >= 0 { nMax = sub1(cv) changed = true } - case t.KeyXBinaryLessEq: + case t.IDXBinaryLessEq: if nMax.Cmp(cv) > 0 { nMax = cv changed = true } - case t.KeyXBinaryEqEq: + case t.IDXBinaryEqEq: nMin, nMax = cv, cv changed = true - case t.KeyXBinaryGreaterEq: + case t.IDXBinaryGreaterEq: if nMin.Cmp(cv) < 0 { nMin = cv changed = true } - case t.KeyXBinaryGreaterThan: + case t.IDXBinaryGreaterThan: if nMin.Cmp(cv) <= 0 { nMin = add1(cv) changed = true @@ -188,15 +188,15 @@ func simplify(tm *t.Map, n *a.Expr) (*a.Expr, error) { } } - switch op.Key() { - case t.KeyXBinaryPlus: + switch op { + case t.IDXBinaryPlus: // TODO: more constant folding, so ((x + 1) + 1) becomes (x + 2). - case t.KeyXBinaryMinus: + case t.IDXBinaryMinus: if lhs.Eq(rhs) { return zeroExpr, nil } - if lOp, lLHS, lRHS := parseBinaryOp(lhs); lOp.Key() == t.KeyXBinaryPlus { + if lOp, lLHS, lRHS := parseBinaryOp(lhs); lOp == t.IDXBinaryPlus { if lLHS.Eq(rhs) { return lRHS, nil } @@ -205,8 +205,8 @@ func simplify(tm *t.Map, n *a.Expr) (*a.Expr, error) { } } - case t.KeyXBinaryNotEq, t.KeyXBinaryLessThan, t.KeyXBinaryLessEq, - t.KeyXBinaryEqEq, t.KeyXBinaryGreaterEq, t.KeyXBinaryGreaterThan: + case t.IDXBinaryNotEq, t.IDXBinaryLessThan, t.IDXBinaryLessEq, + t.IDXBinaryEqEq, t.IDXBinaryGreaterEq, t.IDXBinaryGreaterThan: l, err := simplify(tm, lhs) if err != nil { @@ -243,31 +243,31 @@ func parseBinaryOp(n *a.Expr) (op t.ID, lhs *a.Expr, rhs *a.Expr) { return 0, nil, nil } op = n.Operator() - if op.Key() == t.KeyAs { + if op == t.IDAs { return 0, nil, nil } return op, n.LHS().Expr(), n.RHS().Expr() } -func proveBinaryOpConstValues(op t.Key, lMin *big.Int, lMax *big.Int, rMin *big.Int, rMax *big.Int) (ok bool) { +func proveBinaryOpConstValues(op t.ID, lMin *big.Int, lMax *big.Int, rMin *big.Int, rMax *big.Int) (ok bool) { switch op { - case t.KeyXBinaryNotEq: + case t.IDXBinaryNotEq: return lMax.Cmp(rMin) < 0 || lMin.Cmp(rMax) > 0 - case t.KeyXBinaryLessThan: + case t.IDXBinaryLessThan: return lMax.Cmp(rMin) < 0 - case t.KeyXBinaryLessEq: + case t.IDXBinaryLessEq: return lMax.Cmp(rMin) <= 0 - case t.KeyXBinaryEqEq: + case t.IDXBinaryEqEq: return lMin.Cmp(rMax) == 0 && lMax.Cmp(rMin) == 0 - case t.KeyXBinaryGreaterEq: + case t.IDXBinaryGreaterEq: return lMin.Cmp(rMax) >= 0 - case t.KeyXBinaryGreaterThan: + case t.IDXBinaryGreaterThan: return lMin.Cmp(rMax) > 0 } return false } -func (q *checker) proveBinaryOp(op t.Key, lhs *a.Expr, rhs *a.Expr) error { +func (q *checker) proveBinaryOp(op t.ID, lhs *a.Expr, rhs *a.Expr) error { lcv := lhs.ConstValue() if lcv != nil { rMin, rMax, err := q.bcheckExpr(rhs, 0) @@ -293,25 +293,25 @@ func (q *checker) proveBinaryOp(op t.Key, lhs *a.Expr, rhs *a.Expr) error { if !x.LHS().Expr().Eq(lhs) { continue } - factOp := x.Operator().Key() + factOp := x.Operator() if opImpliesOp(factOp, op) && x.RHS().Expr().Eq(rhs) { return nil } - if factOp == t.KeyXBinaryEqEq && rcv != nil { + if factOp == t.IDXBinaryEqEq && rcv != nil { if factCV := x.RHS().Expr().ConstValue(); factCV != nil { switch op { - case t.KeyXBinaryNotEq: + case t.IDXBinaryNotEq: return errFailedOrNil(factCV.Cmp(rcv) != 0) - case t.KeyXBinaryLessThan: + case t.IDXBinaryLessThan: return errFailedOrNil(factCV.Cmp(rcv) < 0) - case t.KeyXBinaryLessEq: + case t.IDXBinaryLessEq: return errFailedOrNil(factCV.Cmp(rcv) <= 0) - case t.KeyXBinaryEqEq: + case t.IDXBinaryEqEq: return errFailedOrNil(factCV.Cmp(rcv) == 0) - case t.KeyXBinaryGreaterEq: + case t.IDXBinaryGreaterEq: return errFailedOrNil(factCV.Cmp(rcv) >= 0) - case t.KeyXBinaryGreaterThan: + case t.IDXBinaryGreaterThan: return errFailedOrNil(factCV.Cmp(rcv) > 0) } } @@ -322,15 +322,15 @@ func (q *checker) proveBinaryOp(op t.Key, lhs *a.Expr, rhs *a.Expr) error { // opImpliesOp returns whether the first op implies the second. For example, // knowing "x < y" implies that "x != y" and "x <= y". -func opImpliesOp(op0 t.Key, op1 t.Key) bool { +func opImpliesOp(op0 t.ID, op1 t.ID) bool { if op0 == op1 { return true } switch op0 { - case t.KeyXBinaryLessThan: - return op1 == t.KeyXBinaryNotEq || op1 == t.KeyXBinaryLessEq - case t.KeyXBinaryGreaterThan: - return op1 == t.KeyXBinaryNotEq || op1 == t.KeyXBinaryGreaterEq + case t.IDXBinaryLessThan: + return op1 == t.IDXBinaryNotEq || op1 == t.IDXBinaryLessEq + case t.IDXBinaryGreaterThan: + return op1 == t.IDXBinaryNotEq || op1 == t.IDXBinaryGreaterEq } return false } @@ -347,9 +347,9 @@ var errFailed = errors.New("failed") func proveReasonRequirement(q *checker, op t.ID, lhs *a.Expr, rhs *a.Expr) error { if !op.IsXBinaryOp() { return fmt.Errorf( - "check: internal error: proveReasonRequirement token.Key (0x%02X) is not an XBinaryOp", op.Key()) + "check: internal error: proveReasonRequirement token (0x%02X) is not an XBinaryOp", op) } - if err := q.proveBinaryOp(op.Key(), lhs, rhs); err != nil { + if err := q.proveBinaryOp(op, lhs, rhs); err != nil { n := a.NewExpr(a.FlagsTypeChecked, op, 0, 0, lhs.Node(), nil, rhs.Node(), nil) return fmt.Errorf("cannot prove %q: %v", n.Str(q.tm), err) } diff --git a/lang/check/bounds.go b/lang/check/bounds.go index e99f0730..4a5f374e 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -23,15 +23,15 @@ import ( ) var numTypeBounds = [256][2]*big.Int{ - t.KeyI8: {big.NewInt(-1 << 7), big.NewInt(1<<7 - 1)}, - t.KeyI16: {big.NewInt(-1 << 15), big.NewInt(1<<15 - 1)}, - t.KeyI32: {big.NewInt(-1 << 31), big.NewInt(1<<31 - 1)}, - t.KeyI64: {big.NewInt(-1 << 63), big.NewInt(1<<63 - 1)}, - t.KeyU8: {zero, big.NewInt(0).SetUint64(1<<8 - 1)}, - t.KeyU16: {zero, big.NewInt(0).SetUint64(1<<16 - 1)}, - t.KeyU32: {zero, big.NewInt(0).SetUint64(1<<32 - 1)}, - t.KeyU64: {zero, big.NewInt(0).SetUint64(1<<64 - 1)}, - t.KeyBool: {zero, one}, + t.IDI8: {big.NewInt(-1 << 7), big.NewInt(1<<7 - 1)}, + t.IDI16: {big.NewInt(-1 << 15), big.NewInt(1<<15 - 1)}, + t.IDI32: {big.NewInt(-1 << 31), big.NewInt(1<<31 - 1)}, + t.IDI64: {big.NewInt(-1 << 63), big.NewInt(1<<63 - 1)}, + t.IDU8: {zero, big.NewInt(0).SetUint64(1<<8 - 1)}, + t.IDU16: {zero, big.NewInt(0).SetUint64(1<<16 - 1)}, + t.IDU32: {zero, big.NewInt(0).SetUint64(1<<32 - 1)}, + t.IDU64: {zero, big.NewInt(0).SetUint64(1<<64 - 1)}, + t.IDBool: {zero, one}, } var ( @@ -95,13 +95,13 @@ func bitMask(nBits int) *big.Int { case 1: return one case 8: - return numTypeBounds[t.KeyU8][1] + return numTypeBounds[t.IDU8][1] case 16: - return numTypeBounds[t.KeyU16][1] + return numTypeBounds[t.IDU16][1] case 32: - return numTypeBounds[t.KeyU32][1] + return numTypeBounds[t.IDU32][1] case 64: - return numTypeBounds[t.KeyU64][1] + return numTypeBounds[t.IDU64][1] } z := big.NewInt(0).Lsh(one, uint(nBits)) return z.Sub(z, one) @@ -115,22 +115,22 @@ func invert(tm *t.Map, n *a.Expr) (*a.Expr, error) { return nil, fmt.Errorf("check: invert(%q) called on constant expression", n.Str(tm)) } op, lhs, rhs, args := n.Operator(), n.LHS().Expr(), n.RHS().Expr(), []*a.Node(nil) - switch op.Key() { - case t.KeyXUnaryNot: + switch op { + case t.IDXUnaryNot: return rhs, nil - case t.KeyXBinaryNotEq: + case t.IDXBinaryNotEq: op = t.IDXBinaryEqEq - case t.KeyXBinaryLessThan: + case t.IDXBinaryLessThan: op = t.IDXBinaryGreaterEq - case t.KeyXBinaryLessEq: + case t.IDXBinaryLessEq: op = t.IDXBinaryGreaterThan - case t.KeyXBinaryEqEq: + case t.IDXBinaryEqEq: op = t.IDXBinaryNotEq - case t.KeyXBinaryGreaterEq: + case t.IDXBinaryGreaterEq: op = t.IDXBinaryLessThan - case t.KeyXBinaryGreaterThan: + case t.IDXBinaryGreaterThan: op = t.IDXBinaryLessEq - case t.KeyXBinaryAnd, t.KeyXBinaryOr: + case t.IDXBinaryAnd, t.IDXBinaryOr: var err error lhs, err = invert(tm, lhs) if err != nil { @@ -140,12 +140,12 @@ func invert(tm *t.Map, n *a.Expr) (*a.Expr, error) { if err != nil { return nil, err } - if op.Key() == t.KeyXBinaryAnd { + if op == t.IDXBinaryAnd { op = t.IDXBinaryOr } else { op = t.IDXBinaryAnd } - case t.KeyXAssociativeAnd, t.KeyXAssociativeOr: + case t.IDXAssociativeAnd, t.IDXAssociativeOr: args = make([]*a.Node, 0, len(n.Args())) for _, a := range n.Args() { v, err := invert(tm, a.Expr()) @@ -154,7 +154,7 @@ func invert(tm *t.Map, n *a.Expr) (*a.Expr, error) { } args = append(args, v.Node()) } - if op.Key() == t.KeyXAssociativeAnd { + if op == t.IDXAssociativeAnd { op = t.IDXAssociativeOr } else { op = t.IDXAssociativeAnd @@ -170,8 +170,8 @@ func invert(tm *t.Map, n *a.Expr) (*a.Expr, error) { func typeBounds(tm *t.Map, typ *a.TypeExpr) (*big.Int, *big.Int, error) { b := [2]*big.Int{} if typ.Decorator() == 0 { - if qid := typ.QID(); qid[0] == t.IDBase && qid[1].Key() < t.Key(len(numTypeBounds)) { - b = numTypeBounds[qid[1].Key()] + if qid := typ.QID(); qid[0] == t.IDBase && qid[1] < t.ID(len(numTypeBounds)) { + b = numTypeBounds[qid[1]] } } if b[0] == nil || b[1] == nil { @@ -228,7 +228,7 @@ loop: case a.KJump: break loop case a.KRet: - if o.Ret().Keyword().Key() == t.KeyReturn { + if o.Ret().Keyword() == t.IDReturn { break loop } // o is a yield statement. @@ -280,12 +280,12 @@ func (q *checker) bcheckStatement(n *a.Node) error { case a.KJump: n := n.Jump() - skip := t.KeyPost - if n.Keyword().Key() == t.KeyBreak { - skip = t.KeyPre + skip := t.IDPost + if n.Keyword() == t.IDBreak { + skip = t.IDPre } for _, o := range n.JumpTarget().Asserts() { - if o.Assert().Keyword().Key() == skip { + if o.Assert().Keyword() == skip { continue } if err := q.bcheckAssert(o.Assert()); err != nil { @@ -343,13 +343,13 @@ func (q *checker) bcheckAssert(n *a.Assert) error { err = nil } } else if reasonID := n.Reason(); reasonID != 0 { - if reasonFunc := q.reasonMap[reasonID.Key()]; reasonFunc != nil { + if reasonFunc := q.reasonMap[reasonID]; reasonFunc != nil { err = reasonFunc(q, n) } else { err = fmt.Errorf("no such reason %s", reasonID.Str(q.tm)) } - } else if condition.Operator().IsBinaryOp() && condition.Operator().Key() != t.KeyAs { - err = q.proveBinaryOp(condition.Operator().Key(), condition.LHS().Expr(), condition.RHS().Expr()) + } else if condition.Operator().IsBinaryOp() && condition.Operator() != t.IDAs { + err = q.proveBinaryOp(condition.Operator(), condition.LHS().Expr(), condition.RHS().Expr()) } if err != nil { @@ -400,8 +400,8 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { if xRHS.Mentions(lhs) { return nil, nil } - switch op.Key() { - case t.KeyPlusEq, t.KeyMinusEq: + switch op { + case t.IDPlusEq, t.IDMinusEq: oRHS := a.NewExpr(a.FlagsTypeChecked, op.BinaryForm(), 0, 0, xRHS.Node(), nil, rhs.Node(), nil) oRHS.SetMType(xRHS.MType()) oRHS, err := simplify(q.tm, oRHS) @@ -435,14 +435,14 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { } func (q *checker) bcheckAssignment1(lhs *a.Expr, op t.ID, rhs *a.Expr) error { - switch lhs.MType().Decorator().Key() { - case t.KeyPtr: + switch lhs.MType().Decorator() { + case t.IDPtr: // TODO: handle. return nil - case t.KeyArray: + case t.IDArray: // TODO: handle. return nil - // TODO: t.KeySlice? + // TODO: t.IDSlice? } _, _, err := q.bcheckExpr(lhs, 0) @@ -454,7 +454,7 @@ func (q *checker) bcheckAssignment1(lhs *a.Expr, op t.ID, rhs *a.Expr) error { func (q *checker) bcheckAssignment2(lhs *a.Expr, lTyp *a.TypeExpr, op t.ID, rhs *a.Expr) error { if lhs == nil && op != t.IDEq { - return fmt.Errorf("check: internal error: missing LHS for op key 0x%02X", op.Key()) + return fmt.Errorf("check: internal error: missing LHS for op key 0x%02X", op) } lMin, lMax, err := q.bcheckTypeExpr(lTyp) @@ -472,7 +472,7 @@ func (q *checker) bcheckAssignment2(lhs *a.Expr, lTyp *a.TypeExpr, op t.ID, rhs } rMin, rMax, err = q.bcheckExpr(rhs, 0) } else { - rMin, rMax, err = q.bcheckExprBinaryOp(op.BinaryForm().Key(), lhs, rhs, 0) + rMin, rMax, err = q.bcheckExprBinaryOp(op.BinaryForm(), lhs, rhs, 0) } if err != nil { return err @@ -521,7 +521,7 @@ func terminates(body []*a.Node) bool { case a.KJump: return true case a.KRet: - return n.Ret().Keyword().Key() == t.KeyReturn + return n.Ret().Keyword() == t.IDReturn } return false } @@ -612,7 +612,7 @@ func (q *checker) bcheckIf(n *a.If) error { func (q *checker) bcheckWhile(n *a.While) error { // Check the pre and inv conditions on entry. for _, o := range n.Asserts() { - if o.Assert().Keyword().Key() == t.KeyPost { + if o.Assert().Keyword() == t.IDPost { continue } if err := q.bcheckAssert(o.Assert()); err != nil { @@ -641,7 +641,7 @@ func (q *checker) bcheckWhile(n *a.While) error { } else { q.facts = q.facts[:0] for _, o := range n.Asserts() { - if o.Assert().Keyword().Key() == t.KeyPost { + if o.Assert().Keyword() == t.IDPost { continue } q.facts.appendFact(o.Assert().Condition()) @@ -652,7 +652,7 @@ func (q *checker) bcheckWhile(n *a.While) error { q.facts.appendFact(inverse) } for _, o := range n.Asserts() { - if o.Assert().Keyword().Key() == t.KeyPost { + if o.Assert().Keyword() == t.IDPost { if err := q.bcheckAssert(o.Assert()); err != nil { return err } @@ -667,7 +667,7 @@ func (q *checker) bcheckWhile(n *a.While) error { // Assume the pre and inv conditions... q.facts = q.facts[:0] for _, o := range n.Asserts() { - if o.Assert().Keyword().Key() == t.KeyPost { + if o.Assert().Keyword() == t.IDPost { continue } q.facts.appendFact(o.Assert().Condition()) @@ -684,7 +684,7 @@ func (q *checker) bcheckWhile(n *a.While) error { // body. if !terminates(n.Body()) { for _, o := range n.Asserts() { - if o.Assert().Keyword().Key() == t.KeyPost { + if o.Assert().Keyword() == t.IDPost { continue } if err := q.bcheckAssert(o.Assert()); err != nil { @@ -697,7 +697,7 @@ func (q *checker) bcheckWhile(n *a.While) error { // Assume the inv and post conditions. q.facts = q.facts[:0] for _, o := range n.Asserts() { - if o.Assert().Keyword().Key() == t.KeyPre { + if o.Assert().Keyword() == t.IDPre { continue } q.facts.appendFact(o.Assert().Condition()) @@ -759,10 +759,10 @@ func (q *checker) bcheckExpr1(n *a.Expr, depth uint32) (*big.Int, *big.Int, erro case op.IsXUnaryOp(): return q.bcheckExprUnaryOp(n, depth) case op.IsXBinaryOp(): - if op.Key() == t.KeyXBinaryAs { + if op == t.IDXBinaryAs { return q.bcheckExpr(n.LHS().Expr(), depth) } - return q.bcheckExprBinaryOp(op.Key(), n.LHS().Expr(), n.RHS().Expr(), depth) + return q.bcheckExprBinaryOp(op, n.LHS().Expr(), n.RHS().Expr(), depth) case op.IsXAssociativeOp(): return q.bcheckExprAssociativeOp(n, depth) } @@ -771,7 +771,7 @@ func (q *checker) bcheckExpr1(n *a.Expr, depth uint32) (*big.Int, *big.Int, erro } func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, error) { - switch n.Operator().Key() { + switch n.Operator() { case 0: // Look for named consts. // @@ -785,23 +785,23 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, } } - case t.KeyOpenParen, t.KeyTry: + case t.IDOpenParen, t.IDTry: if _, _, err := q.bcheckExpr(n.LHS().Expr(), depth); err != nil { return nil, nil, err } // TODO: delete this hack that only matches "in.src.read_u8?()" etc. - if isInSrc(q.tm, n, t.KeyReadU8, 0) || isInSrc(q.tm, n, t.KeyUnreadU8, 0) || - isInSrc(q.tm, n, t.KeyReadU16BE, 0) || isInSrc(q.tm, n, t.KeyReadU32BE, 0) || - isInSrc(q.tm, n, t.KeyReadU32BE, 0) || isInSrc(q.tm, n, t.KeyReadU32LE, 0) || - isInSrc(q.tm, n, t.KeySkip32, 1) || isInSrc(q.tm, n, t.KeySinceMark, 0) || - isInSrc(q.tm, n, t.KeyMark, 0) || isInSrc(q.tm, n, t.KeyLimit, 1) || - isInDst(q.tm, n, t.KeyCopyFromSlice, 1) || isInDst(q.tm, n, t.KeyCopyFromSlice32, 2) || - isInDst(q.tm, n, t.KeyCopyFromReader32, 2) || isInDst(q.tm, n, t.KeyCopyFromHistory32, 2) || - isInDst(q.tm, n, t.KeyWriteU8, 1) || isInDst(q.tm, n, t.KeySinceMark, 0) || - isInDst(q.tm, n, t.KeyMark, 0) || isInDst(q.tm, n, t.KeyIsMarked, 0) || - isThatMethod(q.tm, n, t.KeyMark, 0) || isThatMethod(q.tm, n, t.KeyLimit, 1) || - isThatMethod(q.tm, n, t.KeySinceMark, 0) { + if isInSrc(q.tm, n, t.IDReadU8, 0) || isInSrc(q.tm, n, t.IDUnreadU8, 0) || + isInSrc(q.tm, n, t.IDReadU16BE, 0) || isInSrc(q.tm, n, t.IDReadU32BE, 0) || + isInSrc(q.tm, n, t.IDReadU32BE, 0) || isInSrc(q.tm, n, t.IDReadU32LE, 0) || + isInSrc(q.tm, n, t.IDSkip32, 1) || isInSrc(q.tm, n, t.IDSinceMark, 0) || + isInSrc(q.tm, n, t.IDMark, 0) || isInSrc(q.tm, n, t.IDLimit, 1) || + isInDst(q.tm, n, t.IDCopyFromSlice, 1) || isInDst(q.tm, n, t.IDCopyFromSlice32, 2) || + isInDst(q.tm, n, t.IDCopyFromReader32, 2) || isInDst(q.tm, n, t.IDCopyFromHistory32, 2) || + isInDst(q.tm, n, t.IDWriteU8, 1) || isInDst(q.tm, n, t.IDSinceMark, 0) || + isInDst(q.tm, n, t.IDMark, 0) || isInDst(q.tm, n, t.IDIsMarked, 0) || + isThatMethod(q.tm, n, t.IDMark, 0) || isThatMethod(q.tm, n, t.IDLimit, 1) || + isThatMethod(q.tm, n, t.IDSinceMark, 0) { for _, o := range n.Args() { a := o.Arg().Value() @@ -818,7 +818,7 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, break } // TODO: delete this hack that only matches "foo.bar_bits(etc)". - if isThatMethod(q.tm, n, t.KeyLowBits, 1) || isThatMethod(q.tm, n, t.KeyHighBits, 1) { + if isThatMethod(q.tm, n, t.IDLowBits, 1) || isThatMethod(q.tm, n, t.IDHighBits, 1) { a := n.Args()[0].Arg().Value() aMin, aMax, err := q.bcheckExpr(a, depth) if err != nil { @@ -836,13 +836,13 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, return zero, bitMask(int(aMax.Int64())), nil } // TODO: delete this hack that only matches "foo.is_suspension(etc)". - if isThatMethod(q.tm, n, t.KeyIsError, 0) || isThatMethod(q.tm, n, t.KeyIsOK, 0) || - isThatMethod(q.tm, n, t.KeyIsSuspension, 0) || isThatMethod(q.tm, n, t.KeySuffix, 1) { + if isThatMethod(q.tm, n, t.IDIsError, 0) || isThatMethod(q.tm, n, t.IDIsOK, 0) || + isThatMethod(q.tm, n, t.IDIsSuspension, 0) || isThatMethod(q.tm, n, t.IDSuffix, 1) { // TODO: should return be break? Ditto below. return nil, nil, nil } // TODO: delete this hack that only matches "foo.set_literal_width(etc)". - if isThatMethod(q.tm, n, q.tm.ByName("set_literal_width").Key(), 1) { + if isThatMethod(q.tm, n, q.tm.ByName("set_literal_width"), 1) { a := n.Args()[0].Arg().Value() aMin, aMax, err := q.bcheckExpr(a, depth) if err != nil { @@ -854,10 +854,10 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, return nil, nil, nil } // TODO: delete this hack that only matches "foo.decode(etc)". - if isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 2) || - isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 3) || - isThatMethod(q.tm, n, t.KeyCopyFromSlice, 1) || - isThatMethod(q.tm, n, q.tm.ByName("update").Key(), 1) { + if isThatMethod(q.tm, n, q.tm.ByName("decode"), 2) || + isThatMethod(q.tm, n, q.tm.ByName("decode"), 3) || + isThatMethod(q.tm, n, t.IDCopyFromSlice, 1) || + isThatMethod(q.tm, n, q.tm.ByName("update"), 1) { for _, o := range n.Args() { a := o.Arg().Value() aMin, aMax, err := q.bcheckExpr(a, depth) @@ -871,7 +871,7 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, return nil, nil, nil } // TODO: delete this hack that only matches "foo.length(etc)". - if isThatMethod(q.tm, n, t.KeyLength, 0) || isThatMethod(q.tm, n, t.KeyAvailable, 0) { + if isThatMethod(q.tm, n, t.IDLength, 0) || isThatMethod(q.tm, n, t.IDAvailable, 0) { break } @@ -879,7 +879,7 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, return nil, nil, err } - case t.KeyOpenBracket: + case t.IDOpenBracket: lhs := n.LHS().Expr() if _, _, err := q.bcheckExpr(lhs, depth); err != nil { return nil, nil, err @@ -903,7 +903,7 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, return nil, nil, err } - case t.KeyColon: + case t.IDColon: lhs := n.LHS().Expr() mhs := n.MHS().Expr() rhs := n.RHS().Expr() @@ -940,9 +940,9 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, } return nil, nil, nil - case t.KeyDot: + case t.IDDot: // TODO: delete this hack that only matches "in". - if n.LHS().Expr().Ident().Key() == t.KeyIn { + if n.LHS().Expr().Ident() == t.IDIn { for _, o := range q.astFunc.In().Fields() { o := o.Field() if o.Name() == n.Ident() { @@ -958,11 +958,11 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, return nil, nil, err } - case t.KeyError, t.KeyStatus, t.KeySuspension: + case t.IDError, t.IDStatus, t.IDSuspension: // No-op. default: - return nil, nil, fmt.Errorf("check: unrecognized token.Key (0x%X) for bcheckExprOther", n.Operator().Key()) + return nil, nil, fmt.Errorf("check: unrecognized token (0x%X) for bcheckExprOther", n.Operator()) } return q.bcheckTypeExpr(n.MType()) } @@ -999,21 +999,21 @@ func (q *checker) bcheckExprUnaryOp(n *a.Expr, depth uint32) (*big.Int, *big.Int return nil, nil, err } - switch n.Operator().Key() { - case t.KeyXUnaryPlus: + switch n.Operator() { + case t.IDXUnaryPlus: return rMin, rMax, nil - case t.KeyXUnaryMinus: + case t.IDXUnaryMinus: return neg(rMax), neg(rMin), nil - case t.KeyXUnaryNot: + case t.IDXUnaryNot: return zero, one, nil - case t.KeyXUnaryRef, t.KeyXUnaryDeref: + case t.IDXUnaryRef, t.IDXUnaryDeref: return q.bcheckTypeExpr(n.MType()) } - return nil, nil, fmt.Errorf("check: unrecognized token.Key (0x%X) for bcheckExprUnaryOp", n.Operator().Key()) + return nil, nil, fmt.Errorf("check: unrecognized token (0x%X) for bcheckExprUnaryOp", n.Operator()) } -func (q *checker) bcheckExprBinaryOp(op t.Key, lhs *a.Expr, rhs *a.Expr, depth uint32) (*big.Int, *big.Int, error) { +func (q *checker) bcheckExprBinaryOp(op t.ID, lhs *a.Expr, rhs *a.Expr, depth uint32) (*big.Int, *big.Int, error) { lMin, lMax, err := q.bcheckExpr(lhs, depth) if err != nil { return nil, nil, err @@ -1021,17 +1021,17 @@ func (q *checker) bcheckExprBinaryOp(op t.Key, lhs *a.Expr, rhs *a.Expr, depth u return q.bcheckExprBinaryOp1(op, lhs, lMin, lMax, rhs, depth) } -func (q *checker) bcheckExprBinaryOp1(op t.Key, lhs *a.Expr, lMin *big.Int, lMax *big.Int, rhs *a.Expr, depth uint32) (*big.Int, *big.Int, error) { +func (q *checker) bcheckExprBinaryOp1(op t.ID, lhs *a.Expr, lMin *big.Int, lMax *big.Int, rhs *a.Expr, depth uint32) (*big.Int, *big.Int, error) { rMin, rMax, err := q.bcheckExpr(rhs, depth) if err != nil { return nil, nil, err } switch op { - case t.KeyXBinaryPlus: + case t.IDXBinaryPlus: return big.NewInt(0).Add(lMin, rMin), big.NewInt(0).Add(lMax, rMax), nil - case t.KeyXBinaryMinus: + case t.IDXBinaryMinus: nMin := big.NewInt(0).Sub(lMin, rMax) nMax := big.NewInt(0).Sub(lMax, rMin) for _, x := range q.facts { @@ -1039,20 +1039,20 @@ func (q *checker) bcheckExprBinaryOp1(op t.Key, lhs *a.Expr, lMin *big.Int, lMax if !lhs.Eq(xLHS) || !rhs.Eq(xRHS) { continue } - switch xOp.Key() { - case t.KeyXBinaryLessThan: + switch xOp { + case t.IDXBinaryLessThan: nMax = min(nMax, minusOne) - case t.KeyXBinaryLessEq: + case t.IDXBinaryLessEq: nMax = min(nMax, zero) - case t.KeyXBinaryGreaterEq: + case t.IDXBinaryGreaterEq: nMin = max(nMin, zero) - case t.KeyXBinaryGreaterThan: + case t.IDXBinaryGreaterThan: nMin = max(nMin, one) } } return nMin, nMax, nil - case t.KeyXBinaryStar: + case t.IDXBinaryStar: // TODO: handle multiplication by negative numbers. Note that this // might reverse the inequality: if 0 < a < b but c < 0 then a*c > b*c. if lMin.Sign() < 0 { @@ -1063,10 +1063,10 @@ func (q *checker) bcheckExprBinaryOp1(op t.Key, lhs *a.Expr, lMin *big.Int, lMax } return big.NewInt(0).Mul(lMin, rMin), big.NewInt(0).Mul(lMax, rMax), nil - case t.KeyXBinarySlash: + case t.IDXBinarySlash: // TODO. - case t.KeyXBinaryShiftL: + case t.IDXBinaryShiftL: if lMin.Sign() < 0 { return nil, nil, fmt.Errorf("check: shift op argument %q is possibly negative", lhs.Str(q.tm)) } @@ -1078,7 +1078,7 @@ func (q *checker) bcheckExprBinaryOp1(op t.Key, lhs *a.Expr, lMin *big.Int, lMax } return big.NewInt(0).Lsh(lMin, uint(rMin.Uint64())), big.NewInt(0).Lsh(lMax, uint(rMax.Uint64())), nil - case t.KeyXBinaryShiftR: + case t.IDXBinaryShiftR: if lMin.Sign() < 0 { return nil, nil, fmt.Errorf("check: shift op argument %q is possibly negative", lhs.Str(q.tm)) } @@ -1094,36 +1094,36 @@ func (q *checker) bcheckExprBinaryOp1(op t.Key, lhs *a.Expr, lMin *big.Int, lMax } return big.NewInt(0).Rsh(lMin, uint(rMax.Uint64())), nMax, nil - case t.KeyXBinaryAmp, t.KeyXBinaryPipe, t.KeyXBinaryHat: + case t.IDXBinaryAmp, t.IDXBinaryPipe, t.IDXBinaryHat: // TODO: should type-checking ensure that bitwise ops only apply to // *unsigned* integer types? if lMin.Sign() < 0 { return nil, nil, fmt.Errorf("check: bitwise op argument %q is possibly negative", lhs.Str(q.tm)) } - if lMax.Cmp(numTypeBounds[t.KeyU64][1]) > 0 { + if lMax.Cmp(numTypeBounds[t.IDU64][1]) > 0 { return nil, nil, fmt.Errorf("check: bitwise op argument %q is possibly too large", lhs.Str(q.tm)) } if rMin.Sign() < 0 { return nil, nil, fmt.Errorf("check: bitwise op argument %q is possibly negative", rhs.Str(q.tm)) } - if rMax.Cmp(numTypeBounds[t.KeyU64][1]) > 0 { + if rMax.Cmp(numTypeBounds[t.IDU64][1]) > 0 { return nil, nil, fmt.Errorf("check: bitwise op argument %q is possibly too large", rhs.Str(q.tm)) } z := (*big.Int)(nil) switch op { - case t.KeyXBinaryAmp: + case t.IDXBinaryAmp: z = min(lMax, rMax) - case t.KeyXBinaryPipe, t.KeyXBinaryHat: + case t.IDXBinaryPipe, t.IDXBinaryHat: z = max(lMax, rMax) } // Return [0, z rounded up to the next power-of-2-minus-1]. This is // conservative, but works fine in practice. return zero, bitMask(z.BitLen()), nil - case t.KeyXBinaryAmpHat: + case t.IDXBinaryAmpHat: // TODO. - case t.KeyXBinaryPercent: + case t.IDXBinaryPercent: if lMin.Sign() < 0 { return nil, nil, fmt.Errorf("check: modulus op argument %q is possibly negative", lhs.Str(q.tm)) } @@ -1132,31 +1132,31 @@ func (q *checker) bcheckExprBinaryOp1(op t.Key, lhs *a.Expr, lMin *big.Int, lMax } return zero, big.NewInt(0).Sub(rMax, one), nil - case t.KeyXBinaryNotEq, t.KeyXBinaryLessThan, t.KeyXBinaryLessEq, t.KeyXBinaryEqEq, - t.KeyXBinaryGreaterEq, t.KeyXBinaryGreaterThan, t.KeyXBinaryAnd, t.KeyXBinaryOr: + case t.IDXBinaryNotEq, t.IDXBinaryLessThan, t.IDXBinaryLessEq, t.IDXBinaryEqEq, + t.IDXBinaryGreaterEq, t.IDXBinaryGreaterThan, t.IDXBinaryAnd, t.IDXBinaryOr: return zero, one, nil - case t.KeyXBinaryAs: + case t.IDXBinaryAs: // Unreachable, as this is checked by the caller. - case t.KeyXBinaryTildePlus: + case t.IDXBinaryTildePlus: typ := lhs.MType() if typ.IsIdeal() { typ = rhs.MType() } if qid := typ.QID(); qid[0] == t.IDBase { - b := numTypeBounds[qid[1].Key()] + b := numTypeBounds[qid[1]] return b[0], b[1], nil } } - return nil, nil, fmt.Errorf("check: unrecognized token.Key (0x%X) for bcheckExprBinaryOp", op) + return nil, nil, fmt.Errorf("check: unrecognized token (0x%X) for bcheckExprBinaryOp", op) } func (q *checker) bcheckExprAssociativeOp(n *a.Expr, depth uint32) (*big.Int, *big.Int, error) { - op := n.Operator().AmbiguousForm().BinaryForm().Key() + op := n.Operator().AmbiguousForm().BinaryForm() if op == 0 { return nil, nil, fmt.Errorf( - "check: unrecognized token.Key (0x%X) for bcheckExprAssociativeOp", n.Operator().Key()) + "check: unrecognized token (0x%X) for bcheckExprAssociativeOp", n.Operator()) } args := n.Args() if len(args) < 1 { @@ -1185,24 +1185,24 @@ func (q *checker) bcheckTypeExpr(typ *a.TypeExpr) (*big.Int, *big.Int, error) { return nil, nil, nil } - switch typ.Decorator().Key() { - // TODO: case t.KeyOpenParen. - case t.KeyPtr, t.KeyArray, t.KeySlice: + switch typ.Decorator() { + // TODO: case t.IDOpenParen. + case t.IDPtr, t.IDArray, t.IDSlice: return nil, nil, nil } // TODO: is the special cases for io_reader and io_writer superfluous with // the general purpose code for built-ins below? if qid := typ.QID(); qid[0] == t.IDBase { - switch qid[1].Key() { - case t.KeyIOReader, t.KeyIOWriter: + switch qid[1] { + case t.IDIOReader, t.IDIOWriter: return nil, nil, nil } } b := [2]*big.Int{} - if qid := typ.QID(); qid[0] == t.IDBase && qid[1].Key() < t.Key(len(numTypeBounds)) { - b = numTypeBounds[qid[1].Key()] + if qid := typ.QID(); qid[0] == t.IDBase && qid[1] < t.ID(len(numTypeBounds)) { + b = numTypeBounds[qid[1]] } // TODO: should || be && instead (see also func typeBounds)? Is this if // code superfluous? diff --git a/lang/check/check.go b/lang/check/check.go index c0b5ffda..9bf07376 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -80,7 +80,7 @@ func Check(tm *t.Map, files []*a.File, resolveUse func(usePath string) ([]byte, rMap := reasonMap{} for _, r := range reasons { if id := tm.ByName(r.s); id != 0 { - rMap[id.Key()] = r.r + rMap[id] = r.r } } c := &Checker{ @@ -139,7 +139,7 @@ var phases = [...]struct { type reason func(q *checker, n *a.Assert) error -type reasonMap map[t.Key]reason +type reasonMap map[t.ID]reason type Checker struct { tm *t.Map @@ -359,7 +359,7 @@ func (c *Checker) checkConst(node *a.Node) error { func (c *Checker) checkConstElement(n *a.Expr, nMin *big.Int, nMax *big.Int, nLists int) error { if nLists > 0 { nLists-- - if n.Operator().Key() != t.KeyDollar { + if n.Operator() != t.IDDollar { return fmt.Errorf("invalid const value %q", n.Str(c.tm)) } for _, o := range n.Args() { diff --git a/lang/check/data.go b/lang/check/data.go index b12eb50d..e1435c37 100644 --- a/lang/check/data.go +++ b/lang/check/data.go @@ -28,7 +28,7 @@ var reasons = [...]struct { {`"a < b: b > a"`, func(q *checker, n *a.Assert) error { op, xa, xb := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessThan { + if op != t.IDXBinaryLessThan { return errFailed } // b > a @@ -40,7 +40,7 @@ var reasons = [...]struct { {`"a < b: a < c; c < b"`, func(q *checker, n *a.Assert) error { op, xa, xb := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessThan { + if op != t.IDXBinaryLessThan { return errFailed } // a < c @@ -60,7 +60,7 @@ var reasons = [...]struct { {`"a < b: a < c; c == b"`, func(q *checker, n *a.Assert) error { op, xa, xb := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessThan { + if op != t.IDXBinaryLessThan { return errFailed } // a < c @@ -80,7 +80,7 @@ var reasons = [...]struct { {`"a < b: a == c; c < b"`, func(q *checker, n *a.Assert) error { op, xa, xb := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessThan { + if op != t.IDXBinaryLessThan { return errFailed } // a == c @@ -100,7 +100,7 @@ var reasons = [...]struct { {`"a < b: a < c; c <= b"`, func(q *checker, n *a.Assert) error { op, xa, xb := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessThan { + if op != t.IDXBinaryLessThan { return errFailed } // a < c @@ -120,7 +120,7 @@ var reasons = [...]struct { {`"a < b: a <= c; c < b"`, func(q *checker, n *a.Assert) error { op, xa, xb := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessThan { + if op != t.IDXBinaryLessThan { return errFailed } // a <= c @@ -140,7 +140,7 @@ var reasons = [...]struct { {`"a <= b: b >= a"`, func(q *checker, n *a.Assert) error { op, xa, xb := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessEq { + if op != t.IDXBinaryLessEq { return errFailed } // b >= a @@ -152,7 +152,7 @@ var reasons = [...]struct { {`"a <= b: a <= c; c <= b"`, func(q *checker, n *a.Assert) error { op, xa, xb := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessEq { + if op != t.IDXBinaryLessEq { return errFailed } // a <= c @@ -172,7 +172,7 @@ var reasons = [...]struct { {`"a <= b: a <= c; c == b"`, func(q *checker, n *a.Assert) error { op, xa, xb := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessEq { + if op != t.IDXBinaryLessEq { return errFailed } // a <= c @@ -192,7 +192,7 @@ var reasons = [...]struct { {`"a <= b: a == c; c <= b"`, func(q *checker, n *a.Assert) error { op, xa, xb := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessEq { + if op != t.IDXBinaryLessEq { return errFailed } // a == c @@ -212,11 +212,11 @@ var reasons = [...]struct { {`"a < (b + c): a < c; 0 <= b"`, func(q *checker, n *a.Assert) error { op, xa, t0 := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessThan { + if op != t.IDXBinaryLessThan { return errFailed } op, xb, xc := parseBinaryOp(t0) - if op.Key() != t.KeyXBinaryPlus { + if op != t.IDXBinaryPlus { return errFailed } // a < c @@ -232,11 +232,11 @@ var reasons = [...]struct { {`"a < (b + c): a < (b0 + c0); b0 <= b; c0 <= c"`, func(q *checker, n *a.Assert) error { op, xa, t0 := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessThan { + if op != t.IDXBinaryLessThan { return errFailed } op, xb, xc := parseBinaryOp(t0) - if op.Key() != t.KeyXBinaryPlus { + if op != t.IDXBinaryPlus { return errFailed } // a < (b0 + c0) @@ -265,11 +265,11 @@ var reasons = [...]struct { {`"(a + b) <= c: a <= (c - b)"`, func(q *checker, n *a.Assert) error { op, t0, xc := parseBinaryOp(n.Condition()) - if op.Key() != t.KeyXBinaryLessEq { + if op != t.IDXBinaryLessEq { return errFailed } op, xa, xb := parseBinaryOp(t0) - if op.Key() != t.KeyXBinaryPlus { + if op != t.IDXBinaryPlus { return errFailed } // a <= (c - b) diff --git a/lang/check/gen.go b/lang/check/gen.go index 59b703c4..4784fcce 100644 --- a/lang/check/gen.go +++ b/lang/check/gen.go @@ -128,7 +128,7 @@ func genParseBinaryOps(n *node, arg string) error { return fmt.Errorf("bad op %q", n.op) } fmt.Fprintf(&out, "op, %s, %s := parseBinaryOp(%s)\n", l, r, arg) - fmt.Fprintf(&out, "if op.Key() != t.Key%s { return errFailed }\n", key) + fmt.Fprintf(&out, "if op != t.ID%s { return errFailed }\n", key) if l[0] == 't' { if err := genParseBinaryOps(n.lhs, l); err != nil { return err diff --git a/lang/check/optimize.go b/lang/check/optimize.go index 97118508..6d5b7742 100644 --- a/lang/check/optimize.go +++ b/lang/check/optimize.go @@ -33,16 +33,16 @@ import ( // splitReceiverMethodArgs returns the "receiver", "method" and "args" in the // expression "receiver.method(args)". -func splitReceiverMethodArgs(n *a.Expr) (receiver *a.Expr, method t.Key, args []*a.Node) { - if n.Operator().Key() != t.KeyOpenParen { +func splitReceiverMethodArgs(n *a.Expr) (receiver *a.Expr, method t.ID, args []*a.Node) { + if n.Operator() != t.IDOpenParen { return nil, 0, nil } args = n.Args() n = n.LHS().Expr() - if n.Operator().Key() != t.KeyDot { + if n.Operator() != t.IDDot { return nil, 0, nil } - return n.LHS().Expr(), n.Ident().Key(), args + return n.LHS().Expr(), n.Ident(), args } // TODO: should optimizeNonSuspendible be optimizeExpr and check both @@ -63,12 +63,12 @@ func (q *checker) optimizeNonSuspendible(n *a.Expr) error { // TODO: check that nReceiver's type is actually a io_reader or io_writer. switch nMethod { - case t.KeyCopyFromHistory32: + case t.IDCopyFromHistory32: return q.optimizeCopyFromHistory32(n) - case t.KeySinceMark: + case t.IDSinceMark: for _, x := range q.facts { xReceiver, xMethod, _ := splitReceiverMethodArgs(x) - if xMethod == t.KeyIsMarked && xReceiver.Eq(nReceiver) { + if xMethod == t.IDIsMarked && xReceiver.Eq(nReceiver) { n.SetBoundsCheckOptimized() return nil } @@ -99,7 +99,7 @@ check0: for { for _, x := range q.facts { xReceiver, xMethod, _ := splitReceiverMethodArgs(x) - if xMethod == t.KeyIsMarked && xReceiver.Eq(nReceiver) { + if xMethod == t.IDIsMarked && xReceiver.Eq(nReceiver) { break check0 } } @@ -110,7 +110,7 @@ check0: check1: for { for _, x := range q.facts { - if x.Operator().Key() != t.KeyXBinaryGreaterThan { + if x.Operator() != t.IDXBinaryGreaterThan { continue } if lhs := x.LHS().Expr(); !lhs.Eq(d) { @@ -128,13 +128,13 @@ check1: check2: for { for _, x := range q.facts { - if x.Operator().Key() != t.KeyXBinaryLessEq { + if x.Operator() != t.IDXBinaryLessEq { continue } // Check that the LHS is "d as base.u64". lhs := x.LHS().Expr() - if lhs.Operator().Key() != t.KeyXBinaryAs { + if lhs.Operator() != t.IDXBinaryAs { continue } llhs, lrhs := lhs.LHS().Expr(), lhs.RHS().TypeExpr() @@ -144,11 +144,11 @@ check2: // Check that the RHS is "nReceiver.since_mark().length()". y, method, yArgs := splitReceiverMethodArgs(x.RHS().Expr()) - if method != t.KeyLength || len(yArgs) != 0 { + if method != t.IDLength || len(yArgs) != 0 { continue } z, method, zArgs := splitReceiverMethodArgs(y) - if method != t.KeySinceMark || len(zArgs) != 0 { + if method != t.IDSinceMark || len(zArgs) != 0 { continue } if !z.Eq(nReceiver) { @@ -164,13 +164,13 @@ check2: check3: for { for _, x := range q.facts { - if x.Operator().Key() != t.KeyXBinaryLessEq { + if x.Operator() != t.IDXBinaryLessEq { continue } // Check that the LHS is "l as base.u64". lhs := x.LHS().Expr() - if lhs.Operator().Key() != t.KeyXBinaryAs { + if lhs.Operator() != t.IDXBinaryAs { continue } llhs, lrhs := lhs.LHS().Expr(), lhs.RHS().TypeExpr() @@ -180,7 +180,7 @@ check3: // Check that the RHS is "nReceiver.available()". y, method, yArgs := splitReceiverMethodArgs(x.RHS().Expr()) - if method != t.KeyAvailable || len(yArgs) != 0 { + if method != t.IDAvailable || len(yArgs) != 0 { continue } if !y.Eq(nReceiver) { @@ -227,13 +227,13 @@ func (q *checker) optimizeSuspendible(n *a.Expr, depth uint32) error { // TODO: check that nReceiver's type is actually a io_reader or io_writer. - if nMethod == t.KeyUnreadU8 { + if nMethod == t.IDUnreadU8 { // unread_u8 can never suspend, only succeed or fail. n.SetProvenNotToSuspend() return nil } - if nMethod < t.Key(len(ioMethodAdvances)) { + if nMethod < t.ID(len(ioMethodAdvances)) { if advance := ioMethodAdvances[nMethod]; advance != nil { return q.optimizeIOMethodAdvance(n, nReceiver, advance) } @@ -244,8 +244,8 @@ func (q *checker) optimizeSuspendible(n *a.Expr, depth uint32) error { func (q *checker) optimizeIOMethodAdvance(n *a.Expr, receiver *a.Expr, advance *big.Int) error { return q.facts.update(func(x *a.Expr) (*a.Expr, error) { - op := x.Operator().Key() - if op != t.KeyXBinaryGreaterEq && op != t.KeyXBinaryGreaterThan { + op := x.Operator() + if op != t.IDXBinaryGreaterEq && op != t.IDXBinaryGreaterThan { return x, nil } @@ -256,11 +256,11 @@ func (q *checker) optimizeIOMethodAdvance(n *a.Expr, receiver *a.Expr, advance * // Check that lhs is "receiver.available()". lhs := x.LHS().Expr() - if lhs.Operator().Key() != t.KeyOpenParen || len(lhs.Args()) != 0 { + if lhs.Operator() != t.IDOpenParen || len(lhs.Args()) != 0 { return x, nil } lhs = lhs.LHS().Expr() - if lhs.Operator().Key() != t.KeyDot || lhs.Ident().Key() != t.KeyAvailable { + if lhs.Operator() != t.IDDot || lhs.Ident() != t.IDAvailable { return x, nil } lhs = lhs.LHS().Expr() @@ -272,8 +272,8 @@ func (q *checker) optimizeIOMethodAdvance(n *a.Expr, receiver *a.Expr, advance * // rcv to be the bytes remaining. If not, discard the fact x. // // TODO: mark the call as proven not to suspend. - if op == t.KeyXBinaryGreaterThan { - op = t.KeyXBinaryGreaterEq + if op == t.IDXBinaryGreaterThan { + op = t.IDXBinaryGreaterEq rcv = big.NewInt(0).Add(rcv, one) } if rcv.Cmp(advance) < 0 { @@ -300,19 +300,19 @@ func (q *checker) optimizeIOMethodAdvance(n *a.Expr, receiver *a.Expr, advance * } var ioMethodAdvances = [256]*big.Int{ - t.KeyReadU8: one, - t.KeyReadU16BE: two, - t.KeyReadU16LE: two, - t.KeyReadU32BE: four, - t.KeyReadU32LE: four, - t.KeyReadU64BE: eight, - t.KeyReadU64LE: eight, + t.IDReadU8: one, + t.IDReadU16BE: two, + t.IDReadU16LE: two, + t.IDReadU32BE: four, + t.IDReadU32LE: four, + t.IDReadU64BE: eight, + t.IDReadU64LE: eight, - t.KeyWriteU8: one, - t.KeyWriteU16BE: two, - t.KeyWriteU16LE: two, - t.KeyWriteU32BE: four, - t.KeyWriteU32LE: four, - t.KeyWriteU64BE: eight, - t.KeyWriteU64LE: eight, + t.IDWriteU8: one, + t.IDWriteU16BE: two, + t.IDWriteU16LE: two, + t.IDWriteU32BE: four, + t.IDWriteU32LE: four, + t.IDWriteU64BE: eight, + t.IDWriteU64LE: eight, } diff --git a/lang/check/resolve.go b/lang/check/resolve.go index 3c6e59f9..59da8e73 100644 --- a/lang/check/resolve.go +++ b/lang/check/resolve.go @@ -134,7 +134,7 @@ func parseBuiltInFuncs(tm *t.Map, ss []string, generic bool) (map[t.QQID]*a.Func } func (c *Checker) resolveFunc(typ *a.TypeExpr) (*a.Func, error) { - if typ.Decorator().Key() != t.KeyOpenParen { + if typ.Decorator() != t.IDOpenParen { return nil, fmt.Errorf("check: resolveFunc cannot look up non-func TypeExpr %q", typ.Str(c.tm)) } lTyp := typ.Receiver() diff --git a/lang/check/type.go b/lang/check/type.go index 06cd2c25..77c55e1c 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -149,7 +149,7 @@ func (q *checker) tcheckStatement(n *a.Node) error { return fmt.Errorf("no matching while/iterate statement for %s%s%s", n.Keyword().Str(q.tm), sepStr, labelStr) } - if n.Keyword().Key() == t.KeyBreak { + if n.Keyword() == t.IDBreak { jumpTarget.SetHasBreak() } else { jumpTarget.SetHasContinue() @@ -178,7 +178,7 @@ func (q *checker) tcheckStatement(n *a.Node) error { lTyp := n.XType() rTyp := value.MType() if n.IterateVariable() { - if lTyp.Decorator().Key() != t.KeyPtr { + if lTyp.Decorator() != t.IDPtr { return fmt.Errorf("check: iterate variable %q, of type %q, does not have a pointer type", n.Name().Str(q.tm), lTyp.Str(q.tm)) } @@ -266,7 +266,7 @@ func (q *checker) tcheckAssign(n *a.Assign) error { lTyp := lhs.MType() rTyp := rhs.MType() - if n.Operator().Key() == t.KeyEq { + if n.Operator() == t.IDEq { return q.tcheckEq(0, lhs, lTyp, rhs, rTyp) } @@ -275,14 +275,14 @@ func (q *checker) tcheckAssign(n *a.Assign) error { n.Operator().Str(q.tm), lhs.Str(q.tm), lTyp.Str(q.tm)) } - switch n.Operator().Key() { - case t.KeyShiftLEq, t.KeyShiftREq: + switch n.Operator() { + case t.IDShiftLEq, t.IDShiftREq: if !rTyp.IsNumTypeOrIdeal() { return fmt.Errorf("check: assignment %q: shift %q, of type %q, does not have numeric type", n.Operator().Str(q.tm), rhs.Str(q.tm), rTyp.Str(q.tm)) } return nil - case t.KeyTildePlusEq: + case t.IDTildePlusEq: if !lTyp.IsUnsignedInteger() { return fmt.Errorf("check: assignment %q: %q, of type %q, does not have unsigned integer type", n.Operator().Str(q.tm), lhs.Str(q.tm), lTyp.Str(q.tm)) @@ -372,7 +372,7 @@ func (q *checker) tcheckExpr(n *a.Expr, depth uint32) error { } func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { - switch n.Operator().Key() { + switch n.Operator() { case 0: id1 := n.Ident() if id1.IsNumLiteral(q.tm) { @@ -403,25 +403,25 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { // structs from used packages. return fmt.Errorf("check: unrecognized identifier %q", id1.Str(q.tm)) } - switch id1.Key() { - case t.KeyFalse: + switch id1 { + case t.IDFalse: n.SetConstValue(zero) n.SetMType(typeExprBool) return nil - case t.KeyTrue: + case t.IDTrue: n.SetConstValue(one) n.SetMType(typeExprBool) return nil - case t.KeyUnderscore: + case t.IDUnderscore: // TODO. - case t.KeyThis: + case t.IDThis: // TODO. } - case t.KeyOpenParen, t.KeyTry: + case t.IDOpenParen, t.IDTry: // n is a function call. // TODO: be consistent about type-checking n.LHS().Expr() or @@ -429,7 +429,7 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { // require a TypeExpr being able to express function and method types. // TODO: delete this hack that only matches "foo.decode(etc)". - if isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 3) { + if isThatMethod(q.tm, n, q.tm.ByName("decode"), 3) { foo := n.LHS().Expr().LHS().Expr() if err := q.tcheckExpr(foo, depth); err != nil { return err @@ -441,7 +441,7 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { return err } } - if n.Operator().Key() == t.KeyTry { + if n.Operator() == t.IDTry { // TODO: be more principled about inferring "try etc"'s type. n.SetMType(typeExprStatus) } else { @@ -452,7 +452,7 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { return q.tcheckExprCall(n, depth) - case t.KeyOpenBracket: + case t.IDOpenBracket: // n is an index. lhs := n.LHS().Expr() if err := q.tcheckExpr(lhs, depth); err != nil { @@ -463,7 +463,7 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { return err } lTyp := lhs.MType() - if key := lTyp.Decorator().Key(); key != t.KeyArray && key != t.KeySlice { + if key := lTyp.Decorator(); key != t.IDArray && key != t.IDSlice { return fmt.Errorf("check: %s is an index expression but %s has type %s, not an array or slice type", n.Str(q.tm), lhs.Str(q.tm), lTyp.Str(q.tm)) } @@ -475,7 +475,7 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { n.SetMType(lTyp.Inner()) return nil - case t.KeyColon: + case t.IDColon: // n is a slice. // TODO: require that the i and j in a[i:j] are *unsigned* (or // non-negative constants)? @@ -504,21 +504,21 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { return err } lTyp := lhs.MType() - switch lTyp.Decorator().Key() { + switch lTyp.Decorator() { default: return fmt.Errorf("check: %s is a slice expression but %s has type %s, not an array or slice type", n.Str(q.tm), lhs.Str(q.tm), lTyp.Str(q.tm)) - case t.KeyArray: + case t.IDArray: n.SetMType(a.NewTypeExpr(t.IDSlice, 0, 0, nil, nil, lTyp.Inner())) - case t.KeySlice: + case t.IDSlice: n.SetMType(lTyp) } return nil - case t.KeyDot: + case t.IDDot: return q.tcheckDot(n, depth) - case t.KeyError, t.KeyStatus, t.KeySuspension: + case t.IDError, t.IDStatus, t.IDSuspension: nominalKeyword := n.Operator() declaredKeyword := t.ID(0) if s, ok := q.c.statuses[n.StatusQID()]; ok { @@ -538,7 +538,7 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { n.SetMType(typeExprStatus) return nil - case t.KeyDollar: + case t.IDDollar: for _, o := range n.Args() { o := o.Expr() if err := q.tcheckExpr(o, depth); err != nil { @@ -549,8 +549,8 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { return nil } - return fmt.Errorf("check: unrecognized token.Key (0x%X) in expression %q for tcheckExprOther", - n.Operator().Key(), n.Str(q.tm)) + return fmt.Errorf("check: unrecognized token (0x%X) in expression %q for tcheckExprOther", + n.Operator(), n.Str(q.tm)) } func (q *checker) tcheckExprCall(n *a.Expr, depth uint32) error { @@ -586,11 +586,11 @@ func (q *checker) tcheckExprCall(n *a.Expr, depth uint32) error { } } - // TODO: distinguish t.KeyOpenParen vs t.KeyTry in a more principled way? + // TODO: distinguish t.IDOpenParen vs t.IDTry in a more principled way? // // TODO: figure out calls with and without "?" should interact with the out // type. - if n.Operator().Key() == t.KeyTry { + if n.Operator() == t.IDTry { n.SetMType(typeExprStatus) } else { outFields := f.Out().Fields() @@ -614,64 +614,64 @@ func (q *checker) tcheckExprCall(n *a.Expr, depth uint32) error { return nil } -func isInSrc(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { - callSuspendible := methodName != t.KeySinceMark && - methodName != t.KeyMark && - methodName != t.KeyLimit - if n.Operator().Key() != t.KeyOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { +func isInSrc(tm *t.Map, n *a.Expr, methodName t.ID, nArgs int) bool { + callSuspendible := methodName != t.IDSinceMark && + methodName != t.IDMark && + methodName != t.IDLimit + if n.Operator() != t.IDOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { return false } n = n.LHS().Expr() - if n.Operator().Key() != t.KeyDot || n.Ident().Key() != methodName { + if n.Operator() != t.IDDot || n.Ident() != methodName { return false } n = n.LHS().Expr() - if n.Operator().Key() != t.KeyDot || n.Ident() != tm.ByName("src") { + if n.Operator() != t.IDDot || n.Ident() != tm.ByName("src") { return false } n = n.LHS().Expr() - return n.Operator() == 0 && n.Ident().Key() == t.KeyIn + return n.Operator() == 0 && n.Ident() == t.IDIn } -func isInDst(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { - callSuspendible := methodName != t.KeyCopyFromReader32 && - methodName != t.KeyCopyFromHistory32 && - methodName != t.KeyCopyFromSlice32 && - methodName != t.KeyCopyFromSlice && - methodName != t.KeySinceMark && - methodName != t.KeyIsMarked && - methodName != t.KeyMark && - methodName != t.KeyLimit +func isInDst(tm *t.Map, n *a.Expr, methodName t.ID, nArgs int) bool { + callSuspendible := methodName != t.IDCopyFromReader32 && + methodName != t.IDCopyFromHistory32 && + methodName != t.IDCopyFromSlice32 && + methodName != t.IDCopyFromSlice && + methodName != t.IDSinceMark && + methodName != t.IDIsMarked && + methodName != t.IDMark && + methodName != t.IDLimit // TODO: check that n.Args() is "(x:bar)". - if n.Operator().Key() != t.KeyOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { + if n.Operator() != t.IDOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { return false } n = n.LHS().Expr() - if n.Operator().Key() != t.KeyDot || n.Ident().Key() != methodName { + if n.Operator() != t.IDDot || n.Ident() != methodName { return false } n = n.LHS().Expr() - if n.Operator().Key() != t.KeyDot || n.Ident() != tm.ByName("dst") { + if n.Operator() != t.IDDot || n.Ident() != tm.ByName("dst") { return false } n = n.LHS().Expr() - return n.Operator() == 0 && n.Ident().Key() == t.KeyIn + return n.Operator() == 0 && n.Ident() == t.IDIn } // isThatMethod matches foo.methodName(etc) where etc has nArgs elements. -func isThatMethod(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool { - if k := n.Operator().Key(); k != t.KeyOpenParen && k != t.KeyTry { +func isThatMethod(tm *t.Map, n *a.Expr, methodName t.ID, nArgs int) bool { + if k := n.Operator(); k != t.IDOpenParen && k != t.IDTry { return false } if len(n.Args()) != nArgs { return false } n = n.LHS().Expr() - if n.Operator().Key() != t.KeyDot || n.Ident().Key() != methodName { + if n.Operator() != t.IDDot || n.Ident() != methodName { return false } n = n.LHS().Expr() - if n.Operator().Key() == t.KeyDot && + if n.Operator() == t.IDDot && (n.Ident() == tm.ByName("src") || n.Ident() == tm.ByName("dst")) { return false } @@ -697,7 +697,7 @@ func (q *checker) tcheckDot(n *a.Expr, depth uint32) error { } n.SetMType(a.NewTypeExpr(t.IDOpenParen, 0, n.Ident(), lTyp.Node(), nil, nil)) return nil - } else if lTyp.Decorator().Key() != 0 { + } else if lTyp.Decorator() != 0 { return fmt.Errorf("check: invalid type %q for dot-expression LHS %q", lTyp.Str(q.tm), lhs.Str(q.tm)) } @@ -714,10 +714,10 @@ func (q *checker) tcheckDot(n *a.Expr, depth uint32) error { s := (*a.Struct)(nil) if q.astFunc != nil && lQID[0] == 0 { - switch lQID[1].Key() { - case t.KeyIn: + switch lQID[1] { + case t.IDIn: s = q.astFunc.In() - case t.KeyOut: + case t.IDOut: s = q.astFunc.Out() } } @@ -747,14 +747,14 @@ func (q *checker) tcheckExprUnaryOp(n *a.Expr, depth uint32) error { } rTyp := rhs.MType() - switch n.Operator().Key() { - case t.KeyXUnaryPlus, t.KeyXUnaryMinus: + switch n.Operator() { + case t.IDXUnaryPlus, t.IDXUnaryMinus: if !rTyp.IsNumTypeOrIdeal() { return fmt.Errorf("check: unary %q: %q, of type %q, does not have a numeric type", n.Operator().AmbiguousForm().Str(q.tm), rhs.Str(q.tm), rTyp.Str(q.tm)) } if cv := rhs.ConstValue(); cv != nil { - if n.Operator().Key() == t.KeyXUnaryMinus { + if n.Operator() == t.IDXUnaryMinus { cv = neg(cv) } n.SetConstValue(cv) @@ -762,7 +762,7 @@ func (q *checker) tcheckExprUnaryOp(n *a.Expr, depth uint32) error { n.SetMType(rTyp.Unrefined()) return nil - case t.KeyXUnaryNot: + case t.IDXUnaryNot: if !rTyp.IsBool() { return fmt.Errorf("check: unary %q: %q, of type %q, does not have a boolean type", n.Operator().AmbiguousForm().Str(q.tm), rhs.Str(q.tm), rTyp.Str(q.tm)) @@ -773,18 +773,18 @@ func (q *checker) tcheckExprUnaryOp(n *a.Expr, depth uint32) error { n.SetMType(typeExprBool) return nil - case t.KeyXUnaryRef: + case t.IDXUnaryRef: // TODO. - case t.KeyXUnaryDeref: - if rTyp.Decorator().Key() != t.KeyPtr { // TODO: t.KeyNptr? + case t.IDXUnaryDeref: + if rTyp.Decorator() != t.IDPtr { // TODO: t.IDNptr? return fmt.Errorf("check: %q is a dereference of a non-pointer type %q", n.Str(q.tm), rTyp.Str(q.tm)) } n.SetMType(rTyp.Inner()) return nil } - return fmt.Errorf("check: unrecognized token.Key (0x%X) for tcheckExprUnaryOp", n.Operator().Key()) + return fmt.Errorf("check: unrecognized token (0x%X) for tcheckExprUnaryOp", n.Operator()) } func (q *checker) tcheckExprBinaryOp(n *a.Expr, depth uint32) error { @@ -794,7 +794,7 @@ func (q *checker) tcheckExprBinaryOp(n *a.Expr, depth uint32) error { } lTyp := lhs.MType() op := n.Operator() - if op.Key() == t.KeyXBinaryAs { + if op == t.IDXBinaryAs { rhs := n.RHS().TypeExpr() if err := q.tcheckTypeExpr(rhs, 0); err != nil { return err @@ -812,7 +812,7 @@ func (q *checker) tcheckExprBinaryOp(n *a.Expr, depth uint32) error { } rTyp := rhs.MType() - switch op.Key() { + switch op { default: if !lTyp.IsNumTypeOrIdeal() { return fmt.Errorf("check: binary %q: %q, of type %q, does not have a numeric type", @@ -822,9 +822,9 @@ func (q *checker) tcheckExprBinaryOp(n *a.Expr, depth uint32) error { return fmt.Errorf("check: binary %q: %q, of type %q, does not have a numeric type", op.AmbiguousForm().Str(q.tm), rhs.Str(q.tm), rTyp.Str(q.tm)) } - case t.KeyXBinaryNotEq, t.KeyXBinaryEqEq: + case t.IDXBinaryNotEq, t.IDXBinaryEqEq: // No-op. - case t.KeyXBinaryAnd, t.KeyXBinaryOr: + case t.IDXBinaryAnd, t.IDXBinaryOr: if !lTyp.IsBool() { return fmt.Errorf("check: binary %q: %q, of type %q, does not have a boolean type", op.AmbiguousForm().Str(q.tm), lhs.Str(q.tm), lTyp.Str(q.tm)) @@ -835,7 +835,7 @@ func (q *checker) tcheckExprBinaryOp(n *a.Expr, depth uint32) error { } } - switch op.Key() { + switch op { default: if !lTyp.EqIgnoringRefinements(rTyp) && !lTyp.IsIdeal() && !rTyp.IsIdeal() { return fmt.Errorf("check: binary %q: %q and %q, of types %q and %q, do not have compatible types", @@ -844,7 +844,7 @@ func (q *checker) tcheckExprBinaryOp(n *a.Expr, depth uint32) error { lTyp.Str(q.tm), rTyp.Str(q.tm), ) } - case t.KeyXBinaryShiftL, t.KeyXBinaryShiftR: + case t.IDXBinaryShiftL, t.IDXBinaryShiftR: if lTyp.IsIdeal() && !rTyp.IsIdeal() { return fmt.Errorf("check: binary %q: %q and %q, of types %q and %q; "+ "cannot shift an ideal number by a non-ideal number", @@ -855,8 +855,8 @@ func (q *checker) tcheckExprBinaryOp(n *a.Expr, depth uint32) error { } } - switch op.Key() { - case t.KeyXBinaryTildePlus: + switch op { + case t.IDXBinaryTildePlus: typ := lTyp if typ.IsIdeal() { typ = rTyp @@ -885,7 +885,7 @@ func (q *checker) tcheckExprBinaryOp(n *a.Expr, depth uint32) error { n.SetConstValue(ncv) } - if comparisonOps[0xFF&op.Key()] { + if comparisonOps[0xFF&op] { n.SetMType(typeExprBool) } else if !lTyp.IsIdeal() { n.SetMType(lTyp.Unrefined()) @@ -897,71 +897,71 @@ func (q *checker) tcheckExprBinaryOp(n *a.Expr, depth uint32) error { } func evalConstValueBinaryOp(tm *t.Map, n *a.Expr, l *big.Int, r *big.Int) (*big.Int, error) { - switch n.Operator().Key() { - case t.KeyXBinaryPlus: + switch n.Operator() { + case t.IDXBinaryPlus: return big.NewInt(0).Add(l, r), nil - case t.KeyXBinaryMinus: + case t.IDXBinaryMinus: return big.NewInt(0).Sub(l, r), nil - case t.KeyXBinaryStar: + case t.IDXBinaryStar: return big.NewInt(0).Mul(l, r), nil - case t.KeyXBinarySlash: + case t.IDXBinarySlash: if r.Sign() == 0 { return nil, fmt.Errorf("check: division by zero in const expression %q", n.Str(tm)) } // TODO: decide on Euclidean division vs other definitions. See "go doc // math/big int.divmod" for details. return big.NewInt(0).Div(l, r), nil - case t.KeyXBinaryShiftL: + case t.IDXBinaryShiftL: if r.Sign() < 0 || r.Cmp(ffff) > 0 { return nil, fmt.Errorf("check: shift %q out of range in const expression %q", n.RHS().Expr().Str(tm), n.Str(tm)) } return big.NewInt(0).Lsh(l, uint(r.Uint64())), nil - case t.KeyXBinaryShiftR: + case t.IDXBinaryShiftR: if r.Sign() < 0 || r.Cmp(ffff) > 0 { return nil, fmt.Errorf("check: shift %q out of range in const expression %q", n.RHS().Expr().Str(tm), n.Str(tm)) } return big.NewInt(0).Rsh(l, uint(r.Uint64())), nil - case t.KeyXBinaryAmp: + case t.IDXBinaryAmp: return big.NewInt(0).And(l, r), nil - case t.KeyXBinaryAmpHat: + case t.IDXBinaryAmpHat: return big.NewInt(0).AndNot(l, r), nil - case t.KeyXBinaryPipe: + case t.IDXBinaryPipe: return big.NewInt(0).Or(l, r), nil - case t.KeyXBinaryHat: + case t.IDXBinaryHat: return big.NewInt(0).Xor(l, r), nil - case t.KeyXBinaryPercent: + case t.IDXBinaryPercent: if r.Sign() == 0 { return nil, fmt.Errorf("check: division by zero in const expression %q", n.Str(tm)) } return big.NewInt(0).Mod(l, r), nil - case t.KeyXBinaryNotEq: + case t.IDXBinaryNotEq: return btoi(l.Cmp(r) != 0), nil - case t.KeyXBinaryLessThan: + case t.IDXBinaryLessThan: return btoi(l.Cmp(r) < 0), nil - case t.KeyXBinaryLessEq: + case t.IDXBinaryLessEq: return btoi(l.Cmp(r) <= 0), nil - case t.KeyXBinaryEqEq: + case t.IDXBinaryEqEq: return btoi(l.Cmp(r) == 0), nil - case t.KeyXBinaryGreaterEq: + case t.IDXBinaryGreaterEq: return btoi(l.Cmp(r) >= 0), nil - case t.KeyXBinaryGreaterThan: + case t.IDXBinaryGreaterThan: return btoi(l.Cmp(r) > 0), nil - case t.KeyXBinaryAnd: + case t.IDXBinaryAnd: return btoi((l.Sign() != 0) && (r.Sign() != 0)), nil - case t.KeyXBinaryOr: + case t.IDXBinaryOr: return btoi((l.Sign() != 0) || (r.Sign() != 0)), nil - case t.KeyXBinaryTildePlus: + case t.IDXBinaryTildePlus: return nil, fmt.Errorf("check: cannot apply ~+ operator to ideal numbers") } - return nil, fmt.Errorf("check: unrecognized token.Key (0x%02X) for evalConstValueBinaryOp", n.Operator().Key()) + return nil, fmt.Errorf("check: unrecognized token (0x%02X) for evalConstValueBinaryOp", n.Operator()) } func (q *checker) tcheckExprAssociativeOp(n *a.Expr, depth uint32) error { - switch n.Operator().Key() { - case t.KeyXAssociativePlus, t.KeyXAssociativeStar, - t.KeyXAssociativeAmp, t.KeyXAssociativePipe, t.KeyXAssociativeHat: + switch n.Operator() { + case t.IDXAssociativePlus, t.IDXAssociativeStar, + t.IDXAssociativeAmp, t.IDXAssociativePipe, t.IDXAssociativeHat: expr, typ := (*a.Expr)(nil), (*a.TypeExpr)(nil) for _, o := range n.Args() { @@ -995,7 +995,7 @@ func (q *checker) tcheckExprAssociativeOp(n *a.Expr, depth uint32) error { n.SetMType(typ) return nil - case t.KeyXAssociativeAnd, t.KeyXAssociativeOr: + case t.IDXAssociativeAnd, t.IDXAssociativeOr: for _, o := range n.Args() { o := o.Expr() if err := q.tcheckExpr(o, depth); err != nil { @@ -1010,7 +1010,7 @@ func (q *checker) tcheckExprAssociativeOp(n *a.Expr, depth uint32) error { return nil } - return fmt.Errorf("check: unrecognized token.Key (0x%X) for tcheckExprAssociativeOp", n.Operator().Key()) + return fmt.Errorf("check: unrecognized token (0x%X) for tcheckExprAssociativeOp", n.Operator()) } func (q *checker) tcheckTypeExpr(typ *a.TypeExpr, depth uint32) error { @@ -1020,8 +1020,8 @@ func (q *checker) tcheckTypeExpr(typ *a.TypeExpr, depth uint32) error { depth++ swtch: - switch typ.Decorator().Key() { - // TODO: also check t.KeyOpenParen. + switch typ.Decorator() { + // TODO: also check t.IDOpenParen. case 0: qid := typ.QID() if qid[0] == t.IDBase && qid[1].IsNumType() { @@ -1053,7 +1053,7 @@ swtch: } return fmt.Errorf("check: %q is not a type", typ.Str(q.tm)) - case t.KeyArray: + case t.IDArray: aLen := typ.ArrayLength() if err := q.tcheckExpr(aLen, 0); err != nil { return err @@ -1063,8 +1063,8 @@ swtch: } fallthrough - // TODO: also check t.KeyNptr? Where else should we look for nptr? - case t.KeyPtr, t.KeySlice: + // TODO: also check t.IDNptr? Where else should we look for nptr? + case t.IDPtr, t.IDSlice: if err := q.tcheckTypeExpr(typ.Inner(), depth); err != nil { return err } @@ -1077,10 +1077,10 @@ swtch: } var comparisonOps = [256]bool{ - t.KeyXBinaryNotEq: true, - t.KeyXBinaryLessThan: true, - t.KeyXBinaryLessEq: true, - t.KeyXBinaryEqEq: true, - t.KeyXBinaryGreaterEq: true, - t.KeyXBinaryGreaterThan: true, + t.IDXBinaryNotEq: true, + t.IDXBinaryLessThan: true, + t.IDXBinaryLessEq: true, + t.IDXBinaryEqEq: true, + t.IDXBinaryGreaterEq: true, + t.IDXBinaryGreaterThan: true, } diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 16d720a2..c571d055 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -101,8 +101,8 @@ func (p *parser) parseFile() (*a.File, error) { func (p *parser) parseTopLevelDecl() (*a.Node, error) { flags := a.Flags(0) line := p.src[0].Line - switch k := p.peek1().Key(); k { - case t.KeyPackageID, t.KeyUse: + switch k := p.peek1(); k { + case t.IDPackageID, t.IDUse: p.src = p.src[1:] path := p.peek1() if !path.IsStrLiteral(p.tm) { @@ -110,12 +110,12 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { return nil, fmt.Errorf(`parse: expected string literal, got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] - if x := p.peek1().Key(); x != t.KeySemicolon { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDSemicolon { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected (implicit) ";", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] - if k == t.KeyPackageID { + if k == t.IDPackageID { raw := path.Str(p.tm) s, ok := t.Unescape(raw) if !ok { @@ -129,13 +129,13 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { return a.NewUse(p.filename, line, path).Node(), nil } - case t.KeyPub: + case t.IDPub: flags |= a.FlagsPublic fallthrough - case t.KeyPri: + case t.IDPri: p.src = p.src[1:] - switch p.peek1().Key() { - case t.KeyConst: + switch p.peek1() { + case t.IDConst: p.src = p.src[1:] id, err := p.parseIdent() if err != nil { @@ -147,14 +147,14 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { if err != nil { return nil, err } - if p.peek1().Key() != t.KeyEq { + if p.peek1() != t.IDEq { return nil, fmt.Errorf(`parse: const %q has no value at %s:%d`, p.tm.ByID(id), p.filename, p.line()) } p.src = p.src[1:] value := (*a.Expr)(nil) // TODO: parse lists of lists. - if p.peek1().Key() == t.KeyDollar { + if p.peek1() == t.IDDollar { value, err = p.parseDollarExpr() if err != nil { return nil, err @@ -165,14 +165,14 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { return nil, err } } - if x := p.peek1().Key(); x != t.KeySemicolon { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDSemicolon { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected (implicit) ";", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] return a.NewConst(flags, p.filename, line, id, typ, value).Node(), nil - case t.KeyFunc: + case t.IDFunc: p.src = p.src[1:] id0, id1, err := p.parseQualifiedIdent() if err != nil { @@ -195,26 +195,26 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { p.tm.ByID(id1), p.filename, p.line()) } - switch p.peek1().Key() { - case t.KeyExclam: + switch p.peek1() { + case t.IDExclam: flags |= a.FlagsImpure p.src = p.src[1:] - case t.KeyQuestion: + case t.IDQuestion: flags |= a.FlagsImpure | a.FlagsSuspendible p.src = p.src[1:] } - inFields, err := p.parseList(t.KeyCloseParen, (*parser).parseFieldNode) + inFields, err := p.parseList(t.IDCloseParen, (*parser).parseFieldNode) if err != nil { return nil, err } - outFields, err := p.parseList(t.KeyCloseParen, (*parser).parseFieldNode) + outFields, err := p.parseList(t.IDCloseParen, (*parser).parseFieldNode) if err != nil { return nil, err } asserts := []*a.Node(nil) - if p.peek1().Key() == t.KeyComma { + if p.peek1() == t.IDComma { p.src = p.src[1:] - asserts, err = p.parseList(t.KeyOpenCurly, (*parser).parseAssertNode) + asserts, err = p.parseList(t.IDOpenCurly, (*parser).parseAssertNode) if err != nil { return nil, err } @@ -226,8 +226,8 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { if err != nil { return nil, err } - if x := p.peek1().Key(); x != t.KeySemicolon { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDSemicolon { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected (implicit) ";", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] @@ -235,7 +235,7 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { out := a.NewStruct(0, p.filename, line, t.IDOut, outFields) return a.NewFunc(flags, p.filename, line, id0, id1, in, out, asserts, body).Node(), nil - case t.KeyError, t.KeySuspension: + case t.IDError, t.IDSuspension: keyword := p.src[0].ID p.src = p.src[1:] message := p.peek1() @@ -244,14 +244,14 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { return nil, fmt.Errorf(`parse: expected string literal, got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] - if x := p.peek1().Key(); x != t.KeySemicolon { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDSemicolon { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected (implicit) ";", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] return a.NewStatus(flags, p.filename, line, keyword, message).Node(), nil - case t.KeyStruct: + case t.IDStruct: p.src = p.src[1:] name, err := p.parseIdent() if err != nil { @@ -266,16 +266,16 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { p.tm.ByID(name), p.filename, p.line()) } - if p.peek1().Key() == t.KeyQuestion { + if p.peek1() == t.IDQuestion { flags |= a.FlagsSuspendible p.src = p.src[1:] } - fields, err := p.parseList(t.KeyCloseParen, (*parser).parseFieldNode) + fields, err := p.parseList(t.IDCloseParen, (*parser).parseFieldNode) if err != nil { return nil, err } - if x := p.peek1().Key(); x != t.KeySemicolon { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDSemicolon { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected (implicit) ";", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] @@ -292,7 +292,7 @@ func (p *parser) parseQualifiedIdent() (t.ID, t.ID, error) { return 0, 0, err } - if p.peek1().Key() != t.KeyDot { + if p.peek1() != t.IDDot { return 0, x, nil } p.src = p.src[1:] @@ -310,26 +310,26 @@ func (p *parser) parseIdent() (t.ID, error) { } x := p.src[0] if !x.ID.IsIdent(p.tm) { - got := p.tm.ByToken(x) + got := p.tm.ByID(x.ID) return 0, fmt.Errorf(`parse: expected identifier, got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] return x.ID, nil } -func (p *parser) parseList(stop t.Key, parseElem func(*parser) (*a.Node, error)) ([]*a.Node, error) { - if stop == t.KeyCloseParen { - if x := p.peek1().Key(); x != t.KeyOpenParen { +func (p *parser) parseList(stop t.ID, parseElem func(*parser) (*a.Node, error)) ([]*a.Node, error) { + if stop == t.IDCloseParen { + if x := p.peek1(); x != t.IDOpenParen { return nil, fmt.Errorf(`parse: expected "(", got %q at %s:%d`, - p.tm.ByKey(x), p.filename, p.line()) + p.tm.ByID(x), p.filename, p.line()) } p.src = p.src[1:] } ret := []*a.Node(nil) for len(p.src) > 0 { - if p.src[0].ID.Key() == stop { - if stop == t.KeyCloseParen { + if p.src[0].ID == stop { + if stop == t.IDCloseParen { p.src = p.src[1:] } return ret, nil @@ -341,20 +341,20 @@ func (p *parser) parseList(stop t.Key, parseElem func(*parser) (*a.Node, error)) } ret = append(ret, elem) - switch x := p.peek1().Key(); x { + switch x := p.peek1(); x { case stop: - if stop == t.KeyCloseParen { + if stop == t.IDCloseParen { p.src = p.src[1:] } return ret, nil - case t.KeyComma: + case t.IDComma: p.src = p.src[1:] default: return nil, fmt.Errorf(`parse: expected %q, got %q at %s:%d`, - p.tm.ByKey(stop), p.tm.ByKey(x), p.filename, p.line()) + p.tm.ByID(stop), p.tm.ByID(x), p.filename, p.line()) } } - return nil, fmt.Errorf(`parse: expected %q at %s:%d`, p.tm.ByKey(stop), p.filename, p.line()) + return nil, fmt.Errorf(`parse: expected %q at %s:%d`, p.tm.ByID(stop), p.filename, p.line()) } func (p *parser) parseFieldNode() (*a.Node, error) { @@ -367,7 +367,7 @@ func (p *parser) parseFieldNode() (*a.Node, error) { return nil, err } defaultValue := (*a.Expr)(nil) - if p.peek1().Key() == t.KeyEq { + if p.peek1() == t.IDEq { p.src = p.src[1:] defaultValue, err = p.parseExpr() if err != nil { @@ -378,7 +378,7 @@ func (p *parser) parseFieldNode() (*a.Node, error) { } func (p *parser) parseTypeExpr() (*a.TypeExpr, error) { - if p.peek1().Key() == t.KeyPtr { + if p.peek1() == t.IDPtr { p.src = p.src[1:] rhs, err := p.parseTypeExpr() if err != nil { @@ -388,13 +388,13 @@ func (p *parser) parseTypeExpr() (*a.TypeExpr, error) { } decorator, arrayLength := t.ID(0), (*a.Expr)(nil) - switch p.peek1().Key() { - case t.KeyArray: + switch p.peek1() { + case t.IDArray: decorator = t.IDArray p.src = p.src[1:] - if x := p.peek1().Key(); x != t.KeyOpenBracket { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDOpenBracket { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected "[", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] @@ -405,13 +405,13 @@ func (p *parser) parseTypeExpr() (*a.TypeExpr, error) { return nil, err } - if x := p.peek1().Key(); x != t.KeyCloseBracket { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDCloseBracket { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected "]", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] - case t.KeySlice: + case t.IDSlice: decorator = t.IDSlice p.src = p.src[1:] } @@ -430,7 +430,7 @@ func (p *parser) parseTypeExpr() (*a.TypeExpr, error) { } lhs, mhs := (*a.Expr)(nil), (*a.Expr)(nil) - if p.peek1().Key() == t.KeyOpenBracket { + if p.peek1() == t.IDOpenBracket { _, lhs, mhs, err = p.parseBracket(t.IDDotDot) if err != nil { return nil, err @@ -445,8 +445,8 @@ func (p *parser) parseTypeExpr() (*a.TypeExpr, error) { // 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) { - if x := p.peek1().Key(); x != t.KeyOpenBracket { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDOpenBracket { + got := p.tm.ByID(x) return 0, nil, nil, fmt.Errorf(`parse: expected "[", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] @@ -458,33 +458,33 @@ func (p *parser) parseBracket(sep t.ID) (op t.ID, ei *a.Expr, ej *a.Expr, err er } } - switch x := p.peek1().Key(); { - case x == sep.Key(): + switch x := p.peek1(); { + case x == sep: p.src = p.src[1:] - case x == t.KeyCloseBracket && sep.Key() == t.KeyColon: + case x == t.IDCloseBracket && sep == t.IDColon: p.src = p.src[1:] return t.IDOpenBracket, nil, ei, nil default: extra := `` - if sep.Key() == t.KeyColon { + if sep == t.IDColon { extra = ` or "]"` } - got := p.tm.ByKey(x) + got := p.tm.ByID(x) return 0, nil, nil, fmt.Errorf(`parse: expected %q%s, got %q at %s:%d`, p.tm.ByID(sep), extra, got, p.filename, p.line()) } - if p.peek1().Key() != t.KeyCloseBracket { + if p.peek1() != t.IDCloseBracket { ej, err = p.parseExpr() if err != nil { return 0, nil, nil, err } } - if x := p.peek1().Key(); x != t.KeyCloseBracket { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDCloseBracket { + got := p.tm.ByID(x) return 0, nil, nil, fmt.Errorf(`parse: expected "]", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] @@ -493,15 +493,15 @@ func (p *parser) parseBracket(sep t.ID) (op t.ID, ei *a.Expr, ej *a.Expr, err er } func (p *parser) parseBlock() ([]*a.Node, error) { - if x := p.peek1().Key(); x != t.KeyOpenCurly { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDOpenCurly { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected "{", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] block := []*a.Node(nil) for len(p.src) > 0 { - if p.src[0].ID.Key() == t.KeyCloseCurly { + if p.src[0].ID == t.IDCloseCurly { p.src = p.src[1:] return block, nil } @@ -512,8 +512,8 @@ func (p *parser) parseBlock() ([]*a.Node, error) { } block = append(block, s) - if x := p.peek1().Key(); x != t.KeySemicolon { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDSemicolon { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected (implicit) ";", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] @@ -524,16 +524,16 @@ func (p *parser) parseBlock() ([]*a.Node, error) { func (p *parser) assertsSorted(asserts []*a.Node) error { seenInv, seenPost := false, false for _, a := range asserts { - switch a.Assert().Keyword().Key() { - case t.KeyAssert: + switch a.Assert().Keyword() { + case t.IDAssert: return fmt.Errorf(`parse: assertion chain cannot contain "assert", `+ `only "pre", "inv" and "post" at %s:%d`, p.filename, p.line()) - case t.KeyPre: + case t.IDPre: if seenPost || seenInv { break } continue - case t.KeyInv: + case t.IDInv: if seenPost { break } @@ -550,15 +550,15 @@ func (p *parser) assertsSorted(asserts []*a.Node) error { } func (p *parser) parseAssertNode() (*a.Node, error) { - switch x := p.peek1(); x.Key() { - case t.KeyAssert, t.KeyPre, t.KeyInv, t.KeyPost: + switch x := p.peek1(); x { + case t.IDAssert, t.IDPre, t.IDInv, t.IDPost: p.src = p.src[1:] condition, err := p.parseExpr() if err != nil { return nil, err } reason, args := t.ID(0), []*a.Node(nil) - if p.peek1().Key() == t.KeyVia { + if p.peek1() == t.IDVia { p.src = p.src[1:] reason = p.peek1() if !reason.IsStrLiteral(p.tm) { @@ -566,7 +566,7 @@ func (p *parser) parseAssertNode() (*a.Node, error) { return nil, fmt.Errorf(`parse: expected string literal, got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] - args, err = p.parseList(t.KeyCloseParen, (*parser).parseArgNode) + args, err = p.parseList(t.IDCloseParen, (*parser).parseArgNode) if err != nil { return nil, err } @@ -594,7 +594,7 @@ func (p *parser) parseStatement() (*a.Node, error) { } func (p *parser) parseLabel() (t.ID, error) { - if p.peek1().Key() == t.KeyColon { + if p.peek1() == t.IDColon { p.src = p.src[1:] return p.parseIdent() } @@ -602,11 +602,11 @@ func (p *parser) parseLabel() (t.ID, error) { } func (p *parser) parseStatement1() (*a.Node, error) { - switch x := p.peek1(); x.Key() { - case t.KeyAssert, t.KeyPre, t.KeyPost: + switch x := p.peek1(); x { + case t.IDAssert, t.IDPre, t.IDPost: return p.parseAssertNode() - case t.KeyBreak, t.KeyContinue: + case t.IDBreak, t.IDContinue: p.src = p.src[1:] label, err := p.parseLabel() if err != nil { @@ -614,25 +614,25 @@ func (p *parser) parseStatement1() (*a.Node, error) { } return a.NewJump(x, label).Node(), nil - case t.KeyIf: + case t.IDIf: o, err := p.parseIf() return o.Node(), err - case t.KeyIterate: + case t.IDIterate: p.src = p.src[1:] label, err := p.parseLabel() if err != nil { return nil, err } - if x := p.peek1().Key(); x != t.KeyOpenBracket { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDOpenBracket { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected "[", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] // TODO: allow expressions, not just literals, as unroll counts? unrollID := p.peek1() - unrollStr := p.tm.ByKey(unrollID.Key()) + unrollStr := p.tm.ByID(unrollID) if !unrollID.IsLiteral(p.tm) { return nil, fmt.Errorf(`parse: expected literal unroll count, got %q at %s:%d`, unrollStr, p.filename, p.line()) @@ -645,13 +645,13 @@ func (p *parser) parseStatement1() (*a.Node, error) { case "1", "2", "4", "8", "16", "32", "64", "128", "256": } unroll := a.NewExpr(0, 0, 0, unrollID, nil, nil, nil, nil) - if x := p.peek1().Key(); x != t.KeyCloseBracket { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDCloseBracket { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected "]", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] - vars, err := p.parseList(t.KeyCloseParen, (*parser).parseIterateVariableNode) + vars, err := p.parseList(t.IDCloseParen, (*parser).parseIterateVariableNode) if err != nil { return nil, err } @@ -665,10 +665,10 @@ func (p *parser) parseStatement1() (*a.Node, error) { } return a.NewIterate(label, unroll, vars, asserts, body).Node(), nil - case t.KeyReturn, t.KeyYield: + case t.IDReturn, t.IDYield: p.src = p.src[1:] value, err := (*a.Expr)(nil), error(nil) - if p.peek1().Key() != t.KeySemicolon { + if p.peek1() != t.IDSemicolon { value, err = p.parseExpr() if err != nil { return nil, err @@ -676,11 +676,11 @@ func (p *parser) parseStatement1() (*a.Node, error) { } return a.NewRet(x, value).Node(), nil - case t.KeyVar: + case t.IDVar: p.src = p.src[1:] return p.parseVar(false) - case t.KeyWhile: + case t.IDWhile: p.src = p.src[1:] label, err := p.parseLabel() if err != nil { @@ -720,10 +720,10 @@ func (p *parser) parseStatement1() (*a.Node, error) { func (p *parser) parseAsserts() ([]*a.Node, error) { asserts := []*a.Node(nil) - if p.peek1().Key() == t.KeyComma { + if p.peek1() == t.IDComma { p.src = p.src[1:] var err error - if asserts, err = p.parseList(t.KeyOpenCurly, (*parser).parseAssertNode); err != nil { + if asserts, err = p.parseList(t.IDOpenCurly, (*parser).parseAssertNode); err != nil { return nil, err } if err := p.assertsSorted(asserts); err != nil { @@ -734,8 +734,8 @@ func (p *parser) parseAsserts() ([]*a.Node, error) { } func (p *parser) parseIf() (*a.If, error) { - if x := p.peek1().Key(); x != t.KeyIf { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDIf { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected "if", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] @@ -748,9 +748,9 @@ func (p *parser) parseIf() (*a.If, error) { return nil, err } elseIf, bodyIfFalse := (*a.If)(nil), ([]*a.Node)(nil) - if p.peek1().Key() == t.KeyElse { + if p.peek1() == t.IDElse { p.src = p.src[1:] - if p.peek1().Key() == t.KeyIf { + if p.peek1() == t.IDIf { elseIf, err = p.parseIf() if err != nil { return nil, err @@ -770,8 +770,8 @@ func (p *parser) parseArgNode() (*a.Node, error) { if err != nil { return nil, err } - if x := p.peek1().Key(); x != t.KeyColon { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDColon { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected ":", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] @@ -800,8 +800,8 @@ func (p *parser) parseVar(inIterate bool) (*a.Node, error) { op := t.ID(0) if inIterate { op = t.IDColon - if x := p.peek1().Key(); x != t.KeyColon { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDColon { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected ":", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] @@ -810,10 +810,10 @@ func (p *parser) parseVar(inIterate bool) (*a.Node, error) { return nil, err } - } else if p.peek1().Key() == t.KeyEq { + } else if p.peek1() == t.IDEq { op = t.IDEq p.src = p.src[1:] - if p.peek1().Key() == t.KeyTry { + if p.peek1() == t.IDTry { value, err = p.parseTryExpr() if err != nil { return nil, err @@ -830,12 +830,12 @@ func (p *parser) parseVar(inIterate bool) (*a.Node, error) { } func (p *parser) parseDollarExpr() (*a.Expr, error) { - if x := p.peek1().Key(); x != t.KeyDollar { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDDollar { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected "$", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] - args, err := p.parseList(t.KeyCloseParen, (*parser).parseExprNode) + args, err := p.parseList(t.IDCloseParen, (*parser).parseExprNode) if err != nil { return nil, err } @@ -843,8 +843,8 @@ func (p *parser) parseDollarExpr() (*a.Expr, error) { } func (p *parser) parseTryExpr() (*a.Expr, error) { - if x := p.peek1().Key(); x != t.KeyTry { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDTry { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected "try", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] @@ -876,7 +876,7 @@ func (p *parser) parseExpr() (*a.Expr, error) { if x := p.peek1(); x.IsBinaryOp() { p.src = p.src[1:] rhs := (*a.Node)(nil) - if x.Key() == t.KeyAs { + if x == t.IDAs { o, err := p.parseTypeExpr() if err != nil { return nil, err @@ -893,7 +893,7 @@ func (p *parser) parseExpr() (*a.Expr, error) { if !x.IsAssociativeOp() || x != p.peek1() { op := x.BinaryForm() if op == 0 { - return nil, fmt.Errorf(`parse: internal error: no binary form for token.Key 0x%02X`, x.Key()) + return nil, fmt.Errorf(`parse: internal error: no binary form for token 0x%02X`, x) } return a.NewExpr(0, op, 0, 0, lhs.Node(), nil, rhs, nil), nil } @@ -909,7 +909,7 @@ func (p *parser) parseExpr() (*a.Expr, error) { } op := x.AssociativeForm() if op == 0 { - return nil, fmt.Errorf(`parse: internal error: no associative form for token.Key 0x%02X`, x.Key()) + return nil, fmt.Errorf(`parse: internal error: no associative form for token 0x%02X`, x) } return a.NewExpr(0, op, 0, 0, nil, nil, nil, args), nil } @@ -926,7 +926,7 @@ func (p *parser) parseOperand() (*a.Expr, error) { } op := x.UnaryForm() if op == 0 { - return nil, fmt.Errorf(`parse: internal error: no unary form for token.Key 0x%02X`, x.Key()) + return nil, fmt.Errorf(`parse: internal error: no unary form for token 0x%02X`, x) } return a.NewExpr(0, op, 0, 0, nil, nil, rhs.Node(), nil), nil @@ -935,21 +935,21 @@ func (p *parser) parseOperand() (*a.Expr, error) { return a.NewExpr(0, 0, 0, x, nil, nil, nil, nil), nil default: - switch x.Key() { - case t.KeyOpenParen: + switch x { + case t.IDOpenParen: p.src = p.src[1:] expr, err := p.parseExpr() if err != nil { return nil, err } - if x := p.peek1().Key(); x != t.KeyCloseParen { - got := p.tm.ByKey(x) + if x := p.peek1(); x != t.IDCloseParen { + got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected ")", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] return expr, nil - case t.KeyError, t.KeyStatus, t.KeySuspension: + case t.IDError, t.IDStatus, t.IDSuspension: keyword := x p.src = p.src[1:] message := p.peek1() @@ -972,33 +972,33 @@ func (p *parser) parseOperand() (*a.Expr, error) { for { flags := a.Flags(0) - switch p.peek1().Key() { + switch p.peek1() { default: return lhs, nil - case t.KeyExclam, t.KeyQuestion: + case t.IDExclam, t.IDQuestion: flags |= a.FlagsImpure | a.FlagsCallImpure - if p.src[0].ID.Key() == t.KeyQuestion { + if p.src[0].ID == t.IDQuestion { flags |= a.FlagsSuspendible | a.FlagsCallSuspendible } p.src = p.src[1:] fallthrough - case t.KeyOpenParen: - args, err := p.parseList(t.KeyCloseParen, (*parser).parseArgNode) + case t.IDOpenParen: + args, err := p.parseList(t.IDCloseParen, (*parser).parseArgNode) if err != nil { return nil, err } lhs = a.NewExpr(flags, t.IDOpenParen, 0, 0, lhs.Node(), nil, nil, args) - case t.KeyOpenBracket: + case t.IDOpenBracket: id0, mhs, rhs, err := p.parseBracket(t.IDColon) if err != nil { return nil, err } lhs = a.NewExpr(0, id0, 0, 0, lhs.Node(), mhs.Node(), rhs.Node(), nil) - case t.KeyDot: + case t.IDDot: p.src = p.src[1:] selector, err := p.parseIdent() if err != nil { diff --git a/lang/render/render.go b/lang/render/render.go index 6e901e51..244c4a57 100644 --- a/lang/render/render.go +++ b/lang/render/render.go @@ -110,19 +110,19 @@ func Render(w io.Writer, tm *t.Map, src []t.Token, comments []string) (err error if prevID != 0 && !prevIsTightRight && !tok.ID.IsTightLeft() { // The "(" token's tight-left-ness is context dependent. For // "f(x)", the "(" is tight-left. For "a * (b + c)", it is not. - if tok.ID.Key() != t.KeyOpenParen || !isCloseIdentStrLiteral(tm, prevID) { + if tok.ID != t.IDOpenParen || !isCloseIdentStrLiteral(tm, prevID) { buf = append(buf, ' ') } } - buf = append(buf, tm.ByToken(tok)...) + buf = append(buf, tm.ByID(tok.ID)...) - if tok.ID.Key() == t.KeyOpenCurly { + if tok.ID == t.IDOpenCurly { if indent == maxIndent { return errors.New("render: too many \"{\" tokens") } indent++ - } else if tok.ID.Key() == t.KeyCloseCurly { + } else if tok.ID == t.IDCloseCurly { if indent == 0 { return errors.New("render: too many \"}\" tokens") } diff --git a/lang/token/list.go b/lang/token/list.go index c5a98069..a1092824 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -18,92 +18,80 @@ package token // integer types. const MaxIntBits = 64 -// Key is the high 16 bits of an ID. It is the map key for a Map. -type Key uint32 - -const ( - FlagsBits = 16 - FlagsMask = 1< 0xFF. -func (x ID) AmbiguousForm() ID { return ambiguousForms[0xFF&(x>>KeyShift)] } -func (x ID) UnaryForm() ID { return unaryForms[0xFF&(x>>KeyShift)] } -func (x ID) BinaryForm() ID { return binaryForms[0xFF&(x>>KeyShift)] } -func (x ID) AssociativeForm() ID { return associativeForms[0xFF&(x>>KeyShift)] } +func (x ID) AmbiguousForm() ID { return ambiguousForms[0xFF&x] } +func (x ID) UnaryForm() ID { return unaryForms[0xFF&x] } +func (x ID) BinaryForm() ID { return binaryForms[0xFF&x] } +func (x ID) AssociativeForm() ID { return associativeForms[0xFF&x] } -func (x ID) Key() Key { return Key(x >> KeyShift) } +func (x ID) IsBuiltIn() bool { return x < nBuiltInIDs } -func (x ID) IsBuiltIn() bool { return Key(x>>KeyShift) < nBuiltInKeys } - -func (x ID) IsUnaryOp() bool { return minOpKey <= x.Key() && x.Key() <= maxOpKey && x.UnaryForm() != 0 } -func (x ID) IsBinaryOp() bool { - return minOpKey <= x.Key() && x.Key() <= maxOpKey && x.BinaryForm() != 0 -} -func (x ID) IsAssociativeOp() bool { - return minOpKey <= x.Key() && x.Key() <= maxOpKey && x.AssociativeForm() != 0 -} +func (x ID) IsUnaryOp() bool { return minOp <= x && x <= maxOp && x.UnaryForm() != 0 } +func (x ID) IsBinaryOp() bool { return minOp <= x && x <= maxOp && x.BinaryForm() != 0 } +func (x ID) IsAssociativeOp() bool { return minOp <= x && x <= maxOp && x.AssociativeForm() != 0 } func (x ID) IsLiteral(m *Map) bool { - if k := x.Key(); k < nBuiltInKeys { - return minBuiltInLiteralKey <= k && k <= maxBuiltInLiteralKey - } else if s := m.ByKey(k); s != "" { + if x < nBuiltInIDs { + return minBuiltInLiteral <= x && x <= maxBuiltInLiteral + } else if s := m.ByID(x); s != "" { return !alpha(s[0]) } return false } func (x ID) IsNumLiteral(m *Map) bool { - if k := x.Key(); k < nBuiltInKeys { - return k == KeyZero - } else if s := m.ByKey(k); s != "" { + if x < nBuiltInIDs { + return x == IDZero + } else if s := m.ByID(x); s != "" { return numeric(s[0]) } return false } func (x ID) IsStrLiteral(m *Map) bool { - if k := x.Key(); k < nBuiltInKeys { + if x < nBuiltInIDs { return false - } else if s := m.ByKey(k); s != "" { + } else if s := m.ByID(x); s != "" { return s[0] == '"' } return false } func (x ID) IsIdent(m *Map) bool { - if k := x.Key(); k < nBuiltInKeys { + if x < nBuiltInIDs { // TODO: move Diamond into the built-in ident space. - return k == KeyDiamond || (minBuiltInIdentKey <= k && k <= maxBuiltInIdentKey) - } else if s := m.ByKey(k); s != "" { + return x == IDDiamond || (minBuiltInIdent <= x && x <= maxBuiltInIdent) + } else if s := m.ByID(x); s != "" { return alpha(s[0]) } return false } -func (x ID) IsOpen() bool { return x.Key() < Key(len(isOpen)) && isOpen[x.Key()] } -func (x ID) IsClose() bool { return x.Key() < Key(len(isClose)) && isClose[x.Key()] } -func (x ID) IsTightLeft() bool { return x.Key() < Key(len(isTightLeft)) && isTightLeft[x.Key()] } -func (x ID) IsTightRight() bool { return x.Key() < Key(len(isTightRight)) && isTightRight[x.Key()] } +func (x ID) IsOpen() bool { return x < ID(len(isOpen)) && isOpen[x] } +func (x ID) IsClose() bool { return x < ID(len(isClose)) && isClose[x] } +func (x ID) IsTightLeft() bool { return x < ID(len(isTightLeft)) && isTightLeft[x] } +func (x ID) IsTightRight() bool { return x < ID(len(isTightRight)) && isTightRight[x] } -func (x ID) IsAssign() bool { return minAssignKey <= x.Key() && x.Key() <= maxAssignKey } -func (x ID) IsNumType() bool { return minNumTypeKey <= x.Key() && x.Key() <= maxNumTypeKey } +func (x ID) IsAssign() bool { return minAssign <= x && x <= maxAssign } +func (x ID) IsNumType() bool { return minNumType <= x && x <= maxNumType } func (x ID) IsImplicitSemicolon(m *Map) bool { return x.IsLiteral(m) || x.IsIdent(m) || - (x.Key() < Key(len(isImplicitSemicolon)) && isImplicitSemicolon[x.Key()]) + (x < ID(len(isImplicitSemicolon)) && isImplicitSemicolon[x]) } -func (x ID) IsXOp() bool { return minXOpKey <= x.Key() && x.Key() <= maxXOpKey } +func (x ID) IsXOp() bool { return minXOp <= x && x <= maxXOp } func (x ID) IsXUnaryOp() bool { return x.IsXOp() && x.IsUnaryOp() } func (x ID) IsXBinaryOp() bool { return x.IsXOp() && x.IsBinaryOp() } func (x ID) IsXAssociativeOp() bool { return x.IsXOp() && x.IsAssociativeOp() } @@ -144,7 +132,7 @@ type Token struct { Line uint32 } -// nBuiltInKeys is the number of built-in Keys. The packing is: +// nBuiltInIDs is the number of built-in IDs. The packing is: // - Zero is invalid. // - [0x01, 0x0F] are reserved for implementation details. // - [0x10, 0x1F] are squiggly punctuation, such as "(", ")" and ";". @@ -157,603 +145,411 @@ type Token struct { // - [0xA8, 0xFF] are identifiers, such as "bool", "u32" and "read_u8". // // "Squiggly" means a sequence of non-alpha-numeric characters, such as "+" and -// "&=". Roughly speaking, their Keys range in [0x01, 0x4F], or disambiguation +// "&=". Roughly speaking, their IDs range in [0x01, 0x4F], or disambiguation // forms range in [0xD0, 0xFF], but vice versa does not necessarily hold. For // example, the "and" operator is not "squiggly" but it is within [0x01, 0x4F]. -const nBuiltInKeys = Key(256) - -const ( - KeyInvalid = Key(0) - - KeyDoubleZ = Key(IDDoubleZ >> KeyShift) - KeyDiamond = Key(IDDiamond >> KeyShift) - - KeyOpenParen = Key(IDOpenParen >> KeyShift) - KeyCloseParen = Key(IDCloseParen >> KeyShift) - KeyOpenBracket = Key(IDOpenBracket >> KeyShift) - KeyCloseBracket = Key(IDCloseBracket >> KeyShift) - KeyOpenCurly = Key(IDOpenCurly >> KeyShift) - KeyCloseCurly = Key(IDCloseCurly >> KeyShift) - - KeyDot = Key(IDDot >> KeyShift) - KeyDotDot = Key(IDDotDot >> KeyShift) - KeyComma = Key(IDComma >> KeyShift) - KeyExclam = Key(IDExclam >> KeyShift) - KeyQuestion = Key(IDQuestion >> KeyShift) - KeyColon = Key(IDColon >> KeyShift) - KeySemicolon = Key(IDSemicolon >> KeyShift) - KeyDollar = Key(IDDollar >> KeyShift) - - KeyEq = Key(IDEq >> KeyShift) - KeyPlusEq = Key(IDPlusEq >> KeyShift) - KeyMinusEq = Key(IDMinusEq >> KeyShift) - KeyStarEq = Key(IDStarEq >> KeyShift) - KeySlashEq = Key(IDSlashEq >> KeyShift) - KeyShiftLEq = Key(IDShiftLEq >> KeyShift) - KeyShiftREq = Key(IDShiftREq >> KeyShift) - KeyAmpEq = Key(IDAmpEq >> KeyShift) - KeyAmpHatEq = Key(IDAmpHatEq >> KeyShift) - KeyPipeEq = Key(IDPipeEq >> KeyShift) - KeyHatEq = Key(IDHatEq >> KeyShift) - KeyPercentEq = Key(IDPercentEq >> KeyShift) - KeyTildePlusEq = Key(IDTildePlusEq >> KeyShift) - - KeyPlus = Key(IDPlus >> KeyShift) - KeyMinus = Key(IDMinus >> KeyShift) - KeyStar = Key(IDStar >> KeyShift) - KeySlash = Key(IDSlash >> KeyShift) - KeyShiftL = Key(IDShiftL >> KeyShift) - KeyShiftR = Key(IDShiftR >> KeyShift) - KeyAmp = Key(IDAmp >> KeyShift) - KeyAmpHat = Key(IDAmpHat >> KeyShift) - KeyPipe = Key(IDPipe >> KeyShift) - KeyHat = Key(IDHat >> KeyShift) - KeyPercent = Key(IDPercent >> KeyShift) - KeyTildePlus = Key(IDTildePlus >> KeyShift) - - KeyNotEq = Key(IDNotEq >> KeyShift) - KeyLessThan = Key(IDLessThan >> KeyShift) - KeyLessEq = Key(IDLessEq >> KeyShift) - KeyEqEq = Key(IDEqEq >> KeyShift) - KeyGreaterEq = Key(IDGreaterEq >> KeyShift) - KeyGreaterThan = Key(IDGreaterThan >> KeyShift) - - // TODO: sort these by name, when the list has stabilized. - KeyAnd = Key(IDAnd >> KeyShift) - KeyOr = Key(IDOr >> KeyShift) - KeyNot = Key(IDNot >> KeyShift) - KeyAs = Key(IDAs >> KeyShift) - KeyRef = Key(IDRef >> KeyShift) - KeyDeref = Key(IDDeref >> KeyShift) - - // TODO: sort these by name, when the list has stabilized. - KeyFunc = Key(IDFunc >> KeyShift) - KeyAssert = Key(IDAssert >> KeyShift) - KeyWhile = Key(IDWhile >> KeyShift) - KeyIf = Key(IDIf >> KeyShift) - KeyElse = Key(IDElse >> KeyShift) - KeyReturn = Key(IDReturn >> KeyShift) - KeyBreak = Key(IDBreak >> KeyShift) - KeyContinue = Key(IDContinue >> KeyShift) - KeyStruct = Key(IDStruct >> KeyShift) - KeyUse = Key(IDUse >> KeyShift) - KeyVar = Key(IDVar >> KeyShift) - KeyPre = Key(IDPre >> KeyShift) - KeyInv = Key(IDInv >> KeyShift) - KeyPost = Key(IDPost >> KeyShift) - KeyVia = Key(IDVia >> KeyShift) - KeyPub = Key(IDPub >> KeyShift) - KeyPri = Key(IDPri >> KeyShift) - KeyError = Key(IDError >> KeyShift) - KeySuspension = Key(IDSuspension >> KeyShift) - KeyPackageID = Key(IDPackageID >> KeyShift) - KeyConst = Key(IDConst >> KeyShift) - KeyTry = Key(IDTry >> KeyShift) - KeyIterate = Key(IDIterate >> KeyShift) - KeyYield = Key(IDYield >> KeyShift) - - KeyArray = Key(IDArray >> KeyShift) - KeyNptr = Key(IDNptr >> KeyShift) - KeyPtr = Key(IDPtr >> KeyShift) - KeySlice = Key(IDSlice >> KeyShift) - - KeyFalse = Key(IDFalse >> KeyShift) - KeyTrue = Key(IDTrue >> KeyShift) - KeyZero = Key(IDZero >> KeyShift) - - KeyUnderscore = Key(IDUnderscore >> KeyShift) - KeyThis = Key(IDThis >> KeyShift) - KeyIn = Key(IDIn >> KeyShift) - KeyOut = Key(IDOut >> KeyShift) - KeySLICE = Key(IDSLICE >> KeyShift) - KeyBase = Key(IDBase >> KeyShift) - - KeyI8 = Key(IDI8 >> KeyShift) - KeyI16 = Key(IDI16 >> KeyShift) - KeyI32 = Key(IDI32 >> KeyShift) - KeyI64 = Key(IDI64 >> KeyShift) - KeyU8 = Key(IDU8 >> KeyShift) - KeyU16 = Key(IDU16 >> KeyShift) - KeyU32 = Key(IDU32 >> KeyShift) - KeyU64 = Key(IDU64 >> KeyShift) - KeyBool = Key(IDBool >> KeyShift) - KeyIOReader = Key(IDIOReader >> KeyShift) - KeyIOWriter = Key(IDIOWriter >> KeyShift) - KeyStatus = Key(IDStatus >> KeyShift) - KeyImageConfig = Key(IDImageConfig >> KeyShift) - - KeyMark = Key(IDMark >> KeyShift) - KeyReadU8 = Key(IDReadU8 >> KeyShift) - KeyReadU16BE = Key(IDReadU16BE >> KeyShift) - KeyReadU16LE = Key(IDReadU16LE >> KeyShift) - KeyReadU32BE = Key(IDReadU32BE >> KeyShift) - KeyReadU32LE = Key(IDReadU32LE >> KeyShift) - KeyReadU64BE = Key(IDReadU64BE >> KeyShift) - KeyReadU64LE = Key(IDReadU64LE >> KeyShift) - KeySinceMark = Key(IDSinceMark >> KeyShift) - KeyWriteU8 = Key(IDWriteU8 >> KeyShift) - KeyWriteU16BE = Key(IDWriteU16BE >> KeyShift) - KeyWriteU16LE = Key(IDWriteU16LE >> KeyShift) - KeyWriteU32BE = Key(IDWriteU32BE >> KeyShift) - KeyWriteU32LE = Key(IDWriteU32LE >> KeyShift) - KeyWriteU64BE = Key(IDWriteU64BE >> KeyShift) - KeyWriteU64LE = Key(IDWriteU64LE >> KeyShift) - - KeyIsError = Key(IDIsError >> KeyShift) - KeyIsOK = Key(IDIsOK >> KeyShift) - KeyIsSuspension = Key(IDIsSuspension >> KeyShift) - KeyCopyFromHistory32 = Key(IDCopyFromHistory32 >> KeyShift) - KeyCopyFromReader32 = Key(IDCopyFromReader32 >> KeyShift) - KeyCopyFromSlice = Key(IDCopyFromSlice >> KeyShift) - KeyCopyFromSlice32 = Key(IDCopyFromSlice32 >> KeyShift) - KeySkip32 = Key(IDSkip32 >> KeyShift) - KeySkip64 = Key(IDSkip64 >> KeyShift) - KeyLength = Key(IDLength >> KeyShift) - KeyAvailable = Key(IDAvailable >> KeyShift) - KeyPrefix = Key(IDPrefix >> KeyShift) - KeySuffix = Key(IDSuffix >> KeyShift) - KeyLimit = Key(IDLimit >> KeyShift) - KeyLowBits = Key(IDLowBits >> KeyShift) - KeyHighBits = Key(IDHighBits >> KeyShift) - KeyUnreadU8 = Key(IDUnreadU8 >> KeyShift) - KeyIsMarked = Key(IDIsMarked >> KeyShift) - - KeyXUnaryPlus = Key(IDXUnaryPlus >> KeyShift) - KeyXUnaryMinus = Key(IDXUnaryMinus >> KeyShift) - KeyXUnaryNot = Key(IDXUnaryNot >> KeyShift) - KeyXUnaryRef = Key(IDXUnaryRef >> KeyShift) - KeyXUnaryDeref = Key(IDXUnaryDeref >> KeyShift) - - KeyXBinaryPlus = Key(IDXBinaryPlus >> KeyShift) - KeyXBinaryMinus = Key(IDXBinaryMinus >> KeyShift) - KeyXBinaryStar = Key(IDXBinaryStar >> KeyShift) - KeyXBinarySlash = Key(IDXBinarySlash >> KeyShift) - KeyXBinaryShiftL = Key(IDXBinaryShiftL >> KeyShift) - KeyXBinaryShiftR = Key(IDXBinaryShiftR >> KeyShift) - KeyXBinaryAmp = Key(IDXBinaryAmp >> KeyShift) - KeyXBinaryAmpHat = Key(IDXBinaryAmpHat >> KeyShift) - KeyXBinaryPipe = Key(IDXBinaryPipe >> KeyShift) - KeyXBinaryHat = Key(IDXBinaryHat >> KeyShift) - KeyXBinaryPercent = Key(IDXBinaryPercent >> KeyShift) - KeyXBinaryNotEq = Key(IDXBinaryNotEq >> KeyShift) - KeyXBinaryLessThan = Key(IDXBinaryLessThan >> KeyShift) - KeyXBinaryLessEq = Key(IDXBinaryLessEq >> KeyShift) - KeyXBinaryEqEq = Key(IDXBinaryEqEq >> KeyShift) - KeyXBinaryGreaterEq = Key(IDXBinaryGreaterEq >> KeyShift) - KeyXBinaryGreaterThan = Key(IDXBinaryGreaterThan >> KeyShift) - KeyXBinaryAnd = Key(IDXBinaryAnd >> KeyShift) - KeyXBinaryOr = Key(IDXBinaryOr >> KeyShift) - KeyXBinaryAs = Key(IDXBinaryAs >> KeyShift) - KeyXBinaryTildePlus = Key(IDXBinaryTildePlus >> KeyShift) - - KeyXAssociativePlus = Key(IDXAssociativePlus >> KeyShift) - KeyXAssociativeStar = Key(IDXAssociativeStar >> KeyShift) - KeyXAssociativeAmp = Key(IDXAssociativeAmp >> KeyShift) - KeyXAssociativePipe = Key(IDXAssociativePipe >> KeyShift) - KeyXAssociativeHat = Key(IDXAssociativeHat >> KeyShift) - KeyXAssociativeAnd = Key(IDXAssociativeAnd >> KeyShift) - KeyXAssociativeOr = Key(IDXAssociativeOr >> KeyShift) -) +const nBuiltInIDs = ID(256) const ( IDInvalid = ID(0) - IDDoubleZ = ID(0x01 << KeyShift) - IDDiamond = ID(0x02 << KeyShift) + IDDoubleZ = ID(0x01) + IDDiamond = ID(0x02) - IDOpenParen = ID(0x10 << KeyShift) - IDCloseParen = ID(0x11 << KeyShift) - IDOpenBracket = ID(0x12 << KeyShift) - IDCloseBracket = ID(0x13 << KeyShift) - IDOpenCurly = ID(0x14 << KeyShift) - IDCloseCurly = ID(0x15 << KeyShift) + IDOpenParen = ID(0x10) + IDCloseParen = ID(0x11) + IDOpenBracket = ID(0x12) + IDCloseBracket = ID(0x13) + IDOpenCurly = ID(0x14) + IDCloseCurly = ID(0x15) - IDDot = ID(0x18 << KeyShift) - IDDotDot = ID(0x19 << KeyShift) - IDComma = ID(0x1A << KeyShift) - IDExclam = ID(0x1B << KeyShift) - IDQuestion = ID(0x1C << KeyShift) - IDColon = ID(0x1D << KeyShift) - IDSemicolon = ID(0x1E << KeyShift) - IDDollar = ID(0x1F << KeyShift) + IDDot = ID(0x18) + IDDotDot = ID(0x19) + IDComma = ID(0x1A) + IDExclam = ID(0x1B) + IDQuestion = ID(0x1C) + IDColon = ID(0x1D) + IDSemicolon = ID(0x1E) + IDDollar = ID(0x1F) ) const ( - minAssignKey = 0x20 - maxAssignKey = 0x2F + minAssign = 0x20 + maxAssign = 0x2F - IDEq = ID(0x20 << KeyShift) - IDPlusEq = ID(0x21 << KeyShift) - IDMinusEq = ID(0x22 << KeyShift) - IDStarEq = ID(0x23 << KeyShift) - IDSlashEq = ID(0x24 << KeyShift) - IDShiftLEq = ID(0x25 << KeyShift) - IDShiftREq = ID(0x26 << KeyShift) - IDAmpEq = ID(0x27 << KeyShift) - IDAmpHatEq = ID(0x28 << KeyShift) - IDPipeEq = ID(0x29 << KeyShift) - IDHatEq = ID(0x2A << KeyShift) - IDPercentEq = ID(0x2B << KeyShift) - IDTildePlusEq = ID(0x2C << KeyShift) + IDEq = ID(0x20) + IDPlusEq = ID(0x21) + IDMinusEq = ID(0x22) + IDStarEq = ID(0x23) + IDSlashEq = ID(0x24) + IDShiftLEq = ID(0x25) + IDShiftREq = ID(0x26) + IDAmpEq = ID(0x27) + IDAmpHatEq = ID(0x28) + IDPipeEq = ID(0x29) + IDHatEq = ID(0x2A) + IDPercentEq = ID(0x2B) + IDTildePlusEq = ID(0x2C) ) const ( - minOpKey = 0x30 - minXOpKey = 0x50 - maxXOpKey = 0x7F - maxOpKey = 0x7F + minOp = 0x30 + minXOp = 0x50 + maxXOp = 0x7F + maxOp = 0x7F - IDPlus = ID(0x31 << KeyShift) - IDMinus = ID(0x32 << KeyShift) - IDStar = ID(0x33 << KeyShift) - IDSlash = ID(0x34 << KeyShift) - IDShiftL = ID(0x35 << KeyShift) - IDShiftR = ID(0x36 << KeyShift) - IDAmp = ID(0x37 << KeyShift) - IDAmpHat = ID(0x38 << KeyShift) - IDPipe = ID(0x39 << KeyShift) - IDHat = ID(0x3A << KeyShift) - IDPercent = ID(0x3B << KeyShift) - IDTildePlus = ID(0x3C << KeyShift) + IDPlus = ID(0x31) + IDMinus = ID(0x32) + IDStar = ID(0x33) + IDSlash = ID(0x34) + IDShiftL = ID(0x35) + IDShiftR = ID(0x36) + IDAmp = ID(0x37) + IDAmpHat = ID(0x38) + IDPipe = ID(0x39) + IDHat = ID(0x3A) + IDPercent = ID(0x3B) + IDTildePlus = ID(0x3C) - IDNotEq = ID(0x40 << KeyShift) - IDLessThan = ID(0x41 << KeyShift) - IDLessEq = ID(0x42 << KeyShift) - IDEqEq = ID(0x43 << KeyShift) - IDGreaterEq = ID(0x44 << KeyShift) - IDGreaterThan = ID(0x45 << KeyShift) + IDNotEq = ID(0x40) + IDLessThan = ID(0x41) + IDLessEq = ID(0x42) + IDEqEq = ID(0x43) + IDGreaterEq = ID(0x44) + IDGreaterThan = ID(0x45) // TODO: sort these by name, when the list has stabilized. - IDAnd = ID(0x48 << KeyShift) - IDOr = ID(0x49 << KeyShift) - IDNot = ID(0x4A << KeyShift) - IDAs = ID(0x4B << KeyShift) - IDRef = ID(0x4C << KeyShift) - IDDeref = ID(0x4D << KeyShift) + IDAnd = ID(0x48) + IDOr = ID(0x49) + IDNot = ID(0x4A) + IDAs = ID(0x4B) + IDRef = ID(0x4C) + IDDeref = ID(0x4D) // The IDXFoo IDs are not returned by the tokenizer. They are used by the // ast.Node ID-typed fields to disambiguate e.g. unary vs binary plus. - IDXUnaryPlus = ID(0x50 << KeyShift) - IDXUnaryMinus = ID(0x51 << KeyShift) - IDXUnaryNot = ID(0x52 << KeyShift) - IDXUnaryRef = ID(0x53 << KeyShift) - IDXUnaryDeref = ID(0x54 << KeyShift) + IDXUnaryPlus = ID(0x50) + IDXUnaryMinus = ID(0x51) + IDXUnaryNot = ID(0x52) + IDXUnaryRef = ID(0x53) + IDXUnaryDeref = ID(0x54) - IDXBinaryPlus = ID(0x58 << KeyShift) - IDXBinaryMinus = ID(0x59 << KeyShift) - IDXBinaryStar = ID(0x5A << KeyShift) - IDXBinarySlash = ID(0x5B << KeyShift) - IDXBinaryShiftL = ID(0x5C << KeyShift) - IDXBinaryShiftR = ID(0x5D << KeyShift) - IDXBinaryAmp = ID(0x5E << KeyShift) - IDXBinaryAmpHat = ID(0x5F << KeyShift) - IDXBinaryPipe = ID(0x60 << KeyShift) - IDXBinaryHat = ID(0x61 << KeyShift) - IDXBinaryPercent = ID(0x62 << KeyShift) - IDXBinaryNotEq = ID(0x63 << KeyShift) - IDXBinaryLessThan = ID(0x64 << KeyShift) - IDXBinaryLessEq = ID(0x65 << KeyShift) - IDXBinaryEqEq = ID(0x66 << KeyShift) - IDXBinaryGreaterEq = ID(0x67 << KeyShift) - IDXBinaryGreaterThan = ID(0x68 << KeyShift) - IDXBinaryAnd = ID(0x69 << KeyShift) - IDXBinaryOr = ID(0x6A << KeyShift) - IDXBinaryAs = ID(0x6B << KeyShift) - IDXBinaryTildePlus = ID(0x6C << KeyShift) + IDXBinaryPlus = ID(0x58) + IDXBinaryMinus = ID(0x59) + IDXBinaryStar = ID(0x5A) + IDXBinarySlash = ID(0x5B) + IDXBinaryShiftL = ID(0x5C) + IDXBinaryShiftR = ID(0x5D) + IDXBinaryAmp = ID(0x5E) + IDXBinaryAmpHat = ID(0x5F) + IDXBinaryPipe = ID(0x60) + IDXBinaryHat = ID(0x61) + IDXBinaryPercent = ID(0x62) + IDXBinaryNotEq = ID(0x63) + IDXBinaryLessThan = ID(0x64) + IDXBinaryLessEq = ID(0x65) + IDXBinaryEqEq = ID(0x66) + IDXBinaryGreaterEq = ID(0x67) + IDXBinaryGreaterThan = ID(0x68) + IDXBinaryAnd = ID(0x69) + IDXBinaryOr = ID(0x6A) + IDXBinaryAs = ID(0x6B) + IDXBinaryTildePlus = ID(0x6C) - IDXAssociativePlus = ID(0x70 << KeyShift) - IDXAssociativeStar = ID(0x71 << KeyShift) - IDXAssociativeAmp = ID(0x72 << KeyShift) - IDXAssociativePipe = ID(0x73 << KeyShift) - IDXAssociativeHat = ID(0x74 << KeyShift) - IDXAssociativeAnd = ID(0x75 << KeyShift) - IDXAssociativeOr = ID(0x76 << KeyShift) + IDXAssociativePlus = ID(0x70) + IDXAssociativeStar = ID(0x71) + IDXAssociativeAmp = ID(0x72) + IDXAssociativePipe = ID(0x73) + IDXAssociativeHat = ID(0x74) + IDXAssociativeAnd = ID(0x75) + IDXAssociativeOr = ID(0x76) ) const ( // TODO: sort these by name, when the list has stabilized. - IDFunc = ID(0x80 << KeyShift) - IDAssert = ID(0x81 << KeyShift) - IDWhile = ID(0x82 << KeyShift) - IDIf = ID(0x83 << KeyShift) - IDElse = ID(0x84 << KeyShift) - IDReturn = ID(0x85 << KeyShift) - IDBreak = ID(0x86 << KeyShift) - IDContinue = ID(0x87 << KeyShift) - IDStruct = ID(0x88 << KeyShift) - IDUse = ID(0x89 << KeyShift) - IDVar = ID(0x8A << KeyShift) - IDPre = ID(0x8B << KeyShift) - IDInv = ID(0x8C << KeyShift) - IDPost = ID(0x8D << KeyShift) - IDVia = ID(0x8E << KeyShift) - IDPub = ID(0x8F << KeyShift) - IDPri = ID(0x90 << KeyShift) - IDError = ID(0x91 << KeyShift) - IDSuspension = ID(0x92 << KeyShift) - IDPackageID = ID(0x93 << KeyShift) - IDConst = ID(0x94 << KeyShift) - IDTry = ID(0x95 << KeyShift) - IDIterate = ID(0x96 << KeyShift) - IDYield = ID(0x97 << KeyShift) + IDFunc = ID(0x80) + IDAssert = ID(0x81) + IDWhile = ID(0x82) + IDIf = ID(0x83) + IDElse = ID(0x84) + IDReturn = ID(0x85) + IDBreak = ID(0x86) + IDContinue = ID(0x87) + IDStruct = ID(0x88) + IDUse = ID(0x89) + IDVar = ID(0x8A) + IDPre = ID(0x8B) + IDInv = ID(0x8C) + IDPost = ID(0x8D) + IDVia = ID(0x8E) + IDPub = ID(0x8F) + IDPri = ID(0x90) + IDError = ID(0x91) + IDSuspension = ID(0x92) + IDPackageID = ID(0x93) + IDConst = ID(0x94) + IDTry = ID(0x95) + IDIterate = ID(0x96) + IDYield = ID(0x97) - IDArray = ID(0xA0 << KeyShift) - IDNptr = ID(0xA1 << KeyShift) - IDPtr = ID(0xA2 << KeyShift) - IDSlice = ID(0xA3 << KeyShift) + IDArray = ID(0xA0) + IDNptr = ID(0xA1) + IDPtr = ID(0xA2) + IDSlice = ID(0xA3) ) const ( - minBuiltInLiteralKey = 0xA4 - maxBuiltInLiteralKey = 0xA7 + minBuiltInLiteral = 0xA4 + maxBuiltInLiteral = 0xA7 - IDFalse = ID(0xA4 << KeyShift) - IDTrue = ID(0xA5 << KeyShift) - IDZero = ID(0xA6 << KeyShift) + IDFalse = ID(0xA4) + IDTrue = ID(0xA5) + IDZero = ID(0xA6) ) const ( - minBuiltInIdentKey = 0xA8 - maxBuiltInIdentKey = 0xFF + minBuiltInIdent = 0xA8 + maxBuiltInIdent = 0xFF - IDUnderscore = ID(0xA8 << KeyShift) - IDThis = ID(0xA9 << KeyShift) - IDIn = ID(0xAA << KeyShift) - IDOut = ID(0xAB << KeyShift) - IDSLICE = ID(0xAC << KeyShift) - IDBase = ID(0xAD << KeyShift) + IDUnderscore = ID(0xA8) + IDThis = ID(0xA9) + IDIn = ID(0xAA) + IDOut = ID(0xAB) + IDSLICE = ID(0xAC) + IDBase = ID(0xAD) - minNumTypeKey = 0xB0 - maxNumTypeKey = 0xB7 + minNumType = 0xB0 + maxNumType = 0xB7 - IDI8 = ID(0xB0 << KeyShift) - IDI16 = ID(0xB1 << KeyShift) - IDI32 = ID(0xB2 << KeyShift) - IDI64 = ID(0xB3 << KeyShift) - IDU8 = ID(0xB4 << KeyShift) - IDU16 = ID(0xB5 << KeyShift) - IDU32 = ID(0xB6 << KeyShift) - IDU64 = ID(0xB7 << KeyShift) + IDI8 = ID(0xB0) + IDI16 = ID(0xB1) + IDI32 = ID(0xB2) + IDI64 = ID(0xB3) + IDU8 = ID(0xB4) + IDU16 = ID(0xB5) + IDU32 = ID(0xB6) + IDU64 = ID(0xB7) - IDBool = ID(0xB8 << KeyShift) - IDIOReader = ID(0xB9 << KeyShift) - IDIOWriter = ID(0xBA << KeyShift) - IDStatus = ID(0xBB << KeyShift) - IDImageConfig = ID(0xBC << KeyShift) + IDBool = ID(0xB8) + IDIOReader = ID(0xB9) + IDIOWriter = ID(0xBA) + IDStatus = ID(0xBB) + IDImageConfig = ID(0xBC) - IDMark = ID(0xC0 << KeyShift) - IDReadU8 = ID(0xC1 << KeyShift) - IDReadU16BE = ID(0xC2 << KeyShift) - IDReadU16LE = ID(0xC3 << KeyShift) - IDReadU32BE = ID(0xC4 << KeyShift) - IDReadU32LE = ID(0xC5 << KeyShift) - IDReadU64BE = ID(0xC6 << KeyShift) - IDReadU64LE = ID(0xC7 << KeyShift) - IDSinceMark = ID(0xC8 << KeyShift) - IDWriteU8 = ID(0xC9 << KeyShift) - IDWriteU16BE = ID(0xCA << KeyShift) - IDWriteU16LE = ID(0xCB << KeyShift) - IDWriteU32BE = ID(0xCC << KeyShift) - IDWriteU32LE = ID(0xCD << KeyShift) - IDWriteU64BE = ID(0xCE << KeyShift) - IDWriteU64LE = ID(0xCF << KeyShift) + IDMark = ID(0xC0) + IDReadU8 = ID(0xC1) + IDReadU16BE = ID(0xC2) + IDReadU16LE = ID(0xC3) + IDReadU32BE = ID(0xC4) + IDReadU32LE = ID(0xC5) + IDReadU64BE = ID(0xC6) + IDReadU64LE = ID(0xC7) + IDSinceMark = ID(0xC8) + IDWriteU8 = ID(0xC9) + IDWriteU16BE = ID(0xCA) + IDWriteU16LE = ID(0xCB) + IDWriteU32BE = ID(0xCC) + IDWriteU32LE = ID(0xCD) + IDWriteU64BE = ID(0xCE) + IDWriteU64LE = ID(0xCF) - IDIsError = ID(0xD0 << KeyShift) - IDIsOK = ID(0xD1 << KeyShift) - IDIsSuspension = ID(0xD2 << KeyShift) - IDCopyFromHistory32 = ID(0xD3 << KeyShift) - IDCopyFromReader32 = ID(0xD4 << KeyShift) - IDCopyFromSlice = ID(0xD5 << KeyShift) - IDCopyFromSlice32 = ID(0xD6 << KeyShift) - IDSkip32 = ID(0xD7 << KeyShift) - IDSkip64 = ID(0xD8 << KeyShift) - IDLength = ID(0xD9 << KeyShift) - IDAvailable = ID(0xDA << KeyShift) - IDPrefix = ID(0xDB << KeyShift) - IDSuffix = ID(0xDC << KeyShift) - IDLimit = ID(0xDD << KeyShift) - IDLowBits = ID(0xDE << KeyShift) - IDHighBits = ID(0xDF << KeyShift) - IDUnreadU8 = ID(0xE0 << KeyShift) - IDIsMarked = ID(0xE1 << KeyShift) + IDIsError = ID(0xD0) + IDIsOK = ID(0xD1) + IDIsSuspension = ID(0xD2) + IDCopyFromHistory32 = ID(0xD3) + IDCopyFromReader32 = ID(0xD4) + IDCopyFromSlice = ID(0xD5) + IDCopyFromSlice32 = ID(0xD6) + IDSkip32 = ID(0xD7) + IDSkip64 = ID(0xD8) + IDLength = ID(0xD9) + IDAvailable = ID(0xDA) + IDPrefix = ID(0xDB) + IDSuffix = ID(0xDC) + IDLimit = ID(0xDD) + IDLowBits = ID(0xDE) + IDHighBits = ID(0xDF) + IDUnreadU8 = ID(0xE0) + IDIsMarked = ID(0xE1) ) -var builtInsByKey = [nBuiltInKeys]struct { +// TODO: the struct{string, ID} can now just be a string. +var builtInsByID = [nBuiltInIDs]struct { name string id ID }{ - // KeyDoubleZ and KeyDiamond (and IDDoubleZ and IDDiamond) are never - // returned by the tokenizer, as the tokenizer rejects non-ASCII input. + // IDDoubleZ and IDDiamond are never returned by the tokenizer, as the + // tokenizer rejects non-ASCII input. // // The string representations "ℤ" and "◊" are specifically non-ASCII so // that no user-defined (non built-in) identifier will conflict with them. - // KeyDoubleZ is used by the type checker as a dummy-valued built-in Key to + // IDDoubleZ is used by the type checker as a dummy-valued built-in ID to // represent an ideal integer type (in mathematical terms, the integer ring // ℤ), as opposed to a realized integer type whose range is restricted. For // example, the u16 type is restricted to [0x0000, 0xFFFF]. - KeyDoubleZ: {"ℤ", IDDoubleZ}, // U+2124 DOUBLE-STRUCK CAPITAL Z + IDDoubleZ: {"ℤ", IDDoubleZ}, // U+2124 DOUBLE-STRUCK CAPITAL Z - // KeyDiamond is used by the type checker as a dummy-valued built-in Key to + // IDDiamond is used by the type checker as a dummy-valued built-in ID to // represent a generic type. - KeyDiamond: {"◊", IDDiamond}, // U+25C7 WHITE DIAMOND + IDDiamond: {"◊", IDDiamond}, // U+25C7 WHITE DIAMOND - KeyOpenParen: {"(", IDOpenParen}, - KeyCloseParen: {")", IDCloseParen}, - KeyOpenBracket: {"[", IDOpenBracket}, - KeyCloseBracket: {"]", IDCloseBracket}, - KeyOpenCurly: {"{", IDOpenCurly}, - KeyCloseCurly: {"}", IDCloseCurly}, + IDOpenParen: {"(", IDOpenParen}, + IDCloseParen: {")", IDCloseParen}, + IDOpenBracket: {"[", IDOpenBracket}, + IDCloseBracket: {"]", IDCloseBracket}, + IDOpenCurly: {"{", IDOpenCurly}, + IDCloseCurly: {"}", IDCloseCurly}, - KeyDot: {".", IDDot}, - KeyDotDot: {"..", IDDotDot}, - KeyComma: {",", IDComma}, - KeyExclam: {"!", IDExclam}, - KeyQuestion: {"?", IDQuestion}, - KeyColon: {":", IDColon}, - KeySemicolon: {";", IDSemicolon}, - KeyDollar: {"$", IDDollar}, + IDDot: {".", IDDot}, + IDDotDot: {"..", IDDotDot}, + IDComma: {",", IDComma}, + IDExclam: {"!", IDExclam}, + IDQuestion: {"?", IDQuestion}, + IDColon: {":", IDColon}, + IDSemicolon: {";", IDSemicolon}, + IDDollar: {"$", IDDollar}, - KeyEq: {"=", IDEq}, - KeyPlusEq: {"+=", IDPlusEq}, - KeyMinusEq: {"-=", IDMinusEq}, - KeyStarEq: {"*=", IDStarEq}, - KeySlashEq: {"/=", IDSlashEq}, - KeyShiftLEq: {"<<=", IDShiftLEq}, - KeyShiftREq: {">>=", IDShiftREq}, - KeyAmpEq: {"&=", IDAmpEq}, - KeyAmpHatEq: {"&^=", IDAmpHatEq}, - KeyPipeEq: {"|=", IDPipeEq}, - KeyHatEq: {"^=", IDHatEq}, - KeyPercentEq: {"%=", IDPercentEq}, - KeyTildePlusEq: {"~+=", IDTildePlusEq}, + IDEq: {"=", IDEq}, + IDPlusEq: {"+=", IDPlusEq}, + IDMinusEq: {"-=", IDMinusEq}, + IDStarEq: {"*=", IDStarEq}, + IDSlashEq: {"/=", IDSlashEq}, + IDShiftLEq: {"<<=", IDShiftLEq}, + IDShiftREq: {">>=", IDShiftREq}, + IDAmpEq: {"&=", IDAmpEq}, + IDAmpHatEq: {"&^=", IDAmpHatEq}, + IDPipeEq: {"|=", IDPipeEq}, + IDHatEq: {"^=", IDHatEq}, + IDPercentEq: {"%=", IDPercentEq}, + IDTildePlusEq: {"~+=", IDTildePlusEq}, - KeyPlus: {"+", IDPlus}, - KeyMinus: {"-", IDMinus}, - KeyStar: {"*", IDStar}, - KeySlash: {"/", IDSlash}, - KeyShiftL: {"<<", IDShiftL}, - KeyShiftR: {">>", IDShiftR}, - KeyAmp: {"&", IDAmp}, - KeyAmpHat: {"&^", IDAmpHat}, - KeyPipe: {"|", IDPipe}, - KeyHat: {"^", IDHat}, - KeyPercent: {"%", IDPercent}, - KeyTildePlus: {"~+", IDPercent}, + IDPlus: {"+", IDPlus}, + IDMinus: {"-", IDMinus}, + IDStar: {"*", IDStar}, + IDSlash: {"/", IDSlash}, + IDShiftL: {"<<", IDShiftL}, + IDShiftR: {">>", IDShiftR}, + IDAmp: {"&", IDAmp}, + IDAmpHat: {"&^", IDAmpHat}, + IDPipe: {"|", IDPipe}, + IDHat: {"^", IDHat}, + IDPercent: {"%", IDPercent}, + IDTildePlus: {"~+", IDPercent}, - KeyNotEq: {"!=", IDNotEq}, - KeyLessThan: {"<", IDLessThan}, - KeyLessEq: {"<=", IDLessEq}, - KeyEqEq: {"==", IDEqEq}, - KeyGreaterEq: {">=", IDGreaterEq}, - KeyGreaterThan: {">", IDGreaterThan}, + IDNotEq: {"!=", IDNotEq}, + IDLessThan: {"<", IDLessThan}, + IDLessEq: {"<=", IDLessEq}, + IDEqEq: {"==", IDEqEq}, + IDGreaterEq: {">=", IDGreaterEq}, + IDGreaterThan: {">", IDGreaterThan}, - KeyAnd: {"and", IDAnd}, - KeyOr: {"or", IDOr}, - KeyNot: {"not", IDNot}, - KeyAs: {"as", IDAs}, - KeyRef: {"ref", IDRef}, - KeyDeref: {"deref", IDDeref}, + IDAnd: {"and", IDAnd}, + IDOr: {"or", IDOr}, + IDNot: {"not", IDNot}, + IDAs: {"as", IDAs}, + IDRef: {"ref", IDRef}, + IDDeref: {"deref", IDDeref}, - KeyFunc: {"func", IDFunc}, - KeyAssert: {"assert", IDAssert}, - KeyWhile: {"while", IDWhile}, - KeyIf: {"if", IDIf}, - KeyElse: {"else", IDElse}, - KeyReturn: {"return", IDReturn}, - KeyBreak: {"break", IDBreak}, - KeyContinue: {"continue", IDContinue}, - KeyStruct: {"struct", IDStruct}, - KeyUse: {"use", IDUse}, - KeyVar: {"var", IDVar}, - KeyPre: {"pre", IDPre}, - KeyInv: {"inv", IDInv}, - KeyPost: {"post", IDPost}, - KeyVia: {"via", IDVia}, - KeyPub: {"pub", IDPub}, - KeyPri: {"pri", IDPri}, - KeyError: {"error", IDError}, - KeySuspension: {"suspension", IDSuspension}, - KeyPackageID: {"packageid", IDPackageID}, - KeyConst: {"const", IDConst}, - KeyTry: {"try", IDTry}, - KeyIterate: {"iterate", IDIterate}, - KeyYield: {"yield", IDYield}, + IDFunc: {"func", IDFunc}, + IDAssert: {"assert", IDAssert}, + IDWhile: {"while", IDWhile}, + IDIf: {"if", IDIf}, + IDElse: {"else", IDElse}, + IDReturn: {"return", IDReturn}, + IDBreak: {"break", IDBreak}, + IDContinue: {"continue", IDContinue}, + IDStruct: {"struct", IDStruct}, + IDUse: {"use", IDUse}, + IDVar: {"var", IDVar}, + IDPre: {"pre", IDPre}, + IDInv: {"inv", IDInv}, + IDPost: {"post", IDPost}, + IDVia: {"via", IDVia}, + IDPub: {"pub", IDPub}, + IDPri: {"pri", IDPri}, + IDError: {"error", IDError}, + IDSuspension: {"suspension", IDSuspension}, + IDPackageID: {"packageid", IDPackageID}, + IDConst: {"const", IDConst}, + IDTry: {"try", IDTry}, + IDIterate: {"iterate", IDIterate}, + IDYield: {"yield", IDYield}, - KeyArray: {"array", IDArray}, - KeyNptr: {"nptr", IDNptr}, - KeyPtr: {"ptr", IDPtr}, - KeySlice: {"slice", IDSlice}, + IDArray: {"array", IDArray}, + IDNptr: {"nptr", IDNptr}, + IDPtr: {"ptr", IDPtr}, + IDSlice: {"slice", IDSlice}, - KeyFalse: {"false", IDFalse}, - KeyTrue: {"true", IDTrue}, - KeyZero: {"0", IDZero}, + IDFalse: {"false", IDFalse}, + IDTrue: {"true", IDTrue}, + IDZero: {"0", IDZero}, - KeyUnderscore: {"_", IDUnderscore}, - KeyThis: {"this", IDThis}, - KeyIn: {"in", IDIn}, - KeyOut: {"out", IDOut}, - KeySLICE: {"SLICE", IDSLICE}, - KeyBase: {"base", IDBase}, + IDUnderscore: {"_", IDUnderscore}, + IDThis: {"this", IDThis}, + IDIn: {"in", IDIn}, + IDOut: {"out", IDOut}, + IDSLICE: {"SLICE", IDSLICE}, + IDBase: {"base", IDBase}, // Change MaxIntBits if a future update adds an i128 or u128 type. - KeyI8: {"i8", IDI8}, - KeyI16: {"i16", IDI16}, - KeyI32: {"i32", IDI32}, - KeyI64: {"i64", IDI64}, - KeyU8: {"u8", IDU8}, - KeyU16: {"u16", IDU16}, - KeyU32: {"u32", IDU32}, - KeyU64: {"u64", IDU64}, - KeyBool: {"bool", IDBool}, - KeyIOReader: {"io_reader", IDIOReader}, - KeyIOWriter: {"io_writer", IDIOWriter}, - KeyStatus: {"status", IDStatus}, - KeyImageConfig: {"image_config", IDImageConfig}, + IDI8: {"i8", IDI8}, + IDI16: {"i16", IDI16}, + IDI32: {"i32", IDI32}, + IDI64: {"i64", IDI64}, + IDU8: {"u8", IDU8}, + IDU16: {"u16", IDU16}, + IDU32: {"u32", IDU32}, + IDU64: {"u64", IDU64}, + IDBool: {"bool", IDBool}, + IDIOReader: {"io_reader", IDIOReader}, + IDIOWriter: {"io_writer", IDIOWriter}, + IDStatus: {"status", IDStatus}, + IDImageConfig: {"image_config", IDImageConfig}, - KeyMark: {"mark", IDMark}, - KeyReadU8: {"read_u8", IDReadU8}, - KeyReadU16BE: {"read_u16be", IDReadU16BE}, - KeyReadU16LE: {"read_u16le", IDReadU16LE}, - KeyReadU32BE: {"read_u32be", IDReadU32BE}, - KeyReadU32LE: {"read_u32le", IDReadU32LE}, - KeyReadU64BE: {"read_u64be", IDReadU64BE}, - KeyReadU64LE: {"read_u64le", IDReadU64LE}, - KeySinceMark: {"since_mark", IDSinceMark}, - KeyWriteU8: {"write_u8", IDWriteU8}, - KeyWriteU16BE: {"write_u16be", IDWriteU16BE}, - KeyWriteU16LE: {"write_u16le", IDWriteU16LE}, - KeyWriteU32BE: {"write_u32be", IDWriteU32BE}, - KeyWriteU32LE: {"write_u32le", IDWriteU32LE}, - KeyWriteU64BE: {"write_u64be", IDWriteU64BE}, - KeyWriteU64LE: {"write_u64le", IDWriteU64LE}, + IDMark: {"mark", IDMark}, + IDReadU8: {"read_u8", IDReadU8}, + IDReadU16BE: {"read_u16be", IDReadU16BE}, + IDReadU16LE: {"read_u16le", IDReadU16LE}, + IDReadU32BE: {"read_u32be", IDReadU32BE}, + IDReadU32LE: {"read_u32le", IDReadU32LE}, + IDReadU64BE: {"read_u64be", IDReadU64BE}, + IDReadU64LE: {"read_u64le", IDReadU64LE}, + IDSinceMark: {"since_mark", IDSinceMark}, + IDWriteU8: {"write_u8", IDWriteU8}, + IDWriteU16BE: {"write_u16be", IDWriteU16BE}, + IDWriteU16LE: {"write_u16le", IDWriteU16LE}, + IDWriteU32BE: {"write_u32be", IDWriteU32BE}, + IDWriteU32LE: {"write_u32le", IDWriteU32LE}, + IDWriteU64BE: {"write_u64be", IDWriteU64BE}, + IDWriteU64LE: {"write_u64le", IDWriteU64LE}, - KeyIsError: {"is_error", IDIsError}, - KeyIsOK: {"is_ok", IDIsOK}, - KeyIsSuspension: {"is_suspension", IDIsSuspension}, - KeyCopyFromHistory32: {"copy_from_history32", IDCopyFromHistory32}, - KeyCopyFromReader32: {"copy_from_reader32", IDCopyFromReader32}, - KeyCopyFromSlice: {"copy_from_slice", IDCopyFromSlice}, - KeyCopyFromSlice32: {"copy_from_slice32", IDCopyFromSlice32}, - KeySkip32: {"skip32", IDSkip32}, - KeySkip64: {"skip64", IDSkip64}, - KeyLength: {"length", IDLength}, - KeyAvailable: {"available", IDAvailable}, - KeyPrefix: {"prefix", IDPrefix}, - KeySuffix: {"suffix", IDSuffix}, - KeyLimit: {"limit", IDLimit}, - KeyLowBits: {"low_bits", IDLowBits}, - KeyHighBits: {"high_bits", IDHighBits}, - KeyUnreadU8: {"unread_u8", IDUnreadU8}, - KeyIsMarked: {"is_marked", IDIsMarked}, + IDIsError: {"is_error", IDIsError}, + IDIsOK: {"is_ok", IDIsOK}, + IDIsSuspension: {"is_suspension", IDIsSuspension}, + IDCopyFromHistory32: {"copy_from_history32", IDCopyFromHistory32}, + IDCopyFromReader32: {"copy_from_reader32", IDCopyFromReader32}, + IDCopyFromSlice: {"copy_from_slice", IDCopyFromSlice}, + IDCopyFromSlice32: {"copy_from_slice32", IDCopyFromSlice32}, + IDSkip32: {"skip32", IDSkip32}, + IDSkip64: {"skip64", IDSkip64}, + IDLength: {"length", IDLength}, + IDAvailable: {"available", IDAvailable}, + IDPrefix: {"prefix", IDPrefix}, + IDSuffix: {"suffix", IDSuffix}, + IDLimit: {"limit", IDLimit}, + IDLowBits: {"low_bits", IDLowBits}, + IDHighBits: {"high_bits", IDHighBits}, + IDUnreadU8: {"unread_u8", IDUnreadU8}, + IDIsMarked: {"is_marked", IDIsMarked}, } var builtInsByName = map[string]ID{} func init() { - for _, x := range builtInsByKey { + for _, x := range builtInsByID { if x.name != "" { builtInsByName[x.name] = x.id } @@ -761,7 +557,7 @@ func init() { } // squiggles are built-in IDs that aren't alpha-numeric. -var squiggles = [256]ID{ +var squiggles = [nBuiltInIDs]ID{ '(': IDOpenParen, ')': IDCloseParen, '[': IDOpenBracket, @@ -786,7 +582,7 @@ type suffixLexer struct { // // The order of the []suffixLexer elements matters. The first match wins. Since // we want to lex greedily, longer suffixes should be earlier in the slice. -var lexers = [256][]suffixLexer{ +var lexers = [nBuiltInIDs][]suffixLexer{ '.': { {".", IDDotDot}, {"", IDDot}, @@ -851,42 +647,42 @@ var lexers = [256][]suffixLexer{ }, } -var ambiguousForms = [256]ID{ - KeyXUnaryPlus: IDPlus, - KeyXUnaryMinus: IDMinus, - KeyXUnaryNot: IDNot, - KeyXUnaryRef: IDRef, - KeyXUnaryDeref: IDDeref, +var ambiguousForms = [nBuiltInIDs]ID{ + IDXUnaryPlus: IDPlus, + IDXUnaryMinus: IDMinus, + IDXUnaryNot: IDNot, + IDXUnaryRef: IDRef, + IDXUnaryDeref: IDDeref, - KeyXBinaryPlus: IDPlus, - KeyXBinaryMinus: IDMinus, - KeyXBinaryStar: IDStar, - KeyXBinarySlash: IDSlash, - KeyXBinaryShiftL: IDShiftL, - KeyXBinaryShiftR: IDShiftR, - KeyXBinaryAmp: IDAmp, - KeyXBinaryAmpHat: IDAmpHat, - KeyXBinaryPipe: IDPipe, - KeyXBinaryHat: IDHat, - KeyXBinaryPercent: IDPercent, - KeyXBinaryNotEq: IDNotEq, - KeyXBinaryLessThan: IDLessThan, - KeyXBinaryLessEq: IDLessEq, - KeyXBinaryEqEq: IDEqEq, - KeyXBinaryGreaterEq: IDGreaterEq, - KeyXBinaryGreaterThan: IDGreaterThan, - KeyXBinaryAnd: IDAnd, - KeyXBinaryOr: IDOr, - KeyXBinaryAs: IDAs, - KeyXBinaryTildePlus: IDTildePlus, + IDXBinaryPlus: IDPlus, + IDXBinaryMinus: IDMinus, + IDXBinaryStar: IDStar, + IDXBinarySlash: IDSlash, + IDXBinaryShiftL: IDShiftL, + IDXBinaryShiftR: IDShiftR, + IDXBinaryAmp: IDAmp, + IDXBinaryAmpHat: IDAmpHat, + IDXBinaryPipe: IDPipe, + IDXBinaryHat: IDHat, + IDXBinaryPercent: IDPercent, + IDXBinaryNotEq: IDNotEq, + IDXBinaryLessThan: IDLessThan, + IDXBinaryLessEq: IDLessEq, + IDXBinaryEqEq: IDEqEq, + IDXBinaryGreaterEq: IDGreaterEq, + IDXBinaryGreaterThan: IDGreaterThan, + IDXBinaryAnd: IDAnd, + IDXBinaryOr: IDOr, + IDXBinaryAs: IDAs, + IDXBinaryTildePlus: IDTildePlus, - KeyXAssociativePlus: IDPlus, - KeyXAssociativeStar: IDStar, - KeyXAssociativeAmp: IDAmp, - KeyXAssociativePipe: IDPipe, - KeyXAssociativeHat: IDHat, - KeyXAssociativeAnd: IDAnd, - KeyXAssociativeOr: IDOr, + IDXAssociativePlus: IDPlus, + IDXAssociativeStar: IDStar, + IDXAssociativeAmp: IDAmp, + IDXAssociativePipe: IDPipe, + IDXAssociativeHat: IDHat, + IDXAssociativeAnd: IDAnd, + IDXAssociativeOr: IDOr, } func init() { @@ -898,123 +694,123 @@ func init() { // addXForms modifies table so that, if table[x] == y, then table[y] = y. // // For example, for the unaryForms table, the explicit entries are like: -// KeyPlus: IDXUnaryPlus, +// IDPlus: IDXUnaryPlus, // and this function implicitly addes entries like: -// KeyXUnaryPlus: IDXUnaryPlus, -func addXForms(table *[256]ID) { - implicitEntries := [256]ID{} +// IDXUnaryPlus: IDXUnaryPlus, +func addXForms(table *[nBuiltInIDs]ID) { + implicitEntries := [nBuiltInIDs]bool{} for _, y := range table { if y != 0 { - implicitEntries[y.Key()] = y + implicitEntries[y] = true } } - for _, y := range implicitEntries { - if y != 0 { - table[y.Key()] = y + for y, implicit := range implicitEntries { + if implicit { + table[y] = ID(y) } } } -var unaryForms = [256]ID{ - KeyPlus: IDXUnaryPlus, - KeyMinus: IDXUnaryMinus, - KeyNot: IDXUnaryNot, - KeyRef: IDXUnaryRef, - KeyDeref: IDXUnaryDeref, +var unaryForms = [nBuiltInIDs]ID{ + IDPlus: IDXUnaryPlus, + IDMinus: IDXUnaryMinus, + IDNot: IDXUnaryNot, + IDRef: IDXUnaryRef, + IDDeref: IDXUnaryDeref, } -var binaryForms = [256]ID{ - KeyPlusEq: IDXBinaryPlus, - KeyMinusEq: IDXBinaryMinus, - KeyStarEq: IDXBinaryStar, - KeySlashEq: IDXBinarySlash, - KeyShiftLEq: IDXBinaryShiftL, - KeyShiftREq: IDXBinaryShiftR, - KeyAmpEq: IDXBinaryAmp, - KeyAmpHatEq: IDXBinaryAmpHat, - KeyPipeEq: IDXBinaryPipe, - KeyHatEq: IDXBinaryHat, - KeyPercentEq: IDXBinaryPercent, - KeyTildePlusEq: IDXBinaryTildePlus, +var binaryForms = [nBuiltInIDs]ID{ + IDPlusEq: IDXBinaryPlus, + IDMinusEq: IDXBinaryMinus, + IDStarEq: IDXBinaryStar, + IDSlashEq: IDXBinarySlash, + IDShiftLEq: IDXBinaryShiftL, + IDShiftREq: IDXBinaryShiftR, + IDAmpEq: IDXBinaryAmp, + IDAmpHatEq: IDXBinaryAmpHat, + IDPipeEq: IDXBinaryPipe, + IDHatEq: IDXBinaryHat, + IDPercentEq: IDXBinaryPercent, + IDTildePlusEq: IDXBinaryTildePlus, - KeyPlus: IDXBinaryPlus, - KeyMinus: IDXBinaryMinus, - KeyStar: IDXBinaryStar, - KeySlash: IDXBinarySlash, - KeyShiftL: IDXBinaryShiftL, - KeyShiftR: IDXBinaryShiftR, - KeyAmp: IDXBinaryAmp, - KeyAmpHat: IDXBinaryAmpHat, - KeyPipe: IDXBinaryPipe, - KeyHat: IDXBinaryHat, - KeyPercent: IDXBinaryPercent, - KeyNotEq: IDXBinaryNotEq, - KeyLessThan: IDXBinaryLessThan, - KeyLessEq: IDXBinaryLessEq, - KeyEqEq: IDXBinaryEqEq, - KeyGreaterEq: IDXBinaryGreaterEq, - KeyGreaterThan: IDXBinaryGreaterThan, - KeyAnd: IDXBinaryAnd, - KeyOr: IDXBinaryOr, - KeyAs: IDXBinaryAs, - KeyTildePlus: IDXBinaryTildePlus, + IDPlus: IDXBinaryPlus, + IDMinus: IDXBinaryMinus, + IDStar: IDXBinaryStar, + IDSlash: IDXBinarySlash, + IDShiftL: IDXBinaryShiftL, + IDShiftR: IDXBinaryShiftR, + IDAmp: IDXBinaryAmp, + IDAmpHat: IDXBinaryAmpHat, + IDPipe: IDXBinaryPipe, + IDHat: IDXBinaryHat, + IDPercent: IDXBinaryPercent, + IDNotEq: IDXBinaryNotEq, + IDLessThan: IDXBinaryLessThan, + IDLessEq: IDXBinaryLessEq, + IDEqEq: IDXBinaryEqEq, + IDGreaterEq: IDXBinaryGreaterEq, + IDGreaterThan: IDXBinaryGreaterThan, + IDAnd: IDXBinaryAnd, + IDOr: IDXBinaryOr, + IDAs: IDXBinaryAs, + IDTildePlus: IDXBinaryTildePlus, } -var associativeForms = [256]ID{ - KeyPlus: IDXAssociativePlus, - KeyStar: IDXAssociativeStar, - KeyAmp: IDXAssociativeAmp, - KeyPipe: IDXAssociativePipe, - KeyHat: IDXAssociativeHat, - KeyAnd: IDXAssociativeAnd, - KeyOr: IDXAssociativeOr, - // TODO: KeyTildePlus? +var associativeForms = [nBuiltInIDs]ID{ + IDPlus: IDXAssociativePlus, + IDStar: IDXAssociativeStar, + IDAmp: IDXAssociativeAmp, + IDPipe: IDXAssociativePipe, + IDHat: IDXAssociativeHat, + IDAnd: IDXAssociativeAnd, + IDOr: IDXAssociativeOr, + // TODO: IDTildePlus? } var isOpen = [...]bool{ - KeyOpenParen: true, - KeyOpenBracket: true, - KeyOpenCurly: true, + IDOpenParen: true, + IDOpenBracket: true, + IDOpenCurly: true, } var isClose = [...]bool{ - KeyCloseParen: true, - KeyCloseBracket: true, - KeyCloseCurly: true, + IDCloseParen: true, + IDCloseBracket: true, + IDCloseCurly: true, } var isTightLeft = [...]bool{ - KeyCloseParen: true, - KeyOpenBracket: true, - KeyCloseBracket: true, + IDCloseParen: true, + IDOpenBracket: true, + IDCloseBracket: true, - KeyDot: true, - KeyDotDot: true, - KeyComma: true, - KeyExclam: true, - KeyQuestion: true, - KeyColon: true, - KeySemicolon: true, + IDDot: true, + IDDotDot: true, + IDComma: true, + IDExclam: true, + IDQuestion: true, + IDColon: true, + IDSemicolon: true, } var isTightRight = [...]bool{ - KeyOpenParen: true, - KeyOpenBracket: true, + IDOpenParen: true, + IDOpenBracket: true, - KeyDot: true, - KeyDotDot: true, - KeyExclam: true, - KeyQuestion: true, - KeyColon: true, - KeyDollar: true, + IDDot: true, + IDDotDot: true, + IDExclam: true, + IDQuestion: true, + IDColon: true, + IDDollar: true, } var isImplicitSemicolon = [...]bool{ - KeyCloseParen: true, - KeyCloseBracket: true, - KeyCloseCurly: true, + IDCloseParen: true, + IDCloseBracket: true, + IDCloseCurly: true, - KeyReturn: true, - KeyBreak: true, - KeyContinue: true, + IDReturn: true, + IDBreak: true, + IDContinue: true, } diff --git a/lang/token/token.go b/lang/token/token.go index 6273782d..f22d1041 100644 --- a/lang/token/token.go +++ b/lang/token/token.go @@ -20,6 +20,7 @@ import ( ) const ( + maxID = 1048575 maxLine = 1048575 maxTokenSize = 1023 ) @@ -33,7 +34,7 @@ func Unescape(s string) (unescaped string, ok bool) { type Map struct { byName map[string]ID - byKey []string + byID []string } func (m *Map) Insert(name string) (ID, error) { @@ -50,13 +51,12 @@ func (m *Map) Insert(name string) (ID, error) { return id, nil } - key := nBuiltInKeys + Key(len(m.byKey)) - if key > maxKey { + id := nBuiltInIDs + ID(len(m.byID)) + if id > maxID { return 0, errors.New("token: too many distinct tokens") } - id := ID(key << KeyShift) m.byName[name] = id - m.byKey = append(m.byKey, name) + m.byID = append(m.byID, name) return id, nil } @@ -70,16 +70,13 @@ func (m *Map) ByName(name string) ID { return 0 } -func (m *Map) ByID(x ID) string { return m.ByKey(Key(x >> KeyShift)) } -func (m *Map) ByToken(t Token) string { return m.ByKey(Key(t.ID >> KeyShift)) } - -func (m *Map) ByKey(k Key) string { - if k < nBuiltInKeys { - return builtInsByKey[k].name +func (m *Map) ByID(x ID) string { + if x < nBuiltInIDs { + return builtInsByID[x].name } - k -= nBuiltInKeys - if uint(k) < uint(len(m.byKey)) { - return m.byKey[k] + x -= nBuiltInIDs + if uint(x) < uint(len(m.byID)) { + return m.byID[x] } return "" }