Skip to content

Loop reduction over the first 2 elements of the stack #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 7, 2017
Merged

Loop reduction over the first 2 elements of the stack #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e65eb08
Remove duplicated test
volrath Nov 24, 2017
388bb2b
Fix test case for `\u` and `\o` characters
volrath Nov 24, 2017
811f35e
Loops reduction over the first 2 elements of the stack
volrath Dec 5, 2017
aeac6a1
Fix code's organization for 2-item stack reduction
volrath Dec 7, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix test case for \u and \o characters 
Before this commit, reading something like "\u \v \w", would produce two char tokens, one with "\u \v " and another with "\w". Test included exemplifies solution.
  • Loading branch information
@volrath
volrath committed Nov 24, 2017
commit 388bb2bde2f1985e246d52c3970c8468e03ca69d
4 changes: 2 additions & 2 deletions parseclj-lex.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,11 @@ token is returned."
(right-char 7)
(parseclj-lex-token :character (buffer-substring-no-properties pos (point)) pos))

((equal (char-after (point)) ?u)
((string-match-p "^u[0-9a-fA-F]\\{4\\}" (parseclj-lex-lookahead 5))
(right-char 5)
(parseclj-lex-token :character (buffer-substring-no-properties pos (point)) pos))

((equal (char-after (point)) ?o)
((string-match-p "^o[0-8]\\{3\\}" (parseclj-lex-lookahead 4))
(right-char 4)
(parseclj-lex-token :character (buffer-substring-no-properties pos (point)) pos))

Expand Down
9 changes: 9 additions & 0 deletions test/parseclj-lex-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,15 @@
(should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\b" 28)))
(should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\c" 30))))

(with-temp-buffer
(insert "\\u \\v \\w")
(goto-char 1)
(should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\u" 1)))
(should (equal (parseclj-lex-next) (parseclj-lex-token :whitespace " " 3)))
(should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\v" 4)))
(should (equal (parseclj-lex-next) (parseclj-lex-token :whitespace " " 6)))
(should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\w" 7))))

(with-temp-buffer
(insert "\\u0078\\o170")
(goto-char 1)
Expand Down