File tree Expand file tree Collapse file tree 3 files changed +10
-14
lines changed Expand file tree Collapse file tree 3 files changed +10
-14
lines changed Original file line number Diff line number Diff line change @@ -57,11 +57,10 @@ iterator tokens*(input: string): XmlToken {.inline.} =
57
57
length = input.len
58
58
is_cdata = false
59
59
is_text = false
60
-
61
- var ch = input[pos]
60
+ ch: char
62
61
63
62
while pos < length and input[pos] != '\0 ' :
64
- let ch = input[pos]
63
+ ch = input[pos]
65
64
if ch in Whitespace:
66
65
inc(pos)
67
66
continue
@@ -86,7 +85,6 @@ iterator tokens*(input: string): XmlToken {.inline.} =
86
85
inc(pos, 6 )
87
86
elif input[pos.. pos+ 1 ] == " --" :
88
87
# skips comment
89
- let comment_start = pos- 2
90
88
skip_until(" -->" )
91
89
# print out full of comment
92
90
# echo input[comment_start..<pos]
@@ -138,9 +136,7 @@ iterator tokens*(input: string): XmlToken {.inline.} =
138
136
pos = text_end
139
137
is_text = false
140
138
else :
141
- var
142
- name = " "
143
- name_start = pos
139
+ var name = " "
144
140
var c = input[pos]
145
141
if c in IdentStartChars:
146
142
while c in NameIdentChars:
Original file line number Diff line number Diff line change 1
1
import pegs, strutils, ../ xml
2
- from streams import newStringStream
3
- from strtabs import hasKey
4
2
5
-
6
- let
3
+ const
7
4
attribute = r " [a-zA-Z][a-zA-Z0-9_\-]* "
8
5
classes = r " {\.[a-zA-Z0-9_][a-zA-Z0-9_\-]*} "
9
6
attributes = r " {\[ " & attribute & r " \s*([\*\^\$\~]?\=\s*[\'"" ]?(\s*\ident\s*)+[\'"" ]?)?\]} "
10
- pselectors = peg(r " \s*{\ident}?({'#'\ident})? ( " & classes & " )* " & attributes & " *" )
7
+ selectors = r " \s*{\ident}?({'#'\ident})? ( " & classes & " )* " & attributes & " *"
8
+
9
+ let
10
+ pselectors = peg(selectors)
11
11
pattributes = peg(r " {\[{ " & attribute & r " }\s*({[\*\^\$\~]?}\=\s*[\'"" ]?{(\s*\ident\s*)+}[\'"" ]?)?\]} " )
12
12
13
13
type
Original file line number Diff line number Diff line change 1
1
# Package
2
2
3
- version = " 0.1.2 "
3
+ version = " 0.1.3 "
4
4
author = " Huy Doan"
5
5
description = " Pure Nim XML parser"
6
6
license = " MIT"
7
7
srcDir = " src"
8
8
9
9
# Dependencies
10
10
11
- requires " nim >= 0.19.6 "
11
+ requires " nim >= 1.0.4 "
You can’t perform that action at this time.
0 commit comments