Skip to content

Fix 2 outstanding bugs #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bloopletech wants to merge 3 commits into
base: master
Choose a base branch
from
+15 −8
Open

Fix 2 outstanding bugs #8

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a717102
Fix for 'class Xyz::Abc'
bloopletech Dec 4, 2012
4e40439
Fixes a bug in RubyLex (apparently standing for 12 years) where if yo…
bloopletech Dec 4, 2012
fbd273d
Add monkeypatch from https://github.com/pbogdan/rtags/commit/3bbde087…
bloopletech Dec 18, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions bin/rtags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,13 @@ require "tracer"
require "irb/ruby-lex"
require "irb/ruby-token"

class RubyLex
def identify_string_dvar
end
end

require "stringio"

module RTAGS
@RCS_ID='-rtags.rb 0.95 -'

Expand Down Expand Up @@ -246,13 +253,13 @@ module RTAGS

def scan(&block)
print "\nParsing #{@input_file_name}..." if (!$options.quiet && !$options.xref)
File.open(@input_file_name) do |input|
@tokens = []
@unget_readed = []
@readed = []
@scanner.set_input(input)
parse_statements(&block)
end

input = StringIO.new(File.read(@input_file_name) + "\n")
@tokens = []
@unget_readed = []
@readed = []
@scanner.set_input(input)
parse_statements(&block)
end

# get the next token - fetching it from the temporary +@tokens+
Expand Down Expand Up @@ -372,7 +379,7 @@ module RTAGS
if peek_tk.kind_of? TkCOLON2
get_tk # skip the ::
namespaced_name_token = get_tk
rest = parse_full_constant(namespaced_name_token)
rest = parse_full_constant_name(namespaced_name_token)
name += '::' + rest unless rest.nil?
end

Expand Down