diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-07-25 06:03:50 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-07-25 06:03:50 +0000 |
| commit | 2f7ff9d1b8a75f2f791eb2cea4883d0d1da93df4 (patch) | |
| tree | cf00f5457030456f4faf290ce99296812c205cb1 /lib | |
| parent | b9373b7aeaf51441cd36334635022bd4f9523a4b (diff) | |
matz - irb (PR#46)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/irb/ruby-lex.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index a788b779b4..4c7a3b1002 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -368,8 +368,8 @@ class RubyLex if @lex_state != EXPR_END && @lex_state != EXPR_CLASS && (@lex_state != EXPR_ARG || @space_seen) c = peek(0) - if /\S/ =~ c && (/["'`]/ =~ c || /[\w_]/ =~ c) - tk = identify_here_document; + if /\S/ =~ c && (/["'`]/ =~ c || /[\w_]/ =~ c || c == "-") + tk = identify_here_document end else tk = Token(op) @@ -752,7 +752,12 @@ class RubyLex def identify_here_document ch = getc - if lt = PERCENT_LTYPE[ch] + if ch == "-" + ch = getc + indent = true + end + if /['"`]/ =~ ch + lt = ch quoted = "" while (c = getc) && c != lt quoted.concat c @@ -778,7 +783,7 @@ class RubyLex end @here_header = false - while (l = gets.chomp) && l != quoted + while (l = gets.chomp) && (indent ? l.strip : l) != quoted end @here_header = true |