Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Cleanup heredoc parsing by removing some duplicated lex code
  • Loading branch information
adambeynon committed Dec 1, 2013
1 parent 7deaaa6 commit 94e75d7
Showing 1 changed file with 49 additions and 35 deletions.
84 changes: 49 additions & 35 deletions lib/opal/parser/lexer.rb
Expand Up @@ -201,7 +201,48 @@ def read_escape
end
end

def next_string_token
def peek_variable_name
if check(/[@$]/)
return :tSTRING_DVAR
elsif scan(/\{/)
return :tSTRING_DBEG
end
end

def here_document(str_parse)
eos_regx = /[ \t]*#{Regexp.escape(str_parse[:end])}(\r*\n|$)/

if check(eos_regx)
scan(/[ \t]*#{Regexp.escape(str_parse[:end])}/)

if str_parse[:scanner]
@scanner_stack << str_parse[:scanner]
@scanner = str_parse[:scanner]
end

return :tSTRING_END
end

str_buffer = []

if scan(/#/)
if tok = peek_variable_name
return tok
end

str_buffer << '#'
end

add_heredoc_content str_buffer, str_parse

complete_str = str_buffer.join ''
@line += complete_str.count("\n")

self.yylval = complete_str
return :tSTRING_CONTENT
end

def parse_string
str_parse = self.strterm
scanner = @scanner
space = false
Expand All @@ -215,21 +256,6 @@ def next_string_token
# if not end of string, so we must be parsing contents
str_buffer = []

if str_parse[:type] == :heredoc
eos_regx = /[ \t]*#{Regexp.escape(str_parse[:end])}(\r*\n|$)/

if check(eos_regx)
scan(/[ \t]*#{Regexp.escape(str_parse[:end])}/)

if str_parse[:scanner]
@scanner_stack << str_parse[:scanner]
@scanner = str_parse[:scanner]
end

return :tSTRING_END
end
end

# see if we can read end of string/xstring/regexp markers
# if scan /#{str_parse[:end]}/
if scan Regexp.new(Regexp.escape(str_parse[:end]))
Expand Down Expand Up @@ -304,11 +330,7 @@ def next_string_token
str_buffer << '#'
end

if str_parse[:type] == :heredoc
add_heredoc_content str_buffer, str_parse
else
add_string_content str_buffer, str_parse
end
add_string_content str_buffer, str_parse

complete_str = str_buffer.join ''
@line += complete_str.count("\n")
Expand Down Expand Up @@ -339,19 +361,7 @@ def add_heredoc_content(str_buffer, str_parse)
c = "\\" + scanner.matched
end
else
c = if scan(/n/)
"\n"
elsif scan(/r/)
"\r"
elsif scan(/\n/)
"\n"
elsif scan(/t/)
"\t"
else
# escaped char doesnt need escaping, so just return it
scan(/./)
scanner.matched
end
c = self.read_escape
end
else
handled = false
Expand Down Expand Up @@ -564,7 +574,11 @@ def yylex
c = ''

if self.strterm
token = next_string_token
if self.strterm[:type] == :heredoc
token = here_document(self.strterm)
else
token = parse_string
end

if token == :tSTRING_END or token == :tREGEXP_END
self.strterm = nil
Expand Down

0 comments on commit 94e75d7

Please sign in to comment.