goprotobuf: Fix Marshal crash on typed nil.

Also a bunch of other trivial updates.

R=r
CC=golang-dev
http://codereview.appspot.com/6501064

proto/all_test.go

@@ -1221,6 +1221,14 @@ func TestRequiredFieldEnforcement(t *testing.T) {
 	}
 }
 
+func TestTypedNilMarshal(t *testing.T) {
+	// A typed nil should return ErrNil and not crash.
+	_, err := Marshal((*GoEnum)(nil))
+	if err != ErrNil {
+		t.Errorf("Marshal: got err %v, want ErrNil", err)
+	}
+}
+
 // A type that implements the Marshaler interface, but is not nillable.
 type nonNillableInt uint64
 

proto/clone_test.go

@@ -32,7 +32,6 @@
 package proto_test
 
 import (
-	"log"
 	"testing"
 
 	"code.google.com/p/goprotobuf/proto"
@@ -62,7 +61,7 @@ func init() {
 		Data: proto.String("extension"),
 	}
 	if err := proto.SetExtension(cloneTestMessage, pb.E_Ext_More, ext); err != nil {
-		log.Fatalf("SetExtension: %v", err)
+		panic("SetExtension: " + err.Error())
 	}
 }
 

proto/encode.go

@@ -196,6 +196,9 @@ func (p *Buffer) Marshal(pb Message) error {
 	}
 
 	t, b, err := getbase(pb)
+	if b == 0 {
+		return ErrNil
+	}
 	if err == nil {
 		err = p.enc_struct(t.Elem(), GetProperties(t.Elem()), b)
 	}

proto/equal_test.go

@@ -32,7 +32,6 @@
 package proto_test
 
 import (
-	"log"
 	"testing"
 
 	pb "./testdata"
@@ -56,32 +55,32 @@ func init() {
 
 	// messageWithExtension1a has ext1, but never marshals it.
 	if err := SetExtension(messageWithExtension1a, pb.E_Ext_More, ext1); err != nil {
-		log.Panicf("SetExtension on 1a failed: %v", err)
+		panic("SetExtension on 1a failed: " + err.Error())
 	}
 
 	// messageWithExtension1b is the unmarshaled form of messageWithExtension1a.
 	if err := SetExtension(messageWithExtension1b, pb.E_Ext_More, ext1); err != nil {
-		log.Panicf("SetExtension on 1b failed: %v", err)
+		panic("SetExtension on 1b failed: " + err.Error())
 	}
 	buf, err := Marshal(messageWithExtension1b)
 	if err != nil {
-		log.Panicf("Marshal of 1b failed: %v", err)
+		panic("Marshal of 1b failed: " + err.Error())
 	}
 	messageWithExtension1b.Reset()
 	if err := Unmarshal(buf, messageWithExtension1b); err != nil {
-		log.Panicf("Unmarshal of 1b failed: %v", err)
+		panic("Unmarshal of 1b failed: " + err.Error())
 	}
 
 	// messageWithExtension2 has ext2.
 	if err := SetExtension(messageWithExtension2, pb.E_Ext_More, ext2); err != nil {
-		log.Panicf("SetExtension on 2 failed: %v", err)
+		panic("SetExtension on 2 failed: " + err.Error())
 	}
 
 	if err := SetExtension(messageWithInt32Extension1, pb.E_Ext_Number, Int32(23)); err != nil {
-		log.Panicf("SetExtension on Int32-1 failed: %v", err)
+		panic("SetExtension on Int32-1 failed: " + err.Error())
 	}
 	if err := SetExtension(messageWithInt32Extension1, pb.E_Ext_Number, Int32(24)); err != nil {
-		log.Panicf("SetExtension on Int32-2 failed: %v", err)
+		panic("SetExtension on Int32-2 failed: " + err.Error())
 	}
 }
 

proto/text.go

@@ -91,7 +91,7 @@ func (w *textWriter) indent() { w.ind++ }
 
 func (w *textWriter) unindent() {
 	if w.ind == 0 {
-		log.Printf("proto: textWriter unindented too far!")
+		log.Printf("proto: textWriter unindented too far")
 		return
 	}
 	w.ind--
@@ -456,7 +456,7 @@ func MarshalTextString(pb Message) string {
 	return buf.String()
 }
 
-// CompactText writes a given protocl buffer in compact text format (one line).
+// CompactText writes a given protocol buffer in compact text format (one line).
 func CompactText(w io.Writer, pb Message) { marshalText(w, pb, true) }
 
 // CompactTextString is the same as CompactText, but returns the string directly.

protoc-gen-go/descriptor/descriptor.pb.golden

@@ -1,4 +1,5 @@
-// Code generated by protoc-gen-go from "google/protobuf/descriptor.proto"
+// Code generated by protoc-gen-go.
+// source: google/protobuf/descriptor.proto
 // DO NOT EDIT!
 
 package google_protobuf

protoc-gen-go/generator/generator.go

@@ -322,7 +322,7 @@ type Object interface {
 func uniquePackageOf(fd *descriptor.FileDescriptorProto) string {
 	s, ok := uniquePackageName[fd]
 	if !ok {
-		log.Fatal("internal error: no package name defined for", fd.GetName())
+		log.Fatal("internal error: no package name defined for " + fd.GetName())
 	}
 	return s
 }
@@ -362,16 +362,14 @@ func New() *Generator {
 // Error reports a problem, including an error, and exits the program.
 func (g *Generator) Error(err error, msgs ...string) {
 	s := strings.Join(msgs, " ") + ":" + err.Error()
-	log.Println("protoc-gen-go: error:", s)
-	g.Response.Error = proto.String(s)
+	log.Print("protoc-gen-go: error:", s)
 	os.Exit(1)
 }
 
 // Fail reports a problem and exits the program.
 func (g *Generator) Fail(msgs ...string) {
 	s := strings.Join(msgs, " ")
-	log.Println("protoc-gen-go: error:", s)
-	g.Response.Error = proto.String(s)
+	log.Print("protoc-gen-go: error:", s)
 	os.Exit(1)
 }
 
@@ -891,7 +889,8 @@ func (g *Generator) generate(file *FileDescriptor) {
 
 // Generate the header, including package definition
 func (g *Generator) generateHeader() {
-	g.P("// Code generated by protoc-gen-go from ", Quote(*g.file.Name))
+	g.P("// Code generated by protoc-gen-go.")
+	g.P("// source: ", *g.file.Name)
 	g.P("// DO NOT EDIT!")
 	g.P()
 	g.P("package ", g.file.PackageName())
@@ -1388,7 +1387,7 @@ func (g *Generator) generateMessage(message *Descriptor) {
 			obj := g.ObjectNamed(field.GetTypeName())
 			enum, ok := obj.(*EnumDescriptor)
 			if !ok {
-				log.Println("don't know how to generate constant for", fieldname)
+				log.Print("don't know how to generate constant for", fieldname)
 				continue
 			}
 			def = g.DefaultPackageName(enum) + enum.prefix() + def

protoc-gen-go/plugin/plugin.pb.golden

@@ -1,4 +1,5 @@
-// Code generated by protoc-gen-go from "google/protobuf/compiler/plugin.proto"
+// Code generated by protoc-gen-go.
+// source: google/protobuf/compiler/plugin.proto
 // DO NOT EDIT!
 
 package google_protobuf_compiler

protoc-gen-go/testdata/imp.pb.go.golden

@@ -1,4 +1,5 @@
-// Code generated by protoc-gen-go from "imp.proto"
+// Code generated by protoc-gen-go.
+// source: imp.proto
 // DO NOT EDIT!
 
 package imp

protoc-gen-go/testdata/my_test/test.pb.go

@@ -1,4 +1,5 @@
-// Code generated by protoc-gen-go from "my_test/test.proto"
+// Code generated by protoc-gen-go.
+// source: my_test/test.proto
 // DO NOT EDIT!
 
 package my_test

protoc-gen-go/testdata/my_test/test.pb.go.golden

@@ -1,4 +1,5 @@
-// Code generated by protoc-gen-go from "my_test/test.proto"
+// Code generated by protoc-gen-go.
+// source: my_test/test.proto
 // DO NOT EDIT!
 
 package my_test