Fix shadow declarations

This commit is contained in:
Cameron Moore 2019-11-29 13:20:34 -06:00
parent 9f9f8f0e5e
commit 748be0c096
6 changed files with 20 additions and 22 deletions

View file

@ -436,7 +436,7 @@ func Walk(n Node, walker Walker) error {
} }
if status != WalkSkipChildren { if status != WalkSkipChildren {
for c := n.FirstChild(); c != nil; c = c.NextSibling() { for c := n.FirstChild(); c != nil; c = c.NextSibling() {
if err := Walk(c, walker); err != nil { if err = Walk(c, walker); err != nil {
return err return err
} }
} }

View file

@ -84,10 +84,10 @@ func (b *tableParagraphTransformer) parseRow(segment text.Segment, alignments []
closure = len(line[pos:]) closure = len(line[pos:])
} }
node := ast.NewTableCell() node := ast.NewTableCell()
segment := text.NewSegment(segment.Start+pos, segment.Start+pos+closure) seg := text.NewSegment(segment.Start+pos, segment.Start+pos+closure)
segment = segment.TrimLeftSpace(source) seg = seg.TrimLeftSpace(source)
segment = segment.TrimRightSpace(source) seg = seg.TrimRightSpace(source)
node.Lines().Append(segment) node.Lines().Append(seg)
node.Alignment = alignment node.Alignment = alignment
row.AppendChild(row, node) row.AppendChild(row, node)
pos += closure + 1 pos += closure + 1

View file

@ -2,9 +2,10 @@ package parser
import ( import (
"bytes" "bytes"
"strconv"
"github.com/yuin/goldmark/text" "github.com/yuin/goldmark/text"
"github.com/yuin/goldmark/util" "github.com/yuin/goldmark/util"
"strconv"
) )
var attrNameID = []byte("id") var attrNameID = []byte("id")
@ -104,7 +105,7 @@ func parseAttribute(reader text.Reader) (Attribute, bool) {
} }
i := 0 i := 0
for ; i < len(line); i++ { for ; i < len(line); i++ {
c := line[i] c = line[i]
if !((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || if !((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
(c >= '0' && c <= '9') || (c >= '0' && c <= '9') ||
c == '_' || c == ':' || c == '.' || c == '-') { c == '_' || c == ':' || c == '.' || c == '-') {
@ -125,7 +126,6 @@ func parseAttribute(reader text.Reader) (Attribute, bool) {
return Attribute{}, false return Attribute{}, false
} }
return Attribute{Name: name, Value: value}, true return Attribute{Name: name, Value: value}, true
} }
func parseAttributeValue(reader text.Reader) (interface{}, bool) { func parseAttributeValue(reader text.Reader) (interface{}, bool) {
@ -153,7 +153,6 @@ func parseAttributeValue(reader text.Reader) (interface{}, bool) {
return nil, false return nil, false
} }
return value, true return value, true
} }
func parseAttributeArray(reader text.Reader) ([]interface{}, bool) { func parseAttributeArray(reader text.Reader) ([]interface{}, bool) {

View file

@ -108,19 +108,19 @@ func (b *atxHeadingParser) Open(parent ast.Node, reader text.Reader, pc Context)
start-- start--
closureClose := -1 closureClose := -1
closureOpen := -1 closureOpen := -1
for i := start; i < stop; { for j := start; j < stop; {
c := line[i] c := line[j]
if util.IsEscapedPunctuation(line, i) { if util.IsEscapedPunctuation(line, j) {
i += 2 j += 2
} else if util.IsSpace(c) && i < stop-1 && line[i+1] == '#' { } else if util.IsSpace(c) && j < stop-1 && line[j+1] == '#' {
closureOpen = i + 1 closureOpen = j + 1
j := i + 1 k := j + 1
for ; j < stop && line[j] == '#'; j++ { for ; k < stop && line[k] == '#'; k++ {
} }
closureClose = j closureClose = k
break break
} else { } else {
i++ j++
} }
} }
if closureClose > 0 { if closureClose > 0 {

View file

@ -43,7 +43,7 @@ func (s *codeSpanParser) Parse(parent ast.Node, block text.Reader, pc Context) a
} }
closure := i - oldi closure := i - oldi
if closure == opener && (i+1 >= len(line) || line[i+1] != '`') { if closure == opener && (i+1 >= len(line) || line[i+1] != '`') {
segment := segment.WithStop(segment.Start + i - closure) segment = segment.WithStop(segment.Start + i - closure)
if !segment.IsEmpty() { if !segment.IsEmpty() {
node.AppendChild(node, ast.NewRawTextSegment(segment)) node.AppendChild(node, ast.NewRawTextSegment(segment))
} }

View file

@ -903,7 +903,7 @@ retry:
if w > 3 && !bp.CanAcceptIndentedLine() { if w > 3 && !bp.CanAcceptIndentedLine() {
continue continue
} }
lastBlock := pc.LastOpenedBlock() lastBlock = pc.LastOpenedBlock()
last := lastBlock.Node last := lastBlock.Node
node, state := bp.Open(parent, reader, pc) node, state := bp.Open(parent, reader, pc)
if node != nil { if node != nil {
@ -1177,5 +1177,4 @@ func (p *parser) parseBlock(block text.BlockReader, parent ast.Node, pc Context)
for _, ip := range p.closeBlockers { for _, ip := range p.closeBlockers {
ip.CloseBlock(parent, block, pc) ip.CloseBlock(parent, block, pc)
} }
} }