github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bump(k8s.io/gengo):6a1c24d7f08e671c244023ca9367d2dfbfaf57fc

pull/6/head
Clayton Coleman 2016-10-14 00:51:24 -04:00
parent d7f1484e6f
commit 2d034f2a1a
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Godeps/Godeps.json generated
View File

@ -2586,43 +2586,43 @@
},
{
"ImportPath": "k8s.io/gengo/args",
"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
},
{
"ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators",
"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
},
{
"ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators",
"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
},
{
"ImportPath": "k8s.io/gengo/examples/import-boss/generators",
"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
},
{
"ImportPath": "k8s.io/gengo/examples/set-gen/generators",
"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
},
{
"ImportPath": "k8s.io/gengo/examples/set-gen/sets",
"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
},
{
"ImportPath": "k8s.io/gengo/generator",
"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
},
{
"ImportPath": "k8s.io/gengo/namer",
"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
},
{
"ImportPath": "k8s.io/gengo/parser",
"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
},
{
"ImportPath": "k8s.io/gengo/types",
"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
},
{
"ImportPath": "k8s.io/heapster/metrics/api/v1/types",

11
vendor/k8s.io/gengo/parser/parse.go generated vendored
View File

@ -453,6 +453,7 @@ func (b *Builder) findTypesIn(pkgPath string, u *types.Universe) error {
if ok {
t := b.walkType(*u, nil, tn.Type())
c1 := b.priorCommentLines(obj.Pos(), 1)
// c1.Text() is safe if c1 is nil
t.CommentLines = splitLines(c1.Text())
if c1 == nil {
t.SecondClosestCommentLines = splitLines(b.priorCommentLines(obj.Pos(), 2).Text())
@ -463,7 +464,15 @@ func (b *Builder) findTypesIn(pkgPath string, u *types.Universe) error {
tf, ok := obj.(*tc.Func)
// We only care about functions, not concrete/abstract methods.
if ok && tf.Type() != nil && tf.Type().(*tc.Signature).Recv() == nil {
b.addFunction(*u, nil, tf)
t := b.addFunction(*u, nil, tf)
c1 := b.priorCommentLines(obj.Pos(), 1)
// c1.Text() is safe if c1 is nil
t.CommentLines = splitLines(c1.Text())
if c1 == nil {
t.SecondClosestCommentLines = splitLines(b.priorCommentLines(obj.Pos(), 2).Text())
} else {
t.SecondClosestCommentLines = splitLines(b.priorCommentLines(c1.List[0].Slash, 2).Text())
}
}
tv, ok := obj.(*tc.Var)
if ok && !tv.IsField() {