Commit6471399

authored

Merge pull request#40 from jmuk/prev_boundary

fix crashes on prev_boundary

2 parentsc3db7a7 +1f2f591 commit6471399Copy full SHA for 6471399

File tree

+20

-0

lines changed

+20

-0

lines changed

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -629,6 +629,9 @@ impl GraphemeCursor {`
`629`	`629`	`ifself.offset ==0{`
`630`	`630`	`returnOk(None);`
`631`	`631`	`}`
	`632`	`+ifself.offset == chunk_start{`
	`633`	`+returnErr(GraphemeIncomplete::PrevChunk);`
	`634`	`+}`
`632`	`635`	`letmut iter = chunk[..self.offset - chunk_start].chars().rev();`
`633`	`636`	`letmut ch = iter.next().unwrap();`
`634`	`637`	`loop{`
`@@ -652,6 +655,7 @@ impl GraphemeCursor {`
`652`	`655`	`self.decide(true);`
`653`	`656`	`}else{`
`654`	`657`	`self.resuming =true;`
	`658`	`+self.cat_after =Some(gr::grapheme_category(ch));`
`655`	`659`	`returnErr(GraphemeIncomplete::PrevChunk);`
`656`	`660`	`}`
`657`	`661`	`}`
`@@ -682,3 +686,19 @@ fn test_grapheme_cursor_chunk_start_require_precontext() {`
`682`	`686`	`c.provide_context(&s[..1],0);`
`683`	`687`	`assert_eq!(c.is_boundary(&s[1..],1),Ok(false));`
`684`	`688`	`}`
	`689`	`+`
	`690`	`+#[test]`
	`691`	`+fntest_grapheme_cursor_prev_boundary(){`
	`692`	`+let s ="abcd";`
	`693`	`+letmut c =GraphemeCursor::new(3, s.len(),true);`
	`694`	`+assert_eq!(c.prev_boundary(&s[2..],2),Err(GraphemeIncomplete::PrevChunk));`
	`695`	`+assert_eq!(c.prev_boundary(&s[..2],0),Ok(Some(2)));`
	`696`	`+}`
	`697`	`+`
	`698`	`+#[test]`
	`699`	`+fntest_grapheme_cursor_prev_boundary_chunk_start(){`
	`700`	`+let s ="abcd";`
	`701`	`+letmut c =GraphemeCursor::new(2, s.len(),true);`
	`702`	`+assert_eq!(c.prev_boundary(&s[2..],2),Err(GraphemeIncomplete::PrevChunk));`
	`703`	`+assert_eq!(c.prev_boundary(&s[..2],0),Ok(Some(1)));`
	`704`	`+}`

Comments

(0)