diff options
author | Adam Scarr <adam@vektah.net> | 2017-08-07 21:20:30 +1000 |
---|---|---|
committer | Adam Scarr <adam@vektah.net> | 2017-08-07 21:22:54 +1000 |
commit | a656dc0d78c5f51a16dc4c26936d337cdae5105c (patch) | |
tree | abd40ad9b8c6218d61c5dab230ef3712a0fef0b3 /html | |
parent | cc9d18219af9375ad89eaa8a23f1e0bcffa5734e (diff) |
AutoWS
Diffstat (limited to 'html')
-rw-r--r-- | html/html.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/html/html.go b/html/html.go index 8b19c23..4d02cb0 100644 --- a/html/html.go +++ b/html/html.go @@ -1,6 +1,8 @@ package html -import . "github.com/vektah/goparsify" +import ( + . "github.com/vektah/goparsify" +) func Parse(input string) (result interface{}, remaining string, err error) { return ParseString(tag, input) @@ -15,7 +17,7 @@ type Tag struct { var ( tag Parser - identifier = Merge(And(Chars("a-z", 1, 1), Chars("a-zA-Z0-9", 0))) + identifier = NoAutoWS(Merge(And(WS(), Chars("a-zA-Z", 1), Chars("a-zA-Z0-9", 0)))) text = Map(NotChars("<>"), func(n *Node) *Node { return &Node{Result: n.Token} }) @@ -29,8 +31,8 @@ var ( return &Node{Result: ret} }) - attr = And(WS, identifier, WS, "=", WS, Any(String('"'), String('\''))) - attrs = Map(Kleene(attr, WS), func(node *Node) *Node { + attr = And(identifier, "=", Any(String('"'), String('\''))) + attrs = Map(Kleene(attr), func(node *Node) *Node { attr := map[string]string{} for _, attrNode := range node.Children { |