Commitfbba2a6

authored

Merge pull request#79 from cessen/ascii_grapheme_optimization

Implement a special-case lookup for ascii grapheme categories.

2 parents485767a +945dbb6 commitfbba2a6Copy full SHA for fbba2a6

File tree

+23

-5

lines changed

+23

-5

lines changed

Lines changed: 23 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -284,12 +284,30 @@ impl GraphemeCursor {`
`284`	`284`
`285`	`285`	`fngrapheme_category(&mutself,ch:char) ->GraphemeCat{`
`286`	`286`	`use tables::graphemeas gr;`
`287`		`-// If this char isn't within the cached range, update the cache to the`
`288`		`-// range that includes it.`
`289`		`-if(chasu32) <self.grapheme_cat_cache.0 \|\|(chasu32) >self.grapheme_cat_cache.1{`
`290`		`-self.grapheme_cat_cache = gr::grapheme_category(ch);`
	`287`	`+use tables::grapheme::GraphemeCat::*;`
	`288`	`+`
	`289`	`+if ch <='\u{7e}'{`
	`290`	`+// Special-case optimization for ascii, except U+007F. This`
	`291`	`+// improves performance even for many primarily non-ascii texts,`
	`292`	`+// due to use of punctuation and white space characters from the`
	`293`	`+// ascii range.`
	`294`	`+if ch >='\u{20}'{`
	`295`	`+GC_Any`
	`296`	`+}elseif ch =='\n'{`
	`297`	`+GC_LF`
	`298`	`+}elseif ch =='\r'{`
	`299`	`+GC_CR`
	`300`	`+}else{`
	`301`	`+GC_Control`
	`302`	`+}`
	`303`	`+}else{`
	`304`	`+// If this char isn't within the cached range, update the cache to the`
	`305`	`+// range that includes it.`
	`306`	`+if(chasu32) <self.grapheme_cat_cache.0 \|\|(chasu32) >self.grapheme_cat_cache.1{`
	`307`	`+self.grapheme_cat_cache = gr::grapheme_category(ch);`
	`308`	`+}`
	`309`	`+self.grapheme_cat_cache.2`
`291`	`310`	`}`
`292`		`-self.grapheme_cat_cache.2`
`293`	`311`	`}`
`294`	`312`
`295`	`313`	`// Not sure I'm gonna keep this, the advantage over new() seems thin.`

Comments

(0)