starscope 0.1.5 → 0.1.6

data/CHANGELOG.md

@@ -1,7 +1,13 @@
 Changelog
 =========
 
-v0.1.5 (trunk)
+v0.1.6 (trunk)
+-------------------
+
+Bug Fixes:
+ * Much improved recognition of golang function calls.
+
+v0.1.5 (2014-01-06)
 -------------------
 
 New Features:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    starscope (0.1.5)
+    starscope (0.1.6)
       oj (~> 2.5)
       parser (~> 2.1)
       ruby-progressbar (~> 1.4)
@@ -20,7 +20,7 @@ GEM
     debugger-ruby_core_source (1.3.1)
     method_source (0.8.2)
     oj (2.5.3)
-    parser (2.1.2)
+    parser (2.1.3)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
     pry (0.9.12.4)

data/README.md

@@ -12,7 +12,7 @@ StarScope is a similar tool for [Ruby](https://www.ruby-lang.org/) and
 support for other languages at some point within the same framework (thus the
 name StarScope, ie \*scope).
 
-Install it as a gem:
+Install it as a gem (requires at least Ruby 1.9.3):
 ```
 $ gem install starscope
 ```

data/lib/starscope/langs/go.rb

@@ -1,6 +1,6 @@
 module StarScope::Lang
   module Go
-    FUNC_CALL = /([\w\.]*?\w)\(.*\)/
+    FUNC_CALL = /([\w\.]*?\w)\(/
     BUILTIN_FUNCS = ['new', 'make', 'len', 'close', 'copy', 'delete',
                      'int', 'int8', 'int16', 'int32', 'int64',
                      'uint', 'uint8', 'uint16', 'uint32', 'uint64',
@@ -10,7 +10,7 @@ module StarScope::Lang
       name =~ /.*\.go$/
     end
 
-    def self.extract(file)
+    def self.extract(file, &block)
       stack = []
       scope = []
       str = File.readlines(file).each_with_index do |line, line_no|
@@ -116,7 +116,7 @@ module StarScope::Lang
             stack.push(:def)
           when /^const\s+(\w+)\s+\w+/
             yield :defs, $1, line_no: line_no, scope: scope
-          when /^\s+(.*?) :?= ((.*?)\(.*\))?/
+          when /^\s+(.*?) :?=.*/
             $1.split(',').each do |var|
               var = var.strip
               name = var.split('.')
@@ -127,16 +127,9 @@ module StarScope::Lang
                 yield :assigns, name[1], line_no: line_no, scope: [name[0]]
               end
             end
-            if $2
-              match = FUNC_CALL.match($2)
-              if match
-                tmp = parse_call(match[1], line_no, scope)
-                yield tmp if tmp
-              end
-            end
-          when FUNC_CALL
-            tmp = parse_call($1, line_no, scope)
-            yield tmp if tmp
+            parse_call(line, line_no, scope, &block)
+          else
+            parse_call(line, line_no, scope, &block)
           end
         end
         # if the line looks like "foo /* foo" then we enter the comment state
@@ -148,17 +141,18 @@ module StarScope::Lang
     end
 
     def self.parse_call(line, line_no, scope)
-      name = line.split('.').select {|chunk| not chunk.empty?}
-      case name.length
-      when 1
-        return nil if name[0] == 'func'
-        if BUILTIN_FUNCS.include?(name[0])
-          return :calls, name[0], line_no: line_no
+      line.scan(FUNC_CALL) do |match|
+        name = match[0].split('.').select {|chunk| not chunk.empty?}
+        if name.length == 1
+          next if name[0] == 'func'
+          if BUILTIN_FUNCS.include?(name[0])
+            yield :calls, name[0], line_no: line_no
+          else
+            yield :calls, name[0], line_no: line_no, scope: scope
+          end
         else
-          return :calls, name[0], line_no: line_no, scope: scope
+          yield :calls, name[-1], line_no: line_no, scope: name[0...-1]
         end
-      else
-        return :calls, name[-1], line_no: line_no, scope: name[0...-1]
       end
     end
   end

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module StarScope
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/starscope.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
+  gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency 'oj', '~> 2.5'
   gem.add_dependency 'parser', '~> 2.1'

data/test/test.go

@@ -0,0 +1,25 @@
+package main
+
+func a(c int) int {
+	return 3
+}
+
+func b() int {
+	return 0
+}
+
+func c(a, b int) int {
+	return 1
+}
+
+func main() {
+	var (
+		q int
+		t string
+	)
+	x := a(1)
+	y := b()
+	z := c(a(q), b())
+
+	a(c(b(), b()))
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -146,6 +146,7 @@ files:
 - lib/starscope/langs/ruby.rb
 - lib/starscope/version.rb
 - starscope.gemspec
+- test/test.go
 homepage: https://github.com/eapache/starscope
 licenses:
 - MIT
@@ -158,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: