Commit Graph

426 Commits

Author SHA1 Message Date
Tristan Hume
525e1ff195 Add range support 2013-07-29 13:25:48 -04:00
Tristan Hume
8f4b398c7a Abstract parser switching into tag 2013-07-29 13:00:35 -04:00
Tristan Hume
d5d41a8202 Make previous commit work 2013-07-29 12:43:05 -04:00
Tristan Hume
c8bd0b91b3 Catch easy cases 2013-07-29 12:07:18 -04:00
Tristan Hume
bc76c0daaf Collapse float and int into 'number' 2013-07-29 11:04:46 -04:00
Tristan Hume
be4a04ed85 Merged array_tokens into recursive-parsing 2013-07-29 10:38:52 -04:00
Tristan Hume
8dcf44e99d Faster token creation, hopefully. 2013-07-29 10:23:04 -04:00
Tristan Hume
a892e69a88 Hopefully fix CI build 2013-07-26 15:55:10 -04:00
Harry Brundage
bf53e517f5 Inline Parser#next_token to avoid method dispatch 2013-07-26 15:38:52 -04:00
Harry Brundage
bacacf2fd0 Remove the Token class from the lexer in favour of less smart but faster arrays 2013-07-26 15:14:01 -04:00
Tristan Hume
1b43bf5686 Add parser tests 2013-07-26 13:09:36 -04:00
Tristan Hume
83e71ace99 Add lexer tests and fixes 2013-07-26 12:50:27 -04:00
Tristan Hume
87b8ee7341 Add error mode switching 2013-07-26 11:45:13 -04:00
Florian Weingarten
07f7d63bea Use kind_of? instead of class.include? and rearrange stuff 2013-07-26 11:34:00 -04:00
Florian Weingarten
65dfd57bb5 Make 'map' filter work on Enumerable drops 2013-07-26 10:35:28 -04:00
Tristan Hume
8b1dff9d98 Allow ! in identifiers like Ruby 2013-07-26 10:33:30 -04:00
Tristan Hume
8896b55fa5 Parsing for if statements 2013-07-26 10:31:26 -04:00
Tristan Hume
c0b9d53548 Revert "Test a different lexer architechture"
This reverts commit 24ddaf1a9c.
2013-07-26 09:52:04 -04:00
Tristan Hume
24ddaf1a9c Test a different lexer architechture 2013-07-26 09:51:58 -04:00
Tristan Hume
673826630c Unfinished if statement parser. 2013-07-26 09:32:08 -04:00
Florian Weingarten
3e13ed4ba1 Fix mapping over procs 2013-07-25 22:11:44 -04:00
Florian Weingarten
182d3fefb6 Always call 'to_liquid' on staff in map filter and allow to_liquid to be called on drops 2013-07-25 17:10:19 -04:00
Tristan Hume
4da7b36139 New variable parser! 2013-07-25 11:38:57 -04:00
Tristan Hume
f43e973e67 Basic expression parsing 2013-07-24 16:36:14 -04:00
Florian Weingarten
f9027d54ab Use invoke_drop in map filter 2013-07-24 15:41:50 -04:00
Tristan Hume
84be895db2 Fancy StringScanner based lexer 2013-07-24 15:39:48 -04:00
Tristan Hume
b20a594f25 Better lexer 2013-07-24 15:19:14 -04:00
Tristan Hume
76272a1afa Bring back the lexer 2013-07-24 14:40:29 -04:00
Tristan Hume
61a6deb43b Descriptive comment for lexer 2013-07-24 12:00:51 -04:00
Tristan Hume
ee14775f83 Replace hand-coded lexer with faster hacky lexer. 2013-07-24 11:41:47 -04:00
Tristan Hume
2332d86156 Slow lexer and parser scaffold. 2013-07-24 11:35:00 -04:00
Florian Weingarten
fbfda1a189 Little cosmetic change 2013-07-05 11:30:50 -04:00
Florian Weingarten
0f38fe3596 Add blank test for case tags 2013-07-02 18:08:20 -04:00
Florian Weingarten
cd3f976288 Merge branch 'master' into dont_render_blank_blocks
Conflicts:
	lib/liquid/tag.rb
2013-07-02 14:00:30 -04:00
Florian Weingarten
b53601100f Make sure include tags are never blank 2013-07-02 13:57:27 -04:00
Jonas Schubert Erlandsson
f91233450f Changes not empty? to any? 2013-07-01 16:12:58 +02:00
G. Bodenschatz
d36a1c518b Fix some typos in comments 2013-06-27 22:16:23 +02:00
Florian Weingarten
40a37c3fb6 Merge branch 'master' into dont_render_blank_blocks
Conflicts:
	lib/liquid/tags/cycle.rb
	lib/liquid/tags/increment.rb
2013-06-27 10:03:18 -04:00
Florian Weingarten
668ee5e1c4 Clean up whitespace collapsing 2013-06-27 14:06:05 +02:00
Florian Weingarten
b4fbcea114 Cycle tags are never blank 2013-06-27 14:00:38 +02:00
Florian Weingarten
c16697746b Clean up whitespace collapsing a bit 2013-06-27 13:57:26 +02:00
Florian Weingarten
d6e13faa43 Don't render blank blocks 2013-06-26 22:21:47 -04:00
Florian Weingarten
0f5441b09e Convert legacy tab indentation to spaces and remove trailing whitespace from all lines 2013-06-26 19:53:09 -04:00
Florian Weingarten
8ca4868bff Merge branch 'master' of https://github.com/ndwebgroup/liquid into ndwebgroup-master 2013-06-18 04:13:49 +02:00
Florian Weingarten
f92da6948d Merge branch 'strip-html-fix' of https://github.com/jamesallardice/liquid into jamesallardice-strip-html-fix
Conflicts:
	lib/liquid/standardfilters.rb
2013-06-18 04:11:11 +02:00
Florian Weingarten
eca520025c Merge branch 'strip-html' of https://github.com/joliss/liquid into joliss-strip-html
Conflicts:
	lib/liquid/standardfilters.rb
2013-06-18 04:04:49 +02:00
Florian Weingarten
b81469d183 Make truncate work for Ruby 1.8 2013-06-17 12:05:02 -04:00
Florian Weingarten
e47d1af03a Fix broken 'raw' tag parsing (issue #204) 2013-06-14 12:47:27 -04:00
Florian Weingarten
3d1f582318 Merge pull request #201 from arthurnn/adding_version_file
create version.rb file, and bump version
2013-06-14 05:45:48 -07:00
Florian Weingarten
5cfa13d7a4 Merge pull request #205 from phoet/stricter_handling_of_variables_in_for
rejects variables like a/b in for loops, closes #150
2013-06-13 15:26:00 -07:00