Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-20 19:30:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

Collapse float and int into 'number'

Browse Source
This commit is contained in:
Tristan Hume
2013-07-29 11:04:46 -04:00
parent be4a04ed85
commit bc76c0daaf
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/lexer.rb
+2 -4
View File
@@ -12,8 +12,7 @@ module Liquid
IDENTIFIER = /[\w\-?!]+/ IDENTIFIER = /[\w\-?!]+/
SINGLE_STRING_LITERAL = /'[^\']*'/ SINGLE_STRING_LITERAL = /'[^\']*'/
DOUBLE_STRING_LITERAL = /"[^\"]*"/ DOUBLE_STRING_LITERAL = /"[^\"]*"/
INTEGER_LITERAL = /-?\d+/ NUMBER_LITERAL = /-?\d+(\.\d+)?/
FLOAT_LITERAL = /-?\d+\.\d+/
COMPARISON_OPERATOR = /==|!=|<>|<=?|>=?|contains/ COMPARISON_OPERATOR = /==|!=|<>|<=?|>=?|contains/
def initialize(input) def initialize(input)
@@ -31,8 +30,7 @@ module Liquid
when t = @ss.scan(COMPARISON_OPERATOR) then [:comparison, t] when t = @ss.scan(COMPARISON_OPERATOR) then [:comparison, t]
when t = @ss.scan(SINGLE_STRING_LITERAL) then [:string, t] when t = @ss.scan(SINGLE_STRING_LITERAL) then [:string, t]
when t = @ss.scan(DOUBLE_STRING_LITERAL) then [:string, t] when t = @ss.scan(DOUBLE_STRING_LITERAL) then [:string, t]
when t = @ss.scan(FLOAT_LITERAL) then [:float, t] when t = @ss.scan(NUMBER_LITERAL) then [:number, t]
when t = @ss.scan(INTEGER_LITERAL) then [:integer, t]
when t = @ss.scan(IDENTIFIER) then [:id, t] when t = @ss.scan(IDENTIFIER) then [:id, t]
else else
c = @ss.getch c = @ss.getch
lib/liquid/parser.rb
+1 -1
View File
@@ -52,7 +52,7 @@ module Liquid
token = @tokens[@p] token = @tokens[@p]
if token[0] == :id if token[0] == :id
variable_signature variable_signature
elsif [:string, :integer, :float].include? token[0] elsif [:string, :number].include? token[0]
consume consume
token[1] token[1]
else else
test/liquid/lexer_test.rb
+2 -2
View File
@@ -10,12 +10,12 @@ class LexerTest < Test::Unit::TestCase
def test_integer def test_integer
tokens = Lexer.new('hi 50').tokenize tokens = Lexer.new('hi 50').tokenize
assert_equal [[:id,'hi'], [:integer, '50'], [:end_of_string]], tokens assert_equal [[:id,'hi'], [:number, '50'], [:end_of_string]], tokens
end end
def test_float def test_float
tokens = Lexer.new('hi 5.0').tokenize tokens = Lexer.new('hi 5.0').tokenize
assert_equal [[:id,'hi'], [:float, '5.0'], [:end_of_string]], tokens assert_equal [[:id,'hi'], [:number, '5.0'], [:end_of_string]], tokens
end end
def test_comparison def test_comparison
test/liquid/parser_test.rb
+7 -7
View File
@@ -7,13 +7,13 @@ class ParserTest < Test::Unit::TestCase
p = Parser.new("wat: 7") p = Parser.new("wat: 7")
assert_equal 'wat', p.consume(:id) assert_equal 'wat', p.consume(:id)
assert_equal ':', p.consume(:colon) assert_equal ':', p.consume(:colon)
assert_equal '7', p.consume(:integer) assert_equal '7', p.consume(:number)
end end
def test_jump def test_jump
p = Parser.new("wat: 7") p = Parser.new("wat: 7")
p.jump(2) p.jump(2)
assert_equal '7', p.consume(:integer) assert_equal '7', p.consume(:number)
end end
def test_consume? def test_consume?
@@ -21,14 +21,14 @@ class ParserTest < Test::Unit::TestCase
assert_equal 'wat', p.consume?(:id) assert_equal 'wat', p.consume?(:id)
assert_equal false, p.consume?(:dot) assert_equal false, p.consume?(:dot)
assert_equal ':', p.consume(:colon) assert_equal ':', p.consume(:colon)
assert_equal '7', p.consume?(:integer) assert_equal '7', p.consume?(:number)
end end
def test_id? def test_id?
p = Parser.new("wat 6 Peter Hegemon") p = Parser.new("wat 6 Peter Hegemon")
assert_equal 'wat', p.id?('wat') assert_equal 'wat', p.id?('wat')
assert_equal false, p.id?('endgame') assert_equal false, p.id?('endgame')
assert_equal '6', p.consume(:integer) assert_equal '6', p.consume(:number)
assert_equal 'Peter', p.id?('Peter') assert_equal 'Peter', p.id?('Peter')
assert_equal false, p.id?('Achilles') assert_equal false, p.id?('Achilles')
end end
@@ -37,10 +37,10 @@ class ParserTest < Test::Unit::TestCase
p = Parser.new("wat 6 Peter Hegemon") p = Parser.new("wat 6 Peter Hegemon")
assert_equal true, p.look(:id) assert_equal true, p.look(:id)
assert_equal 'wat', p.consume(:id) assert_equal 'wat', p.consume(:id)
assert_equal false, p.look(:float) assert_equal false, p.look(:comparison)
assert_equal true, p.look(:integer) assert_equal true, p.look(:number)
assert_equal true, p.look(:id, 1) assert_equal true, p.look(:id, 1)
assert_equal false, p.look(:float, 1) assert_equal false, p.look(:number, 1)
end end
def test_expressions def test_expressions