close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go.tools/ssa: give consistent positions for CanonicalPos(Literal). 

(There are only seven ast.Expr types that can be constant.)

R=gri
CC=golang-dev
https://golang.org/cl/10766044
This commit is contained in:
Alan Donovan 2013-07-08 18:02:50 -04:00
parent 8846992823
commit 5da7e5a1a8
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ssa/source.go
View File

@ -169,21 +169,24 @@ func CanonicalPos(n ast.Node) token.Pos {
return CanonicalPos(n.X) return CanonicalPos(n.X)
case *ast.CallExpr: case *ast.CallExpr:
// f(x): *Call, *Go, *Defer. // f(x): *Call, *Go, *Defer, *Literal (e.g. len)
// T(x): *ChangeType, *Convert, *MakeInterface, *ChangeInterface. // T(x): *ChangeType, *Convert, *MakeInterface, *ChangeInterface, *Literal.
// make(): *MakeMap, *MakeChan, *MakeSlice. // make(): *MakeMap, *MakeChan, *MakeSlice.
// new(): *Alloc. // new(): *Alloc.
// panic(): *Panic. // panic(): *Panic.
return n.Lparen return n.Lparen
case *ast.BasicLit:
return n.ValuePos // *Literal
case *ast.Ident: case *ast.Ident:
return n.NamePos // *Parameter, *Alloc, *Capture return n.NamePos // *Parameter, *Alloc, *Capture, *Literal
case *ast.TypeAssertExpr: case *ast.TypeAssertExpr:
return n.Lparen // *ChangeInterface or *TypeAssertExpr return n.Lparen // *ChangeInterface or *TypeAssertExpr
case *ast.SelectorExpr: case *ast.SelectorExpr:
return n.Sel.NamePos // *MakeClosure, *Field or *FieldAddr return n.Sel.NamePos // *MakeClosure, *Field, *FieldAddr, *Literal
case *ast.FuncLit: case *ast.FuncLit:
return n.Type.Func // *Function or *MakeClosure return n.Type.Func // *Function or *MakeClosure
@ -192,10 +195,10 @@ func CanonicalPos(n ast.Node) token.Pos {
return n.Lbrace // *Alloc or *Slice return n.Lbrace // *Alloc or *Slice
case *ast.BinaryExpr: case *ast.BinaryExpr:
return n.OpPos // *Phi or *BinOp return n.OpPos // *Phi, *BinOp or *Literal
case *ast.UnaryExpr: case *ast.UnaryExpr:
return n.OpPos // *Phi or *UnOp return n.OpPos // *Phi, *UnOp, or *Literal
case *ast.IndexExpr: case *ast.IndexExpr:
return n.Lbrack // *Index or *IndexAddr return n.Lbrack // *Index or *IndexAddr
@ -222,7 +225,5 @@ func CanonicalPos(n ast.Node) token.Pos {
return n.Colon // *MapUpdate return n.Colon // *MapUpdate
} }
// Almost anything can be a constant expression (*Literal). return token.NoPos
// TODO(adonovan): actually that's not so; audit and restrict.
return n.Pos()
} }

3
ssa/ssa.go
View File

@ -378,7 +378,8 @@ type Parameter struct {
// constants. // constants.
// //
// Pos() returns the canonical position (see CanonicalPos) of the // Pos() returns the canonical position (see CanonicalPos) of the
// originating constant expression, if explicit in the source. // originating constant expression (ast.Ident or ast.BasicLit, or
// ast.{Call,Selector,Unary,Binary}Expr), if explicit in the source.
// //
// Example printed form: // Example printed form:
// 42:int // 42:int