codegraph 0.7.1 → 0.7.2

data/gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name              = "codegraph"
-  s.version           = "0.7.1"
+  s.version           = "0.7.2"
   s.date              = "2010-11-01"
   s.platform          = Gem::Platform::RUBY
   s.bindir            = 'bin'

data/lib/codegraph.rb

@@ -28,13 +28,13 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
    Funx  = {"php"     => "function",
             "perl"    => "subroutine",
             "c"       => "function",
-            "f" => "subroutine",
+            "f"       => "subroutine",
             "sh"      => "function"}
 
    @@home               = `echo $HOME`.chomp
    @@codehomedir        = "#{@@home}/.codegraph"
    @@internal_funx      = []
-   @@matchBeforFuncName = '[^A-z0-9_]'
+   @@matchBeforFuncName = '[^A-z0-9_]\s*'
    @@matchAfterFuncName = '\('
    
    # Generate the codegraph storage directory
@@ -67,7 +67,8 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
         temfile    = "_" + basefile
         case File.extname(file)
         when '.c','.h' 
-          cppCommand = "cpp -w -fpreprocessed -E  -fdirectives-only #{file}  -o #{@@codehomedir}/#{temfile}"
+          cppCommand = "cpp -w -fpreprocessed -E  -fdirectives-only #{file}  -o #{@@codehomedir}/#{temfile} 2>/dev/null"
+          cppCommand = "cpp -fpreprocessed #{file}  -o #{@@codehomedir}/#{temfile} 2>/dev/null"
           grep       = "grep -v -e '^$' #{temfile} | grep -v -e '^#' > #{basefile}"
         when '.f','.f77','.f90','.f95'
           cppCommand = "cp #{file} #{@@codehomedir}/#{temfile}"
@@ -80,7 +81,7 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
         gen4ctags  = "ctags -x #{ctagsKinds} #{basefile} | sort -n -k 3 > " + funxFile
         command    = [cppCommand,cd,grep,gen4ctags].join(";")
 
-        puts command
+        puts command if false
         system(command)
 
         open(@@codehomedir+'/'+funxFile).readlines.each {|line|
@@ -130,9 +131,10 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
       # scan functions for the function names
       names = @funx.keys
       @funx.each_pair {|name,body|
+        puts "Add func: #{name}" if true
             add_vertex(name)
             (names - [name] + @@internal_funx).each { |func|
-              add_edge("#{name}","#{func}") if /#@@matchBeforFuncName#{func}/.match(body)
+              add_edge("#{name}","#{func}") if/#@@matchBeforFuncName#{func}#@@matchAfterFuncName/.match(gbody)
             }
       }
    end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Ralf Mueller