Skip to content

Commit af52657

Browse files
committed
Finished code styling
1 parent c73bedc commit af52657

File tree

4 files changed

+36
-35
lines changed

4 files changed

+36
-35
lines changed

lib/jruby_visualizer/ast_tree_view_builder.rb

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,31 @@
2020

2121
class ASTTreeItem < Java::javafx.scene.control.TreeItem
2222
include JRubyFX
23-
23+
2424
attr_reader :node
25-
25+
2626
def initialize(node)
2727
@node = node
2828
super(node_string)
2929
set_expanded(true)
3030
end
31-
31+
3232
def node_string
33-
node_information = @node.respond_to?(:name) ? ":#{@node.name}" : ""
34-
"#{@node.node_name}#{node_information} #{@node.position.start_line}"
33+
node_information = @node.respond_to?(:name) ? ":#{@node.name}" : ''
34+
"#{@node.node_name}#{node_information} #{@node.position.start_line}"
3535
end
36-
36+
3737
end
3838

3939
class ASTTreeViewBuilder
4040
include JRubyFX
41+
4142
attr_accessor :tree_view
42-
43+
4344
def initialize(tree_view)
4445
@tree_view = tree_view
4546
end
46-
47+
4748
def build_tree_item(node)
4849
ASTTreeItem.new(node)
4950
end
@@ -52,7 +53,7 @@ def build_view(root)
5253
@tree_view.root = build_tree_item(root)
5354
root.child_nodes.each { |child| build_view_inner(child, @tree_view.root) }
5455
end
55-
56+
5657
def build_view_inner(node, parent_item)
5758
tree_item = build_tree_item(node)
5859
parent_item.children << tree_item
@@ -61,9 +62,9 @@ def build_view_inner(node, parent_item)
6162
private :build_view_inner
6263
end
6364

64-
if __FILE__ == $0
65+
if __FILE__ == $PROGRAM_NAME
6566
require 'jruby'
66-
root = JRuby.parse("def foo; 42; end; foo")
67+
root = JRuby.parse('def foo; 42; end; foo')
6768
builder = ASTTreeViewBuilder.new(nil)
6869
builder.build_view(root)
6970
end

lib/jruby_visualizer/cfg_visualizer.rb

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,29 @@
2020
require_relative 'ir_scope_registry'
2121
require_relative 'control_flow_graph_view'
2222

23-
resource_root :images, File.join(File.dirname(__FILE__), "ui", "img"), "ui/img"
24-
fxml_root File.join(File.dirname(__FILE__), "ui")
23+
resource_root :images, File.join(File.dirname(__FILE__), 'ui', 'img'), 'ui/img'
24+
fxml_root File.join(File.dirname(__FILE__), 'ui')
2525

2626
class CFGVisualizer < JRubyFX::Application
2727
def start(stage)
2828
compiler_data = JRubyVisualizer.compiler_data
29-
with(stage, title: "Visualization of Control Flow Graphs (CFG)") do
29+
with(stage, title: 'Visualization of Control Flow Graphs (CFG)') do
3030
fxml(CFGVisualizerController, initialize: [compiler_data])
31-
icons.add(Image.new(resource_url(:images, "jruby-icon-32.png").to_s))
31+
icons.add(Image.new(resource_url(:images, 'jruby-icon-32.png').to_s))
3232
show
3333
end
3434
end
3535
end
3636

3737
class CFGVisualizerController
3838
include JRubyFX::Controller
39-
fxml "cfg-view.fxml"
40-
39+
fxml 'cfg-view.fxml'
40+
4141
attr_reader :compiler_data, :ir_registry
42-
42+
4343
def initialize(compiler_data)
4444
@compiler_data = compiler_data
45-
45+
4646
# read scopes into the registry
4747
@ir_registry = IRScopeRegistry.new(@compiler_data.ir_scope)
4848
read_registry_into_selector
@@ -55,7 +55,7 @@ def initialize(compiler_data)
5555
update_tabs
5656
end
5757
end
58-
58+
5959
def read_registry_into_selector
6060
scopes_keys = @ir_registry.scopes.keys.map do |key|
6161
key.to_s
@@ -64,23 +64,23 @@ def read_registry_into_selector
6464
@ir_scope_selector.items = FXCollections.observable_array_list(scopes_keys)
6565
@ir_scope_selector.value = @selected_scope = scopes_keys[0]
6666
end
67-
67+
6868
def select_scope
6969
@selected_scope = @ir_scope_selector.value
7070
open_cfg_tab
7171
end
72-
72+
7373
def open_cfg_tab
7474
if @selected_scope.nil?
7575
return
7676
end
77-
77+
7878
tabs = @cfg_scopes_view.tabs
7979
is_tab_opened = tabs.find do |tab|
8080
# get string value from StringProperty name
8181
tab.text == @selected_scope
8282
end
83-
83+
8484
unless is_tab_opened
8585
tab = Tab.new(@selected_scope)
8686
cfg = get_selected_scope.cfg!
@@ -90,11 +90,11 @@ def open_cfg_tab
9090
@cfg_scopes_view.selection_model.select(tab)
9191
end
9292
end
93-
93+
9494
def get_selected_scope
9595
@ir_registry.scopes[@selected_scope.to_sym]
9696
end
97-
97+
9898
def update_tabs
9999
@cfg_scopes_view.tabs.each do |tab|
100100
scope_name = tab.text
@@ -107,7 +107,7 @@ def update_tabs
107107

108108
end
109109

110-
if __FILE__ == $0
110+
if __FILE__ == $PROGRAM_NAME
111111
JRubyVisualizer.compiler_data = CompilerData.new(
112112
"\nclass Foo\n\ndef bar; 42; end; end;\nFoo.new.bar")
113113
CFGVisualizer.launch

lib/jruby_visualizer/ir_scope_registry.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
require_relative 'core_ext/ir_scope'
1919

2020
class IRScopeRegistry
21-
21+
2222
attr_reader :scopes
23-
23+
2424
def initialize(root_scope)
2525
@scopes = {}
2626
fill_registry(root_scope)
2727
end
28-
28+
2929
def fill_registry(ir_scope)
3030
@scopes[ir_scope.key] = ir_scope
3131
ir_scope.lexical_scopes.each { |lex_scope| fill_registry(lex_scope) }
3232
end
33-
33+
3434
def clear
3535
@scopes = {}
3636
end
37-
37+
3838
end

lib/jruby_visualizer/visualizer_compiler_pass_listener.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919

2020
class VisualizerCompilerPassListener
2121
java_implements org.jruby.ir.passes.CompilerPassListener
22-
22+
2323
def already_executed(pass, scope, data, child_scope)
2424
# TODO add implementation logic
2525
#puts "PassListener inside already_executed"
2626
nil
2727
end
28-
28+
2929
def start_execute(pass, scope, child_scope)
3030
# TODO implementation logic
3131
#puts "PassListener inside start_execute"
3232
nil
3333
end
34-
34+
3535
def end_execute(pass, scope, data, child_scope)
3636
# TODO diff on start_execute or already_executed
3737
#puts "PassListener inside end_execute"

0 commit comments

Comments
 (0)