orbacle 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b560995e47155365bd986cb4ef871acf85fb7cb4753c098f7f7f60bf86cb0a30
-  data.tar.gz: 37ce9c0971c5b2afeee80687daf0cb1aede67e82bc43dfd207223244c1398d0b
+  metadata.gz: 7b916d0faf99f58f268106d55916e43a08023beb458ecafc81888902e523c025
+  data.tar.gz: a0846bb91366f78cbcb91077ddbf7454d47ce3e5660640d82046e545a305a001
 SHA512:
-  metadata.gz: 546a7ca50aa3c04276a13a934e41cda17836fa795d33391c6d3420e0b4764d0a643940c141a58277e9e41f5b4ddebbd2deb4b0c6a10ff61931621e565012aed3
-  data.tar.gz: d9834d7895f9ce459516104d3011fa88e4b06d8fb5178fc13dfcd776fd731692ad505d3e91886399a71387beafc3c6af6ceb300ee3fe62d2a1bac64655683209
+  metadata.gz: 0ccce4920723ee351415d28ddb6d90f7afb72f015f3d3297d62c99f9fb3edcc918591e5e80546ddb558aa53e3d355dc366a8a4f286f7942c48abd4605b933323
+  data.tar.gz: 5fc9bcfa9a643a76e44ec3589ead8aa70a31fb83c867a6d7ccef2fa39c1016b8dbbda56c4acaa417a4da604450ee9011baadee1647478d61782aeac5d58a90a5

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 
+* Jump to method definition works when jumping on the dot. Allows to jump to foo.(bar) (shorthand `call` notation).
+* Major speedup for some big files, having large arrays or hashes
+* Jump to definition now works when using it on `super` keyword.
+
 ## 0.1.0
 
 * First public version released

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    orbacle (0.1.0)
-      lsp-protocol (>= 0.0.3)
+    orbacle (0.2.0)
+      lsp-protocol (= 0.0.7)
       parser (~> 2.4.0.2)
       priority_queue_cxx
       rgl (~> 0.5.3)
@@ -30,7 +30,7 @@ GEM
     ice_nine (0.11.2)
     json (1.8.6)
     lazy_priority_queue (0.1.1)
-    lsp-protocol (0.0.3)
+    lsp-protocol (0.0.7)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     mini_portile2 (2.3.0)
@@ -116,4 +116,4 @@ DEPENDENCIES
   ruby-prof
 
 BUNDLED WITH
-   1.16.2
+   1.16.4

data/Makefile

@@ -8,28 +8,9 @@ mutant:
 	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::RubyParser"
 	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::ConstantsTree"
 	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::FindDefinitionUnderPosition"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::LangServer"
+	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::LangServer" --ignore-subject "Orbacle::LangServer#handle_text_document_did_change"
 	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::Engine"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#add_lambda"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#get_lambda"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#get_instance_methods_from_class_id"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#find_instance_method_from_class_id"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#get_instance_methods_from_class_name"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#find_instance_method_from_class_name"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#get_class_methods_from_class_name"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#find_class_method_from_class_name"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#find_super_method"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#change_method_visibility"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#get_class"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#add_klass"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#add_mod"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#get_module"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#get_definition"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#get_parent_of"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#set_type_of"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#type_of"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#get_eigenclass_of_definition"
-	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree#get_methods"
+	@MUTANT_TESTING=true bundle exec mutant --include lib --require orbacle --use rspec "Orbacle::GlobalTree"
 
 test: test-unit test-performance
 
@@ -54,4 +35,6 @@ build:
 	@gem build orbacle.gemspec
 
 install: build
-	@gem install orbacle-0.0.1.gem
+	@gem install orbacle-0.2.0.gem
+
+full: setup build install

data/README.md

