rdg 0.0.2 → 0.1.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdg
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Louis Rose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0.2
+        version: 2.2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0.2
+        version: 2.2.2.0
 - !ruby/object:Gem::Dependency
   name: rgl
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -121,38 +135,79 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
+- RELEASES.md
 - Rakefile
+- TODO.md
 - bin/ast
 - bin/cfg
+- lib/rdg/analysis/analyser.rb
+- lib/rdg/analysis/composite.rb
+- lib/rdg/analysis/context.rb
+- lib/rdg/analysis/equivalences.rb
+- lib/rdg/analysis/propagater.rb
+- lib/rdg/analysis/registry.rb
 - lib/rdg/cfg.rb
-- lib/rdg/control/analyser.rb
 - lib/rdg/control/begin.rb
+- lib/rdg/control/break.rb
+- lib/rdg/control/case.rb
+- lib/rdg/control/conditional_loop.rb
 - lib/rdg/control/def.rb
+- lib/rdg/control/ensure.rb
+- lib/rdg/control/for.rb
+- lib/rdg/control/handler.rb
 - lib/rdg/control/if.rb
+- lib/rdg/control/jump.rb
+- lib/rdg/control/jump_to_start.rb
+- lib/rdg/control/next.rb
 - lib/rdg/control/none.rb
+- lib/rdg/control/redo.rb
+- lib/rdg/control/rescue.rb
+- lib/rdg/control/rescue_body.rb
+- lib/rdg/control/retry.rb
 - lib/rdg/control/return.rb
-- lib/rdg/control/while.rb
+- lib/rdg/control/when.rb
+- lib/rdg/graph/bidirected_adjacency_graph.rb
+- lib/rdg/graph/rgl/allow_duplicates.rb
 - lib/rdg/tree/ast.rb
 - lib/rdg/tree/rgl/post_order_iterator.rb
 - lib/rdg/tree/rgl/pre_order_iterator.rb
 - lib/rdg/version.rb
 - rdg.gemspec
-- spec/integration/cfg/if_spec.rb
-- spec/integration/cfg/methods_spec.rb
+- spec/integration/cfg/conditionals/case_spec.rb
+- spec/integration/cfg/conditionals/if_spec.rb
+- spec/integration/cfg/conditionals/unless_spec.rb
+- spec/integration/cfg/exceptions_spec.rb
+- spec/integration/cfg/loops/loop_control_spec.rb
+- spec/integration/cfg/loops/loop_spec.rb
 - spec/integration/cfg/sequence_spec.rb
 - spec/spec_helper.rb
+- spec/support/doubles/fake_ast.rb
 - spec/support/matchers/contain_matcher.rb
 - spec/support/matchers/flow_between_matcher.rb
-- spec/unit/control/analyser_spec.rb
+- spec/unit/analysis/composite_spec.rb
+- spec/unit/analysis/equivalences_spec.rb
+- spec/unit/analysis/propagater_spec.rb
+- spec/unit/analysis/registry_spec.rb
 - spec/unit/control/begin_spec.rb
-- spec/unit/control/def_spec.rb
+- spec/unit/control/break_spec.rb
+- spec/unit/control/case_spec.rb
+- spec/unit/control/conditional_loop_spec.rb
+- spec/unit/control/ensure_spec.rb
+- spec/unit/control/for_spec.rb
+- spec/unit/control/handler_spec.rb
 - spec/unit/control/if_spec.rb
+- spec/unit/control/jump_spec.rb
+- spec/unit/control/jump_to_start_spec.rb
+- spec/unit/control/rescue_body_spec.rb
+- spec/unit/control/rescue_spec.rb
 - spec/unit/control/return_spec.rb
-- spec/unit/control/while_spec.rb
+- spec/unit/control/when_spec.rb
+- spec/unit/graph/bidirected_adjacency_graph_spec.rb
 - spec/unit/tree/ast_spec.rb
 - spec/unit/tree/rgl/post_order_iterator_spec.rb
 - spec/unit/tree/rgl/pre_order_iterator_spec.rb
@@ -181,18 +236,36 @@ signing_key:
 specification_version: 4
 summary: Dependency analysis for Ruby programs
 test_files:
-- spec/integration/cfg/if_spec.rb
-- spec/integration/cfg/methods_spec.rb
+- spec/integration/cfg/conditionals/case_spec.rb
+- spec/integration/cfg/conditionals/if_spec.rb
+- spec/integration/cfg/conditionals/unless_spec.rb
+- spec/integration/cfg/exceptions_spec.rb
+- spec/integration/cfg/loops/loop_control_spec.rb
+- spec/integration/cfg/loops/loop_spec.rb
 - spec/integration/cfg/sequence_spec.rb
 - spec/spec_helper.rb
+- spec/support/doubles/fake_ast.rb
 - spec/support/matchers/contain_matcher.rb
 - spec/support/matchers/flow_between_matcher.rb
-- spec/unit/control/analyser_spec.rb
+- spec/unit/analysis/composite_spec.rb
+- spec/unit/analysis/equivalences_spec.rb
+- spec/unit/analysis/propagater_spec.rb
+- spec/unit/analysis/registry_spec.rb
 - spec/unit/control/begin_spec.rb
