Commit 2592e099 authored by Josh Bleecher Snyder's avatar Josh Bleecher Snyder

cmd/compile: s/typeX/typX/

Apparently I’m having a hard time following my
own naming scheme.

Change-Id: I99c801bef09fa65c1f0e8ecc2fba154a495e9c17
Reviewed-on: https://go-review.googlesource.com/21332Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
parent 8640b51d
...@@ -3050,7 +3050,7 @@ func (p *parser) hidden_type_misc() *Type { ...@@ -3050,7 +3050,7 @@ func (p *parser) hidden_type_misc() *Type {
default: default:
// LCHAN hidden_type_non_recv_chan // LCHAN hidden_type_non_recv_chan
s2 := p.hidden_type_non_recv_chan() s2 := p.hidden_type_non_recv_chan()
ss := typeChan(s2, Cboth) ss := typChan(s2, Cboth)
return ss return ss
case '(': case '(':
...@@ -3058,14 +3058,14 @@ func (p *parser) hidden_type_misc() *Type { ...@@ -3058,14 +3058,14 @@ func (p *parser) hidden_type_misc() *Type {
p.next() p.next()
s3 := p.hidden_type_recv_chan() s3 := p.hidden_type_recv_chan()
p.want(')') p.want(')')
ss := typeChan(s3, Cboth) ss := typChan(s3, Cboth)
return ss return ss
case LCOMM: case LCOMM:
// LCHAN hidden_type // LCHAN hidden_type
p.next() p.next()
s3 := p.hidden_type() s3 := p.hidden_type()
ss := typeChan(s3, Csend) ss := typChan(s3, Csend)
return ss return ss
} }
...@@ -3084,7 +3084,7 @@ func (p *parser) hidden_type_recv_chan() *Type { ...@@ -3084,7 +3084,7 @@ func (p *parser) hidden_type_recv_chan() *Type {
p.want(LCHAN) p.want(LCHAN)
s3 := p.hidden_type() s3 := p.hidden_type()
ss := typeChan(s3, Crecv) ss := typChan(s3, Crecv)
return ss return ss
} }
......
...@@ -251,16 +251,16 @@ func typSlice(elem *Type) *Type { ...@@ -251,16 +251,16 @@ func typSlice(elem *Type) *Type {
return t return t
} }
// typeDDDArray returns a new [...]T array Type. // typDDDArray returns a new [...]T array Type.
func typeDDDArray(elem *Type) *Type { func typDDDArray(elem *Type) *Type {
t := typ(TARRAY) t := typ(TARRAY)
t.Type = elem t.Type = elem
t.Bound = dddBound t.Bound = dddBound
return t return t
} }
// typeChan returns a new chan Type with direction dir. // typChan returns a new chan Type with direction dir.
func typeChan(elem *Type, dir uint8) *Type { func typChan(elem *Type, dir uint8) *Type {
t := typ(TCHAN) t := typ(TCHAN)
t.Type = elem t.Type = elem
t.Chan = dir t.Chan = dir
......
...@@ -342,7 +342,7 @@ OpSwitch: ...@@ -342,7 +342,7 @@ OpSwitch:
if l == nil { if l == nil {
t = typSlice(r.Type) t = typSlice(r.Type)
} else if l.Op == ODDD { } else if l.Op == ODDD {
t = typeDDDArray(r.Type) t = typDDDArray(r.Type)
if top&Ecomplit == 0 && n.Diag == 0 { if top&Ecomplit == 0 && n.Diag == 0 {
t.Broke = true t.Broke = true
n.Diag = 1 n.Diag = 1
...@@ -413,7 +413,7 @@ OpSwitch: ...@@ -413,7 +413,7 @@ OpSwitch:
n.Type = nil n.Type = nil
return n return n
} }
t := typeChan(l.Type, uint8(n.Etype)) // TODO(marvin): Fix Node.EType type union. t := typChan(l.Type, uint8(n.Etype)) // TODO(marvin): Fix Node.EType type union.
n.Op = OTYPE n.Op = OTYPE
n.Type = t n.Type = t
n.Left = nil n.Left = nil
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment