summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-25 16:35:04 +0000
committerkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-25 16:35:04 +0000
commitb7d11c6942c40464280af331aa15e2361a55d6d3 (patch)
treef7c48793c905ca03944881c5c59f91a3d6c63da3 /lib
parent7eb75edd4e65494a9500492f44409f10709322ef (diff)
* lib/irb/init.rb, lib/irb/context.rb: fix conf.debug_level=
[Bug #6301] and fix irb command option: -- irb_debug_level for irb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/irb/context.rb3
-rw-r--r--lib/irb/init.rb2
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index 43d5364b4f..b44f8ca2fe 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -100,7 +100,7 @@ module IRB
if @echo.nil?
@echo = true
end
- @debug_level = IRB.conf[:DEBUG_LEVEL]
+ self.debug_level = IRB.conf[:DEBUG_LEVEL]
end
# The top-level workspace, see WorkSpace#main
@@ -360,7 +360,6 @@ module IRB
def debug_level=(value)
@debug_level = value
RubyLex.debug_level = value
- SLex.debug_level = value
end
# Whether or not debug mode is enabled, see #debug_level=.
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index 159066bbce..2c3797f71f 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -197,7 +197,7 @@ module IRB # :nodoc:
@CONF[:CONTEXT_MODE] = ($1 || ARGV.shift).to_i
when "--single-irb"
@CONF[:SINGLE_IRB] = true
- when /^--irb_debug=(?:=(.+))?/
+ when /^--irb_debug(?:=(.+))?/
@CONF[:DEBUG_LEVEL] = ($1 || ARGV.shift).to_i
when "-v", "--version"
print IRB.version, "\n"