summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mair <jrmair@gmail.com>2012-06-29 05:18:55 +1200
committerJohn Mair <jrmair@gmail.com>2012-06-29 05:18:55 +1200
commit6127eb23a14b66bb3ff7506762927c8b27b4db7e (patch)
tree9780f73f54becaa246fbbfd3a9f71abf73fdacc1
parent22cfabf621248394874841b8791b720ca789e7ac (diff)
downloadmethod_source-6127eb23a14b66bb3ff7506762927c8b27b4db7e.tar.gz
define a consume parameter for expression_at and extract_first_expression
When consume is > 0 it prefills the expression buffer with `consume` lines of input. This enables you to rapidly check a large chunk of code for validity as you skip over the initial portion you know is valid without having to perform an expensive eval() on each line.
-rw-r--r--lib/method_source/code_helpers.rb16
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/method_source/code_helpers.rb b/lib/method_source/code_helpers.rb
index 173609e..9c7e4d7 100644
--- a/lib/method_source/code_helpers.rb
+++ b/lib/method_source/code_helpers.rb
@@ -13,14 +13,19 @@ module MethodSource
# expressions that may have been valid inside an eval.
# @return [String] The first complete expression
# @raise [SyntaxError] If the first complete expression can't be identified
- def expression_at(file, line_number, strict=false)
+ def expression_at(file, line_number, options={})
+ options = {
+ :strict => false,
+ :consume => 0
+ }.merge!(options)
+
lines = file.is_a?(Array) ? file : file.each_line.to_a
relevant_lines = lines[(line_number - 1)..-1] || []
- extract_first_expression(relevant_lines)
+ extract_first_expression(relevant_lines, options[:consume])
rescue SyntaxError => e
- raise if strict
+ raise if options[:strict]
begin
extract_first_expression(relevant_lines) do |code|
@@ -78,8 +83,9 @@ module MethodSource
# @param [&Block] a clean-up function to run before checking for complete_expression
# @return [String] a valid ruby expression
# @raise [SyntaxError]
- def extract_first_expression(lines, &block)
- code = ""
+ def extract_first_expression(lines, consume=0, &block)
+ code = consume.zero? ? "" : lines.slice!(0..(consume - 1)).join
+
lines.each do |v|
code << v
return code if complete_expression?(block ? block.call(code) : code)