Merge lp:~niemeyer/goyaml/fix-1191981 into lp:goyaml

[Gustavo Niemeyer]

Test and fix bug #1191981.

https://codereview.appspot.com/10417043/

[Gustavo Niemeyer (niemeyer)]

Reviewers: mp+170372_code.launchpad.net,

Message:
Please take a look.

Description:
Test and fix bug #1191981.

https://code.launchpad.net/~niemeyer/goyaml/fix-1191981/+merge/170372

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/10417043/

Affected files:
   A [revision details]
   M apic.go
   M decode_test.go
   M scannerc.go
   M yamlprivateh.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: apic.go
=== modified file 'apic.go'
--- apic.go 2013-04-30 18:59:24 +0000
+++ apic.go 2013-06-19 14:22:59 +0000
@@ -83,10 +83,10 @@
  // Create a new emitter object.
  func yaml_emitter_initialize(emitter *yaml_emitter_t) bool {
   *emitter = yaml_emitter_t{
- buffer: make([]byte, output_buffer_size),
- raw_buffer: make([]byte, 0, output_raw_buffer_size),
- states: make([]yaml_emitter_state_t, 0, initial_stack_size),
- events: make([]yaml_event_t, 0, initial_queue_size),
+ buffer: make([]byte, output_buffer_size),
+ raw_buffer: make([]byte, 0, output_raw_buffer_size),
+ states: make([]yaml_emitter_state_t, 0, initial_stack_size),
+ events: make([]yaml_event_t, 0, initial_queue_size),
   }
   return true
  }

Index: decode_test.go
=== modified file 'decode_test.go'
--- decode_test.go 2013-05-29 17:23:20 +0000
+++ decode_test.go 2013-06-19 14:22:34 +0000
@@ -300,7 +300,7 @@
    &struct{ B []int }{[]int{1, 2}},
   },

- // BUG #1133337
+ // Bug #1133337
   {
    "foo: ''",
    map[string]*string{"foo": new(string)},
@@ -317,22 +317,46 @@
     B int "-"
    }{1, 0},
   },
+
+ // Bug #1191981
+ {
+ "" +
+ "%YAML 1.1\n" +
+ "--- !!str\n" +
+ `"Generic line break (no glyph)\n\` + "\n" +
+ ` Generic line break (glyphed)\n\` + "\n" +
+ ` Line separator\u2028\` + "\n" +
+ ` Paragraph separator\u2029"` + "\n",
+ "" +
+ "Generic line break (no glyph)\n" +
+ "Generic line break (glyphed)\n" +
+ "Line separator\u2028Paragraph separator\u2029",
+ },
  }

  func (s *S) TestUnmarshal(c *C) {
   for i, item := range unmarshalTests {
    t := reflect.ValueOf(item.value).Type()
    var value interface{}
- if t.Kind() == reflect.Map {
+ switch t.Kind() {
+ case reflect.Map:
     value = reflect.MakeMap(t).Interface()
- } else {
+ case reflect.String:
+ t := reflect.ValueOf(item.value).Type()
+ v := reflect.New(t)
+ value = v.Interface()
+ default:
     pt := reflect.ValueOf(item.value).Type()
     pv := reflect.New(pt.Elem())
     value = pv.Interface()
    }
    err := goyaml.Unmarshal([]byte(item.data), value)
    c.Assert(err, IsNil, Commentf("Item #%d", i))
- c.Assert(value, DeepEquals, item.value)
+ if t.Kind() == reflect.String {
+ c.Assert(*value.(*string), Equals, item.value, Commentf("Item #%d", i))
+ } else {
+ c.Assert(value, DeepEquals, item.value, Commentf("Item #%d", i))
+ }
   }
  }

Index: scannerc.go
=== modified file 'scannerc.go'
--- sc...

[Gustavo Niemeyer (niemeyer)]

*** Submitted:

Test and fix bug #1191981.

R=
CC=
https://codereview.appspot.com/10417043

https://codereview.appspot.com/10417043/

[Roger Peppe (rogpeppe)]

https://codereview.appspot.com/10417043/diff/3001/yamlprivateh.go
File yamlprivateh.go (right):

https://codereview.appspot.com/10417043/diff/3001/yamlprivateh.go#newcode117
yamlprivateh.go:117: return ( // is_break:
how about changing all of these to omit the brackets?

return b[i] == '\r' ||
    etc

https://codereview.appspot.com/10417043/

[Gustavo Niemeyer (niemeyer)]

On 2013/06/19 14:57:59, rog wrote:
> https://codereview.appspot.com/10417043/diff/3001/yamlprivateh.go
> File yamlprivateh.go (right):

https://codereview.appspot.com/10417043/diff/3001/yamlprivateh.go#newcode117
> yamlprivateh.go:117: return ( // is_break:
> how about changing all of these to omit the brackets?

> return b[i] == '\r' ||
> etc

That's unrelated to this fix. I've just run go fmt.

https://codereview.appspot.com/10417043/

=== modified file 'apic.go'
--- apic.go	2013-04-30 18:59:24 +0000
+++ apic.go	2013-06-19 14:26:30 +0000
@@ -83,10 +83,10 @@
 // Create a new emitter object.
 func yaml_emitter_initialize(emitter *yaml_emitter_t) bool {
 	*emitter = yaml_emitter_t{
-		buffer:         make([]byte, output_buffer_size),
-		raw_buffer:     make([]byte, 0, output_raw_buffer_size),
-		states:         make([]yaml_emitter_state_t, 0, initial_stack_size),
-		events:         make([]yaml_event_t, 0, initial_queue_size),
+		buffer:     make([]byte, output_buffer_size),
+		raw_buffer: make([]byte, 0, output_raw_buffer_size),
+		states:     make([]yaml_emitter_state_t, 0, initial_stack_size),
+		events:     make([]yaml_event_t, 0, initial_queue_size),
 	}
 	return true
 }

=== modified file 'decode_test.go'
--- decode_test.go	2013-05-29 17:23:20 +0000
+++ decode_test.go	2013-06-19 14:26:30 +0000
@@ -300,7 +300,7 @@
 		&struct{ B []int }{[]int{1, 2}},
 	},
 
-	// BUG #1133337
+	// Bug #1133337
 	{
 		"foo: ''",
 		map[string]*string{"foo": new(string)},
@@ -317,22 +317,46 @@
 			B int "-"
 		}{1, 0},
 	},
+
+	// Bug #1191981
+	{
+		"" +
+			"%YAML 1.1\n" +
+			"--- !!str\n" +
+			`"Generic line break (no glyph)\n\` + "\n" +
+			` Generic line break (glyphed)\n\` + "\n" +
+			` Line separator\u2028\` + "\n" +
+			` Paragraph separator\u2029"` + "\n",
+		"" +
+			"Generic line break (no glyph)\n" +
+			"Generic line break (glyphed)\n" +
+			"Line separator\u2028Paragraph separator\u2029",
+	},
 }
 
 func (s *S) TestUnmarshal(c *C) {
 	for i, item := range unmarshalTests {
 		t := reflect.ValueOf(item.value).Type()
 		var value interface{}
-		if t.Kind() == reflect.Map {
+		switch t.Kind() {
+		case reflect.Map:
 			value = reflect.MakeMap(t).Interface()
-		} else {
+		case reflect.String:
+			t := reflect.ValueOf(item.value).Type()
+			v := reflect.New(t)
+			value = v.Interface()
+		default:
 			pt := reflect.ValueOf(item.value).Type()
 			pv := reflect.New(pt.Elem())
 			value = pv.Interface()
 		}
 		err := goyaml.Unmarshal([]byte(item.data), value)
 		c.Assert(err, IsNil, Commentf("Item #%d", i))
-		c.Assert(value, DeepEquals, item.value)
+		if t.Kind() == reflect.String {
+			c.Assert(*value.(*string), Equals, item.value, Commentf("Item #%d", i))
+		} else {
+			c.Assert(value, DeepEquals, item.value, Commentf("Item #%d", i))
+		}
 	}
 }
 

=== modified file 'scannerc.go'
--- scannerc.go	2013-04-30 21:29:04 +0000
+++ scannerc.go	2013-06-19 14:26:30 +0000
@@ -2520,7 +2520,7 @@
 		// Join the whitespaces or fold line breaks.
 		if leading_blanks {
 			// Do we need to fold line breaks?
-			if leading_break[0] == '\n' {
+			if len(leading_break) > 0 && leading_break[0] == '\n' {
 				if len(trailing_breaks) == 0 {
 					s = append(s, ' ')
 				} else {

=== modified file 'yamlprivateh.go'
--- yamlprivateh.go	2013-04-30 19:42:40 +0000
+++ yamlprivateh.go	2013-06-19 14:26:30 +0000
@@ -114,8 +114,8 @@
 // Check if the character is a line break or NUL.
 func is_breakz(b []byte, i int) bool {
 	//return is_break(b, i) || is_z(b, i)
-	return (// is_break:
-		b[i] == '\r' || // CR (#xD)
+	return (        // is_break:
+	b[i] == '\r' || // CR (#xD)
 		b[i] == '\n' || // LF (#xA)
 		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
 		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
@@ -127,8 +127,8 @@
 // Check if the character is a line break, space, or NUL.
 func is_spacez(b []byte, i int) bool {
 	//return is_space(b, i) || is_breakz(b, i)
-	return (// is_space:
-		b[i] == ' ' ||
+	return ( // is_space:
+	b[i] == ' ' ||
 		// is_breakz:
 		b[i] == '\r' || // CR (#xD)
 		b[i] == '\n' || // LF (#xA)
@@ -141,8 +141,8 @@
 // Check if the character is a line break, space, tab, or NUL.
 func is_blankz(b []byte, i int) bool {
 	//return is_blank(b, i) || is_breakz(b, i)
-	return (// is_blank:
-		b[i] == ' ' || b[i] == '\t' ||
+	return ( // is_blank:
+	b[i] == ' ' || b[i] == '\t' ||
 		// is_breakz:
 		b[i] == '\r' || // CR (#xD)
 		b[i] == '\n' || // LF (#xA)