Commit 3ae56767 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Make max tokens in expressions lexer a class-level attribute

parent 5b3a54f9f8b1
...@@ -16,12 +16,13 @@ class Lexer ...@@ -16,12 +16,13 @@ class Lexer
MAX_TOKENS = 100 MAX_TOKENS = 100
def initialize(statement) def initialize(statement, max_tokens: MAX_TOKENS)
@scanner = StringScanner.new(statement) @scanner = StringScanner.new(statement)
@max_tokens = max_tokens
end end
def tokens(max: MAX_TOKENS) def tokens
strong_memoize(:tokens) { tokenize(max) } strong_memoize(:tokens) { tokenize }
end end
def lexemes def lexemes
...@@ -30,10 +31,10 @@ def lexemes ...@@ -30,10 +31,10 @@ def lexemes
private private
def tokenize(max_tokens) def tokenize
tokens = [] tokens = []
max_tokens.times do @max_tokens.times do
@scanner.skip(/\s+/) # ignore whitespace @scanner.skip(/\s+/) # ignore whitespace
return tokens if @scanner.eos? return tokens if @scanner.eos?
......
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
end end
it 'limits statement to specified amount of tokens' do it 'limits statement to specified amount of tokens' do
lexer = described_class.new("$V1 $V2 $V3 $V4 $V5 $V6") lexer = described_class.new("$V1 $V2 $V3 $V4", max_tokens: 3)
expect { lexer.tokens(max: 5) } expect { lexer.tokens }
.to raise_error described_class::SyntaxError .to raise_error described_class::SyntaxError
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment