StarMirror/blackfriday
1
0
Fork 0
mirror of https://github.com/russross/blackfriday.git synced 2024-03-22 13:40:34 +08:00
Code Issues Projects Releases Wiki Activity

comments, minor cleanups

Browse Source
This commit is contained in:
Russ Ross 2011-05-31 16:28:07 -06:00
parent b6e6530815
commit 921ac7d0be
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
block.go
View File

@ -562,29 +562,31 @@ func blockFencedCode(out *bytes.Buffer, rndr *render, data []byte) int {
func blockTable(out *bytes.Buffer, rndr *render, data []byte) int {
var header_work bytes.Buffer
i, columns, col_data := blockTableHeader(&header_work, rndr, data)
if i > 0 {
var body_work bytes.Buffer
if i == 0 {
return 0
}
for i < len(data) {
pipes, row_start := 0, i
for ; i < len(data) && data[i] != '\n'; i++ {
if data[i] == '|' {
pipes++
}
var body_work bytes.Buffer
for i < len(data) {
pipes, row_start := 0, i
for ; i < len(data) && data[i] != '\n'; i++ {
if data[i] == '|' {
pipes++
}
if pipes == 0 || i == len(data) {
i = row_start
break
}
blockTableRow(&body_work, rndr, data[row_start:i], columns, col_data)
i++
}
if rndr.mk.Table != nil {
rndr.mk.Table(out, header_work.Bytes(), body_work.Bytes(), col_data, rndr.mk.Opaque)
if pipes == 0 || i == len(data) {
i = row_start
break
}
blockTableRow(&body_work, rndr, data[row_start:i], columns, col_data)
i++
}
if rndr.mk.Table != nil {
rndr.mk.Table(out, header_work.Bytes(), body_work.Bytes(), col_data, rndr.mk.Opaque)
}
return i

9
inline.go
View File

@ -20,6 +20,7 @@ import (
// offset is the number of valid chars before the current cursor
func parseInline(out *bytes.Buffer, rndr *render, data []byte) {
// this is called recursively: enforce a maximum depth
if rndr.nesting >= rndr.maxNesting {
return
}
@ -45,12 +46,12 @@ func parseInline(out *bytes.Buffer, rndr *render, data []byte) {
// call the trigger
parser := rndr.inline[data[end]]
end = parser(out, rndr, data, i)
if end == 0 { // no action from the callback
if consumed := parser(out, rndr, data, i); consumed == 0 {
// no action from the callback; buffer the byte for later
end = i + 1
} else {
i += end
// skip past whatever the callback used
i += consumed
end = i
}
}