@@ -1,5 +1,3 @@
-[![CircleCI](https://circleci.com/gh/swistak35/orbacle/tree/master.svg?style=svg)](https://circleci.com/gh/swistak35/orbacle/tree/master)
-
 # Orbacle
 
 <img src="http://swistak35.com/img/orbacle-logo.png" alt="Orbacle logo" width="100px" align="left" />
@@ -15,8 +13,25 @@ Create a language server for ruby, which can be used across different code edito
 ## Current status
 
 Currently language server supports:
-* hover request - information about "type" of an expression
-* jump to definition - jump to definition of constant or method
+
+### Hover request
+
+Information about "type" of an expression
+
+
+### Jump to definition
+
+Works in following cases:
+* used on constant -> jump to constant definition
+* used on method call -> jump to definition of that method
+* used on `super` keyword -> jump to the definition of method from the parent class (doesn't respect `include` / `prepend` yet)
+
+
+### V i d e o
+
+
+![vokoscreen-2018-08-01_21-38-46](https://user-images.githubusercontent.com/332289/43544509-6b240d06-95d3-11e8-81e8-fe03b2c1cf6f.gif)
+
 
 ## Setup
 
@@ -47,6 +62,15 @@ let g:LanguageClient_waitOutputTimeout = 240
 
 Currently I do not accept contributions, as this is part of MSc thesis. However features ideas and bug reports are accepted.
 
+## Support
+
+If you have found a bug, feel free to create an issue. However, because of the fact that I'm focusing now more on the features required to MSc, support for other developers are lower priority for me.
+
+## Code status
+
+[![CircleCI](https://circleci.com/gh/swistak35/orbacle/tree/master.svg?style=svg)](https://circleci.com/gh/swistak35/orbacle/tree/master)
+[![Gem Version](https://badge.fury.io/rb/orbacle.svg)](https://badge.fury.io/rb/orbacle)
+
 ## Bibliography
 
 * [Tern](http://marijnhaverbeke.nl/blog/tern.html)

data/lib/orbacle.rb

@@ -15,6 +15,18 @@ module Orbacle
       end
     end
 
+    def on_edges?(position)
+      on_left_edge?(position) || on_right_edge?(position)
+    end
+
+    def on_left_edge?(position)
+      position == self.start
+    end
+
+    def on_right_edge?(position)
+      position == self.end
+    end
+
     def end_line
       self.end.line
     end
@@ -60,8 +72,6 @@ module Orbacle
   BIG_VALUE = 0b111111100100000010110010110011101010000101010100001100100110001
 end
 
-require 'parser/current'
-
 require 'orbacle/ast_utils'
 require 'orbacle/bottom_type'
 require 'orbacle/builder/context'
@@ -75,6 +85,7 @@ require 'orbacle/constants_tree'
 require 'orbacle/define_builtins'
 require 'orbacle/engine'
 require 'orbacle/find_definition_under_position'
+require 'orbacle/find_call_under_position'
 require 'orbacle/generic_type'
 require 'orbacle/global_tree'
 require 'orbacle/graph'

data/lib/orbacle/builder.rb

@@ -154,8 +154,6 @@ module Orbacle
         handle_case(ast, context)
       when :yield
         handle_yield(ast, context)
-      when :block_pass
-        handle_block_pass(ast, context)
 
       when :while then handle_while(ast, context)
       when :until then handle_while(ast, context)
@@ -202,7 +200,7 @@ module Orbacle
     include OperatorAssignmentProcessors
 
     def handle_lvasgn(ast, context)
-      var_name = ast.children[0].to_s
+      var_name = ast.children[0]
       expr = ast.children[1]
 
       node_lvasgn = add_vertex(Node.new(:lvasgn, { var_name: var_name }, build_location_from_ast(context, ast)))
@@ -392,7 +390,7 @@ module Orbacle
     end
 
     def handle_lvar(ast, context)
-      var_name = ast.children[0].to_s
+      var_name = ast.children[0]
 
       node_lvar = add_vertex(Node.new(:lvar, { var_name: var_name }, build_location_from_ast(context, ast)))
 
@@ -404,7 +402,7 @@ module Orbacle
     end
 
     def handle_ivar(ast, context)
-      ivar_name = ast.children.first.to_s
+      ivar_name = ast.children.first
 
       ivar_definition_node = if context.selfie.klass?
         @graph.get_class_level_ivar_definition_node(context.scope, ivar_name)
@@ -423,7 +421,7 @@ module Orbacle
     end
 
     def handle_ivasgn(ast, context)
-      ivar_name = ast.children[0].to_s
+      ivar_name = ast.children[0]
       expr = ast.children[1]
 
       node_ivasgn = add_vertex(Node.new(:ivasgn, { var_name: ivar_name }, build_location_from_ast(context, ast)))
@@ -451,7 +449,7 @@ module Orbacle
     end
 
     def handle_cvasgn(ast, context)
-      cvar_name = ast.children[0].to_s
+      cvar_name = ast.children[0]
       expr = ast.children[1]
 
       node_cvasgn = add_vertex(Node.new(:cvasgn, { var_name: cvar_name }, build_location_from_ast(context, ast)))
@@ -471,7 +469,7 @@ module Orbacle
     end
 
     def handle_cvar(ast, context)
-      cvar_name = ast.children.first.to_s
+      cvar_name = ast.children.first
 
       cvar_definition_node = @graph.get_cvar_definition_node(context.scope, cvar_name)
 
@@ -482,7 +480,7 @@ module Orbacle
     end
 
     def handle_gvasgn(ast, context)
-      gvar_name = ast.children[0].to_s
+      gvar_name = ast.children[0]
       expr = ast.children[1]
 
       node_gvasgn = add_vertex(Node.new(:gvasgn, { var_name: gvar_name }, build_location_from_ast(context, ast)))
@@ -497,7 +495,7 @@ module Orbacle
     end
 
     def handle_gvar(ast, context)
-      gvar_name = ast.children.first.to_s
+      gvar_name = ast.children.first
 
       gvar_definition_node = @graph.get_gvar_definition_node(gvar_name)
 
@@ -512,7 +510,7 @@ module Orbacle
       block_message_name = block_message_block_pass.children.last.children.last
       normal_arg_exprs = arg_exprs[0..-2]
       send_ast_type = csend ? :csend : :send
-      send_ast = Parser::AST::Node.new(send_ast_type, [obj_expr, message_name.to_sym, *normal_arg_exprs])
+      send_ast = Parser::AST::Node.new(send_ast_type, [obj_expr, message_name, *normal_arg_exprs])
       arg_ast = Parser::AST::Node.new(:args, [Parser::AST::Node.new(:arg, [:__orbacle__x])])
       block_body_ast = Parser::AST::Node.new(:send, [Parser::AST::Node.new(:lvar, [:__orbacle__x]), block_message_name])
       block_ast = Parser::AST::Node.new(:block, [send_ast, arg_ast, block_body_ast])
@@ -528,7 +526,7 @@ module Orbacle
 
     def handle_send(ast, context, csend)
       obj_expr = ast.children[0]
-      message_name = ast.children[1].to_s
+      message_name = ast.children[1]
       arg_exprs = ast.children[2..-1]
 
       return transform_symbol_shorthand(obj_expr, message_name, arg_exprs, csend, context) if transform_symbol_shorthand_applies?(arg_exprs)
@@ -544,10 +542,10 @@ module Orbacle
 
       final_context, call_arg_nodes, block_node = prepare_argument_nodes(obj_context, arg_exprs)
 
-      return handle_changing_visibility(context, message_name.to_sym, arg_exprs) if obj_expr.nil? && ["public", "protected", "private"].include?(message_name)
-      return handle_custom_attr_reader_send(context, arg_exprs, ast) if obj_expr.nil? && message_name == "attr_reader"
-      return handle_custom_attr_writer_send(context, arg_exprs, ast) if obj_expr.nil? && message_name == "attr_writer"
-      return handle_custom_attr_accessor_send(context, arg_exprs, ast) if obj_expr.nil? && message_name == "attr_accessor"
+      return handle_changing_visibility(context, message_name, arg_exprs) if obj_expr.nil? && [:public, :protected, :private].include?(message_name)
+      return handle_custom_attr_reader_send(context, arg_exprs, ast) if obj_expr.nil? && message_name == :attr_reader
+      return handle_custom_attr_writer_send(context, arg_exprs, ast) if obj_expr.nil? && message_name == :attr_writer
+      return handle_custom_attr_accessor_send(context, arg_exprs, ast) if obj_expr.nil? && message_name == :attr_accessor
 
       call_obj_node = add_vertex(Node.new(:call_obj, {}))
       @graph.add_edge(obj_node, call_obj_node)
@@ -592,7 +590,7 @@ module Orbacle
         return Result.new(final_node, context.with_visibility(new_visibility))
       elsif context.analyzed_klass_id
         methods_to_change_visibility = arg_exprs.map do |arg_expr|
-          [:sym, :str].include?(arg_expr.type) ? arg_expr.children[0].to_s : nil
+          [:sym, :str].include?(arg_expr.type) ? arg_expr.children[0] : nil
         end.compact
         methods_to_change_visibility.each do |name|
           @tree.change_method_visibility(context.analyzed_klass_id, name, new_visibility)
@@ -638,12 +636,12 @@ module Orbacle
     end
 
     def define_attr_reader_method(context, ivar_name, location)
-      ivar_definition_node = @graph.get_ivar_definition_node(context.scope, "@#{ivar_name}")
+      ivar_definition_node = @graph.get_ivar_definition_node(context.scope, :"@#{ivar_name}")
 
       metod = @tree.add_method(
         id_generator.call,
         context.analyzed_klass_id,
-        ivar_name,
+        :"#{ivar_name}",
         location,
         context.analyzed_klass.method_visibility,
         GlobalTree::ArgumentsTree.new([], [], nil))
@@ -652,14 +650,14 @@ module Orbacle
     end
 
     def define_attr_writer_method(context, ivar_name, location)
-      ivar_definition_node = @graph.get_ivar_definition_node(context.scope, "@#{ivar_name}")
+      ivar_definition_node = @graph.get_ivar_definition_node(context.scope, :"@#{ivar_name}")
 
-      arg_name = "_attr_writer"
+      arg_name = :_attr_writer
       arg_node = add_vertex(Node.new(:formal_arg, { var_name: arg_name }))
       metod = @tree.add_method(
         id_generator.call,
         context.analyzed_klass_id,
-        "#{ivar_name}=",
+        :"#{ivar_name}=",
         location,
         context.analyzed_klass.method_visibility,
         GlobalTree::ArgumentsTree.new([GlobalTree::ArgumentsTree::Regular.new(arg_name)], [], nil))
@@ -729,7 +727,7 @@ module Orbacle
       metod = @tree.add_method(
         id_generator.call,
         context.analyzed_klass_id,
-        method_name.to_s,
+        method_name,
         build_location_from_ast(context, ast),
         context.analyzed_klass.method_visibility,
         arguments_tree)
@@ -799,8 +797,8 @@ module Orbacle
         ConstRef.from_ast(parent_klass_name_ast, context.nesting)
       end
 
-      klass = @tree.add_klass(parent_name_ref)
-      klass_constant = @tree.add_constant(
+      klass = @tree.add_class(parent_name_ref)
+      @tree.add_constant(
         GlobalTree::Constant.new(klass_name_ref.name, context.scope.increase_by_ref(klass_name_ref).decrease, build_location_from_ast(context, ast), klass.id))
 
       new_context = context
@@ -822,7 +820,7 @@ module Orbacle
 
       module_name_ref = ConstRef.from_ast(module_name_ast, context.nesting)
 
-      mod = @tree.add_mod
+      mod = @tree.add_module
       @tree.add_constant(
         GlobalTree::Constant.new(
           module_name_ref.name, context.scope.increase_by_ref(module_name_ref).decrease, build_location_from_ast(context, ast), mod.id))
@@ -872,7 +870,7 @@ module Orbacle
       metod = @tree.add_method(
         id_generator.call,
         place_of_definition_id,
-        method_name.to_s,
+        method_name,
         build_location_from_ast(context, ast),
         context.analyzed_klass.method_visibility,
         arguments_tree)
@@ -904,14 +902,14 @@ module Orbacle
       if expr_is_class_definition?(expr)
         parent_klass_name_ast = expr.children[2]
         parent_name_ref = parent_klass_name_ast.nil? ? nil : ConstRef.from_ast(parent_klass_name_ast, context.nesting)
-        klass = @tree.add_klass(parent_name_ref)
+        klass = @tree.add_class(parent_name_ref)
         @tree.add_constant(
           GlobalTree::Constant.new(
             const_name_ref.name, context.scope.increase_by_ref(const_name_ref).decrease, build_location_from_ast(context, ast), klass.id))
 
         return Result.new(Node.new(:nil, {}), context)
       elsif expr_is_module_definition?(expr)
-        mod = @tree.add_mod
+        mod = @tree.add_module
         @tree.add_constant(
           GlobalTree::Constant.new(
             const_name_ref.name, context.scope.increase_by_ref(const_name_ref).decrease, build_location_from_ast(context, ast), mod.id))
@@ -1280,7 +1278,7 @@ module Orbacle
       nodes = {}
 
       final_context = formal_arguments.reduce(context) do |current_context, arg_ast|
-        arg_name = arg_ast.children[0]&.to_s
+        arg_name = arg_ast.children[0]
         maybe_arg_default_expr = arg_ast.children[1]
         location = build_location_from_ast(current_context, arg_ast)
 
@@ -1332,7 +1330,7 @@ module Orbacle
       args = []
 
       final_context = arg_asts.reduce(context) do |current_context, arg_ast|
-        arg_name = arg_ast.children[0]&.to_s
+        arg_name = arg_ast.children[0]
 
         case arg_ast.type
         when :arg

data/lib/orbacle/builder/operator_assignment_processors.rb

@@ -70,7 +70,7 @@ module Orbacle
       def complete_assignment(partial_assignment_ast, full_rhs_ast)
         if partial_assignment_ast.type == :send
           send_obj_ast, accessor_method_name, _ = partial_assignment_ast.children
-          partial_assignment_ast.updated(nil, [send_obj_ast, "#{accessor_method_name}=", full_rhs_ast])
+          partial_assignment_ast.updated(nil, [send_obj_ast, :"#{accessor_method_name}=", full_rhs_ast])
         elsif [:lvasgn, :ivasgn, :cvasgn, :casgn, :gvasgn].include?(partial_assignment_ast.type)
           partial_assignment_ast.append(full_rhs_ast)
         end

data/lib/orbacle/const_ref.rb

@@ -24,14 +24,6 @@ module Orbacle
 
     attr_reader :const_name, :is_absolute, :nesting
 
-    def to_full_const_name
-      if absolute?
-        const_name
-      else
-        ConstName.new([*nesting.to_primitive, const_name.to_string])
-      end
-    end
-
     def absolute?
       @is_absolute
     end

data/lib/orbacle/define_builtins.rb

@@ -13,71 +13,128 @@ module Orbacle
       add_dir_klass
       add_file_klass
       add_integer_klass
+      add_array_klass
     end
 
     private
     attr_reader :id_generator
 
     def add_object_klass
-      klass = @tree.add_klass(nil)
+      klass = @tree.add_class(nil)
       @tree.add_constant(
         GlobalTree::Constant.new("Object", Scope.empty, nil, klass.id))
+      eigenclass = @tree.get_eigenclass_of_definition(klass.id)
 
       # BasicObject
-      template_just_bool(klass, "==")
-      template_just_bool(klass, "!")
-      template_just_bool(klass, "!=")
-      template_just_bool(klass, "equal?")
-      template_just_int(klass, "object_id")
-      template_just_int(klass, "__id__")
+      template_just_bool(klass, :"==")
+      template_just_bool(klass, :"!")
+      template_just_bool(klass, :"!=")
+      template_just_bool(klass, :equal?)
+      template_just_int(klass, :object_id)
+      template_just_int(klass, :__id__)
 
       # Object
-      template_just_bool(klass, "!~")
-      template_maybe_int(klass, "<=>")
-      template_just_bool(klass, "===")
-      template_just_nil(klass, "display")
-      template_just_bool(klass, "eql?")
-      template_just_bool(klass, "frozen?")
-      template_just_bool(klass, "instance_of?")
-      template_just_bool(klass, "instance_variable_defined?")
-      template_just_bool(klass, "is_a?")
-      template_just_str(klass, "inspect")
-      template_just_bool(klass, "kind_of?")
-      template_just_bool(klass, "nil?")
-      template_just_bool(klass, "respond_to?")
-      template_just_bool(klass, "respond_to_missing?")
-      template_just_bool(klass, "tainted?")
-      template_just_bool(klass, "untrusted?")
-      template_just_str(klass, "to_s")
+      template_just_bool(klass, :"!~")
+      template_maybe_int(klass, :"<=>")
+      template_just_bool(klass, :"===")
+      template_caller_id(klass, :clone)
+      addm_object_class(klass)
+      template_just_nil(klass, :display)
+      template_caller_id(klass, :dup)
+      template_just_bool(klass, :eql?)
+      template_caller_id(klass, :freeze)
+      template_just_bool(klass, :frozen?)
+      template_just_bool(klass, :instance_of?)
+      template_just_bool(klass, :instance_variable_defined?)
+      template_just_bool(klass, :is_a?)
+      template_just_str(klass, :inspect)
+      template_caller_id(klass, :itself)
+      template_just_bool(klass, :kind_of?)
+      template_just_bool(klass, :nil?)
+      template_just_bool(klass, :respond_to?)
+      template_just_bool(klass, :respond_to_missing?)
+      template_caller_id(klass, :taint)
+      template_caller_id(klass, :trust)
+      template_just_bool(klass, :tainted?)
+      template_caller_id(klass, :untaint)
+      template_caller_id(klass, :untrust)
+      template_just_bool(klass, :untrusted?)
+      template_just_str(klass, :to_s)
+
+      addm_object_class(eigenclass)
     end
 
     def add_integer_klass
-      klass = @tree.add_klass(nil)
+      klass = @tree.add_class(nil)
       @tree.add_constant(
         GlobalTree::Constant.new("Integer", Scope.empty, nil, klass.id))
 
-      template_just_int(klass, "succ")
-      template_just_int(klass, "+")
-      template_just_int(klass, "-")
-      template_just_int(klass, "*")
+      template_just_int(klass, :succ)
+      template_just_int(klass, :"+")
+      template_just_int(klass, :"-")
+      template_just_int(klass, :"*")
     end
 
     def add_dir_klass
-      klass = @tree.add_klass(nil)
+      klass = @tree.add_class(nil)
       @tree.add_constant(
         GlobalTree::Constant.new("Dir", Scope.empty, nil, klass.id))
       eigenclass = @tree.get_eigenclass_of_definition(klass.id)
 
-      template_just_array_of_str(eigenclass, "glob")
+      template_just_array_of_str(eigenclass, :glob)
     end
 
     def add_file_klass
-      klass = @tree.add_klass(nil)
+      klass = @tree.add_class(nil)
       @tree.add_constant(
         GlobalTree::Constant.new("File", Scope.empty, nil, klass.id))
       eigenclass = @tree.get_eigenclass_of_definition(klass.id)
 
-      template_just_str(eigenclass, "read")
+      template_just_str(eigenclass, :read)
+    end
+
+    def add_array_klass
+      klass = @tree.add_class(nil)
+      @tree.add_constant(GlobalTree::Constant.new("Array", Scope.empty, nil, klass.id))
+
+      add_array_map(klass)
+      add_array_each(klass)
+    end
+
+    def add_array_map(klass)
+      metod = add_method(klass.id, :map, :public, GlobalTree::ArgumentsTree.new([], []))
+      caller_node = Node.new(:caller, {})
+      result_node = Node.new(:method_result, {})
+      yield_arg = Node.new(:call_arg, {})
+      yield_result = Node.new(:yield_result, {})
+      yields = [Graph::Yield.new([yield_arg], yield_result)]
+      unwrap_array = Node.new(:unwrap_array, {})
+      wrap_array = Node.new(:wrap_array, {})
+      all_nodes = [caller_node, result_node, yield_arg, yield_result, unwrap_array, wrap_array]
+      all_edges = [
+        [caller_node, unwrap_array],
+        [unwrap_array, yield_arg],
+        [yield_result, wrap_array],
+        [wrap_array, result_node],
+      ]
+      @graph.store_metod_subgraph(metod.id, {}, caller_node, result_node, yields, all_nodes, all_edges)
+    end
+
+    def add_array_each(klass)
+      metod = add_method(klass.id, :each, :public, GlobalTree::ArgumentsTree.new([], []))
+      caller_node = Node.new(:caller, {})
+      result_node = Node.new(:method_result, {})
+      yield_arg = Node.new(:call_arg, {})
+      yield_result = Node.new(:yield_result, {})
+      yields = [Graph::Yield.new([yield_arg], yield_result)]
+      unwrap_array = Node.new(:unwrap_array, {})
+      all_nodes = [caller_node, result_node, yield_arg, yield_result, unwrap_array]
+      all_edges = [
+        [caller_node, unwrap_array],
+        [unwrap_array, yield_arg],
+        [caller_node, result_node],
+      ]
+      @graph.store_metod_subgraph(metod.id, {}, caller_node, result_node, yields, all_nodes, all_edges)
     end
 
     def template_just_int(klass, name)
@@ -120,18 +177,40 @@ module Orbacle
       @graph.add_edge(array_node, @graph.get_metod_nodes(metod.id).result)
     end
 
+    def template_caller_id(klass, name)
+      metod = add_method(klass.id, name, :public, GlobalTree::ArgumentsTree.new([], []))
+      caller_node = Node.new(:caller, {})
+      result_node = Node.new(:method_result, {})
+      all_nodes = [caller_node, result_node]
+      all_edges = [
+        [caller_node, result_node]
+      ]
+      @graph.store_metod_subgraph(metod.id, {}, caller_node, result_node, [], all_nodes, all_edges)
+    end
+
+    def addm_object_class(klass)
+      metod = add_method(klass.id, :class, :public, GlobalTree::ArgumentsTree.new([], []))
+      caller_node = Node.new(:caller, {})
+      extract_class_node = Node.new(:extract_class, {})
+      result_node = Node.new(:method_result, {})
+      all_nodes = [caller_node, extract_class_node, result_node]
+      all_edges = [
+        [caller_node, extract_class_node],
+        [extract_class_node, result_node]
+      ]
+      @graph.store_metod_subgraph(metod.id, {}, caller_node, result_node, [], all_nodes, all_edges)
+    end
+
     def template_args(klass, name)
-      metod = @tree.add_method(
-        generate_id,
-        klass.id,
-        name,
-        nil,
-        :public,
-        GlobalTree::ArgumentsTree.new([], []))
+      metod = add_method(klass.id, name, :public, GlobalTree::ArgumentsTree.new([], []))
       @graph.store_metod_nodes(metod.id, {})
       metod
     end
 
+    def add_method(class_id, name, visibility, args)
+      @tree.add_method(generate_id, class_id, name, nil, visibility, args)
+    end
+
     def generate_id
       id_generator.call
     end