diff --git a/internal/cgen/expr.go b/internal/cgen/expr.go index 4a326c85..5b2b69d6 100644 --- a/internal/cgen/expr.go +++ b/internal/cgen/expr.go @@ -499,8 +499,6 @@ var cOpNames = [...]string{ t.IDXUnaryPlus: " + ", t.IDXUnaryMinus: " - ", t.IDXUnaryNot: " ! ", - t.IDXUnaryRef: " & ", - t.IDXUnaryDeref: " * ", t.IDXBinaryPlus: " + ", t.IDXBinaryMinus: " - ", diff --git a/lang/ast/string.go b/lang/ast/string.go index 7a02a00a..618e28b5 100644 --- a/lang/ast/string.go +++ b/lang/ast/string.go @@ -146,8 +146,6 @@ var opStrings = [...]string{ t.IDXUnaryPlus: "+", t.IDXUnaryMinus: "-", t.IDXUnaryNot: "not ", - t.IDXUnaryRef: "ref ", - t.IDXUnaryDeref: "deref ", t.IDXBinaryPlus: " + ", t.IDXBinaryMinus: " - ", diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index ffa8b676..8dfab7a1 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -53,8 +53,8 @@ var Statuses = [...]string{ `"#too much data"`, } -// TODO: a collection of forbidden variable names like and, or, not, as, ref, -// deref, false, true, in, out, this, u8, u16, etc? +// TODO: a collection of forbidden variable names like and, or, not, as, false, +// true, in, out, this, u8, u16, etc? var Types = []string{ // TODO: i8, i16, i32, i64. diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 6e3c7d96..9dba3e25 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -1321,8 +1321,6 @@ func (q *checker) bcheckExprUnaryOp(n *a.Expr, depth uint32) (bounds, error) { return bounds{neg(rb[1]), neg(rb[0])}, nil case t.IDXUnaryNot: return bounds{zero, one}, nil - case t.IDXUnaryRef, t.IDXUnaryDeref: - return q.bcheckTypeExpr(n.MType()) } return bounds{}, fmt.Errorf("check: unrecognized token (0x%X) for bcheckExprUnaryOp", n.Operator()) diff --git a/lang/check/type.go b/lang/check/type.go index 668e94b9..f05fb9c5 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -659,17 +659,6 @@ func (q *checker) tcheckExprUnaryOp(n *a.Expr, depth uint32) error { } n.SetMType(typeExprBool) return nil - - case t.IDXUnaryRef: - // TODO. - - 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 (0x%X) for tcheckExprUnaryOp", n.Operator()) } diff --git a/lang/token/list.go b/lang/token/list.go index a5579798..a99667dc 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -287,18 +287,12 @@ const ( IDNot = ID(0x4A) IDAs = ID(0x4B) - // TODO: are these unused? Can we drop them (and their XUnary forms)? - 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) IDXUnaryMinus = ID(0x51) IDXUnaryNot = ID(0x52) - IDXUnaryRef = ID(0x53) - IDXUnaryDeref = ID(0x54) IDXBinaryPlus = ID(0x58) IDXBinaryMinus = ID(0x59) @@ -669,12 +663,10 @@ var builtInsByID = [nBuiltInIDs]string{ IDGreaterEq: ">=", IDGreaterThan: ">", - IDAnd: "and", - IDOr: "or", - IDNot: "not", - IDAs: "as", - IDRef: "ref", - IDDeref: "deref", + IDAnd: "and", + IDOr: "or", + IDNot: "not", + IDAs: "as", IDFunc: "func", IDAssert: "assert", @@ -1050,8 +1042,6 @@ var ambiguousForms = [nBuiltInSymbolicIDs]ID{ IDXUnaryPlus: IDPlus, IDXUnaryMinus: IDMinus, IDXUnaryNot: IDNot, - IDXUnaryRef: IDRef, - IDXUnaryDeref: IDDeref, IDXBinaryPlus: IDPlus, IDXBinaryMinus: IDMinus, @@ -1117,8 +1107,6 @@ var unaryForms = [nBuiltInSymbolicIDs]ID{ IDPlus: IDXUnaryPlus, IDMinus: IDXUnaryMinus, IDNot: IDXUnaryNot, - IDRef: IDXUnaryRef, - IDDeref: IDXUnaryDeref, } var binaryForms = [nBuiltInSymbolicIDs]ID{