-- spec/unit/control/def_spec.rb
+- spec/unit/control/break_spec.rb
+- spec/unit/control/case_spec.rb
+- spec/unit/control/conditional_loop_spec.rb
+- spec/unit/control/ensure_spec.rb
+- spec/unit/control/for_spec.rb
+- spec/unit/control/handler_spec.rb
 - spec/unit/control/if_spec.rb
+- spec/unit/control/jump_spec.rb
+- spec/unit/control/jump_to_start_spec.rb
+- spec/unit/control/rescue_body_spec.rb
+- spec/unit/control/rescue_spec.rb
 - spec/unit/control/return_spec.rb
-- spec/unit/control/while_spec.rb
+- spec/unit/control/when_spec.rb
+- spec/unit/graph/bidirected_adjacency_graph_spec.rb
 - spec/unit/tree/ast_spec.rb
 - spec/unit/tree/rgl/post_order_iterator_spec.rb
 - spec/unit/tree/rgl/pre_order_iterator_spec.rb

data/lib/rdg/control/analyser.rb

@@ -1,44 +0,0 @@
-module RDG
-  module Control
-    class Analyser
-      def initialize(ast_node, graph, state)
-        @ast_node, @graph, @state = ast_node, graph, state
-      end
-
-      def analyse
-        add_internal_flow_edges
-        propogate_incoming_flow
-        propogate_outgoing_flow
-        remove_non_flow_vertices
-      end
-
-      private
-
-      def children
-        @ast_node.children
-      end
-
-      def add_internal_flow_edges
-        internal_flow_edges.each { |s, t| @graph.add_edge(s, t) }
-      end
-
-      def propogate_incoming_flow
-        @graph.each_predecessor(@ast_node) do |predecessor|
-          @graph.remove_edge(predecessor, @ast_node)
-          start_nodes.each { |n| @graph.add_edge(predecessor, n) }
-        end
-      end
-
-      def propogate_outgoing_flow
-        @graph.each_successor(@ast_node) do |successor|
-          @graph.remove_edge(@ast_node, successor)
-          end_nodes.each { |n| @graph.add_edge(n, successor) }
-        end
-      end
-
-      def remove_non_flow_vertices
-        @graph.remove_vertex(@ast_node)
-      end
-    end
-  end
-end

data/spec/integration/cfg/methods_spec.rb

@@ -1,39 +0,0 @@
-require "rdg/cfg"
-
-module RDG
-  describe CFG do
-    context "for a simple method" do
-      it "should show control flowing from the method name to the body" do
-        cfg = CFG.from_source("def foo; a = 1; a = 2; end")
-        name, first, _ = cfg.vertices
-
-        expect(cfg.vertices.size).to eq(3)
-        expect(cfg.has_edge?(name, first)).to be_truthy
-      end
-    end
-
-    context "for a method containing an early return" do
-      before(:all) do
-        @cfg = CFG.from_source("def foo; a = 1; if a == 2; return; end; a = 2; end")
-        @name, @first, _, _, @ret = @cfg.vertices
-      end
-
-      it "should show control flowing from the method name to the body" do
-        expect(@cfg.has_edge?(@name, @first)).to be_truthy
-      end
-
-      it "should not show control flowing from return to successor" do
-        expect(@cfg.has_edge?(@ret, @second)).to be_falsey
-      end
-    end
-
-    context "return from no method" do
-      it "should do nothing" do
-        cfg = CFG.from_source("return")
-
-        puts cfg.vertices
-        expect(cfg.vertices.empty?).to be_truthy
-      end
-    end
-  end
-end

data/spec/unit/control/def_spec.rb

@@ -1,28 +0,0 @@
-require "rdg/control/def"
-
-module RDG
-  module Control
-    describe Def do
-      let(:state) { Hash.new }
-      let(:graph) { spy("graph") }
-      subject do
-        ast = double("ast")
-        allow(ast).to receive(:children) { [:name, :args, :body] }
-        Def.new(ast, graph, state)
-      end
-
-      it "should have control flow from name to body" do
-        subject.analyse
-
-        expect(graph).to have_received(:add_edge).with(:name, :body)
-        expect(graph).to have_received(:add_edge).once
-      end
-
-      it "should have updated state with name node" do
-        subject.analyse
-
-        expect(state[:current_method]).to eq(:name)
-      end
-    end
-  end
-end

data/spec/unit/control/while_spec.rb

@@ -1,25 +0,0 @@
-require "rdg/control/while"
-
-module RDG
-  module Control
-    describe While do
-      subject do
-        ast = double("ast")
-        allow(ast).to receive(:children) { [:predicate, :body] }
-        While.new(ast, nil, nil)
-      end
-
-      it "should have control flow start at the predicate" do
-        expect(subject.start_nodes).to eq([:predicate])
-      end
-
-      it "should have control flow end at the body" do
-        expect(subject.end_nodes).to eq([:body])
-      end
-
-      it "should have control flow edges between predicate and body, and vice-versa" do
-        expect(subject.internal_flow_edges).to eq([[:predicate, :body], [:body, :predicate]])
-      end
-    end
-  end
-end