starscope 1.3.0.pre.rc1 → 1.3.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c09fb48ea12174fc241fc799d5eb948da2a44582
-  data.tar.gz: c56e8c9fc177ecc94d7dbd77b15af4a130b2c65f
+  metadata.gz: 8990a179b74e33abc0f11be5138cafbb0c753268
+  data.tar.gz: 24799a335d01f5cbe1402e8f375cf39b5e0ec28b
 SHA512:
-  metadata.gz: 715d7b4ff92b00c9a9e8feee0acd4e6a198215c66b142796a5c90f5eac7f66eafdf4890fd1314d323a62c00f1bbc65f3ad3a64d57f5942c6326952e47361b34c
-  data.tar.gz: ab315bcf74d0b42dc7420c8ee18a30fbc17b66a1a6e8259cfa93d19953d1a462de597fda4895ae3c10cf7bac762d27b546ac95ea2925c565aaf873d466920521
+  metadata.gz: 7181a98649ff618e53d35d1f182ecea36ee33dee532ecfa892dc576033b222010b196879270af803376bd8d6eb5b2fd4533b8950878cffbf69de2c52557c552c
+  data.tar.gz: 8fb98b2744e28b9cbee19a8d90866ab95d49963a5f5b331bd3f97934da76699a6867d447d64afa16bbba9d42b21952e3a720c9a1a7d4c5edfc8763be5aad9593

data/CHANGELOG.md

@@ -13,7 +13,9 @@ New Features:
    integration with cscope's "find this C symbol" (#60).
 
 Bug Fixes:
- * Simplify query logic to match user expectations (#91)
+ * Simplify query logic to match user expectations (#91).
+ * Cscope: fix export of inline function definitions.
+ * DB: fix saving of upconverted databases in rare circumstances.
 
 v1.2.0 (2014-09-02)
 --------------------

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    starscope (1.3.0.pre.rc1)
+    starscope (1.3.0.pre.rc2)
       backports (~> 3.6)
       oj (~> 2.9)
       parser (~> 2.1)

data/bin/starscope

@@ -193,7 +193,8 @@ db = Starscope::DB.new(output)
 db_exists = File.exists?(options[:db])
 
 if options[:read] && db_exists
-  new_data = db.load(options[:db])
+  # we consider it 'new data' if the db was upconverted from an old format
+  new_data = !db.load(options[:db])
 else
   # no need to run an update if we didn't read any old data
   options[:update] = false

data/lib/starscope/db.rb

@@ -36,6 +36,7 @@ class Starscope::DB
     @tables = {}
   end
 
+  # returns true iff the database was already in the most recent format
   def load(filename)
     @output.extra("Reading database from `#{filename}`... ")
     current_fmt = open_db(filename)

data/lib/starscope/exportable.rb

@@ -144,13 +144,7 @@ END
       # use the column if we have it, otherwise fall back to scanning
       index = record[:col] || line.index(key)
 
-      # keep scanning if our current index doesn't actually match the key, or if
-      # either the preceeding or succeeding character is a word character
-      # (meaning we've accidentally matched the middle of some other token)
-      while index &&
-        ((line[index, key.length] != key) ||
-         (index > 0 && line[index-1] =~ /\w/) ||
-         (index+key.length < line.length && line[index+key.length] =~ /\w/))
+      while index && !valid_index?(line, index, key)
         index = line.index(key, index+1)
       end
 
@@ -174,22 +168,27 @@ END
 
   def cscope_output(line, prev, offset, record)
     buf = ""
-    buf << CSCOPE_GLOBAL_HACK_STOP if record[:type] == :func && record[:tbl] == :defs
 
-    tokens = record[:name][0...-1].map {|x| x.to_s.sub(/\W+$/, '')}.select {|x| !x.empty?}.join("|")
-    if !tokens.empty?
+    if record[:type] == :func && record[:tbl] == :defs
+      buf << " " if prev > 0 # urgh cscope
+      buf << CSCOPE_GLOBAL_HACK_STOP
+    end
+
+    record[:name][0...-1].each do |key|
       # output previous components of the name (ie the Foo in Foo::bar) as unmarked symbols
-      rxp = Regexp.new("\\W(#{tokens})\\W")
-      index = line.index(rxp, prev)
+      key = key.to_s.sub(/\W+$/, '')
+      next if key.empty?
+
+      index = line.index(key, prev)
+
+      while index && index+key.length < offset && !valid_index?(line, index, key)
+        index = line.index(key, index+1)
+      end
 
-      while index
-        tok = rxp.match(line[index..-1])[1]
-        index += 1
-        break if index+tok.length > offset
+      if index && index+key.length < offset
         buf << cscope_plaintext(line, prev, index) << "\n"
-        buf << "#{tok}\n"
-        prev = index + tok.length
-        index = line.index(rxp, prev)
+        buf << "#{key}\n"
+        prev = index + key.length
       end
     end
 
@@ -203,6 +202,13 @@ END
     line
   end
 
+  def valid_index?(line, index, key)
+    # index is valid if the key exists at it, and the prev/next chars are not word characters
+    ((line[index, key.length] == key) &&
+     (index == 0 || line[index-1] !~ /\w/) &&
+     (index+key.length == line.length || line[index+key.length] !~ /\w/))
+  end
+
   def cscope_plaintext(line, start, stop)
     ret = line.slice(start, stop-start)
     ret.lstrip! if start == 0

data/lib/starscope/langs/ruby.rb

@@ -2,7 +2,7 @@ require "parser/current"
 
 module Starscope::Lang
   module Ruby
-    VERSION = 1
+    VERSION = 2
 
     def self.match_file(name)
       return true if name.end_with?(".rb")
@@ -78,10 +78,16 @@ module Starscope::Lang
         yield :reads, name, :line_no => loc.line, :col => loc.name.column
 
       when :lvar, :ivar, :cvar, :gvar
-        yield :reads, scope + [node.children[0]], :line_no => loc.line, :col => loc.expression.column
+        yield :reads, scope + [node.children[0]], :line_no => loc.line, :col => loc.name.column
 
       when :sym
-        yield :sym, [node.children[0]], :line_no => loc.line, :col => loc.expression.column
+        # handle `:foo` vs `foo: 1`
+        col = if loc.begin
+                loc.begin.column+1
+              else
+                loc.expression.column
+              end
+        yield :sym, [node.children[0]], :line_no => loc.line, :col => col
       end
     end
 

data/lib/starscope/queryable.rb

@@ -4,7 +4,7 @@ module Starscope::Queryable
 
   def query(tables, value, filters={})
     tables = [tables] if tables.is_a?(Symbol)
-    tables.each { |t| raise NoTableError, "Table '#{t}' not found" unless @tables[t] }
+    tables.each { |t| raise Starscope::DB::NoTableError, "Table '#{t}' not found" unless @tables[t] }
     input = Enumerator.new do |y|
       tables.each do |t|
         @tables[t].each do |elem|

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module Starscope
-  VERSION = "1.3.0-rc1"
+  VERSION = "1.3.0-rc2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.rc1
+  version: 1.3.0.pre.rc2
 platform: ruby
 authors:
 - Evan Huus