15 files changed, 26 insertions, 33 deletions
diff --git a/lib/yard/handlers.rb b/lib/yard/handlers.rb
new file mode 100644
index 0000000..41a1f73
--- /dev/null
+++ b/lib/yard/handlers.rb
@@ -0,0 +1,2 @@
+require_relative 'handlers/c'
+#require_relative 'handlers/header'
diff --git a/lib/yard/handlers/c.rb b/lib/yard/handlers/c.rb
new file mode 100644
index 0000000..61c4943
--- /dev/null
+++ b/lib/yard/handlers/c.rb
@@ -0,0 +1,5 @@
+require_relative 'c/mruby_base'
+require_relative 'c/mruby_class_handler'
+# require_relative 'c/mruby_module_handler'
+require_relative 'c/mruby_method_handler'
+
diff --git a/lib/yard/handlers/c/mruby_base.rb b/lib/yard/handlers/c/mruby_base.rb
new file mode 100644
index 0000000..83c237a
--- /dev/null
+++ b/lib/yard/handlers/c/mruby_base.rb
@@ -0,0 +1,12 @@
+module YARD::Handlers::C
+  class MRubyBase < Base
+    DEFAULT_NAMESPACES = {
+      'mrb->object_class' => 'Object'
+    }
+
+    def namespace_for_variable(var)
+      return DEFAULT_NAMESPACES[var] if DEFAULT_NAMESPACES[var]
+      super
+    end
+  end
+end
diff --git a/lib/yard/mruby/handlers/source/class_handler.rb b/lib/yard/handlers/c/mruby_class_handler.rb
index 185aaa6..9e3d1f5 100644
--- a/lib/yard/mruby/handlers/source/class_handler.rb
+++ b/lib/yard/handlers/c/mruby_class_handler.rb
@@ -1,7 +1,7 @@
-module YARD::MRuby::Handlers::Source
-  class ClassHandler < Base
+module YARD::Handlers::C
+  class MRubyClassHandler < MRubyBase
 
-    TOP_LEVEL_CLASS = /\*([\w]+)\s*=\s*mrb_define_class\s*
+    TOP_LEVEL_CLASS = /([\w]+)\s*=\s*mrb_define_class\s*
       \(
       \s*\w+\s*,
       \s*"(\w+)"\s*,
@@ -9,7 +9,7 @@ module YARD::MRuby::Handlers::Source
       \)
     /mx
 
-    NAMESPACED_CLASS = /\*([\w]+)\s*=\s*mrb_define_class_under\s*
+    NAMESPACED_CLASS = /([\w]+)\s*=\s*mrb_define_class_under\s*
       \(
       \s*\w+\s*,
       \s*(\w+)\s*,
diff --git a/lib/yard/mruby/handlers/source/method_handler.rb b/lib/yard/handlers/c/mruby_method_handler.rb
index f3eab8c..01fb345 100644
--- a/lib/yard/mruby/handlers/source/method_handler.rb
+++ b/lib/yard/handlers/c/mruby_method_handler.rb
@@ -1,5 +1,5 @@
-module YARD::MRuby::Handlers::Source
-  class MethodHandler < Base
+module YARD::Handlers::C
+  class MRubyMethodHandler < MRubyBase
     MATCH1 = /mrb_define_method\s*
       \(
       \s*\w+\s*,
@@ -12,7 +12,6 @@ module YARD::MRuby::Handlers::Source
     statement_class BodyStatement
 
     process do
-      puts statement.inspect
       statement.source.scan(MATCH1) do |var_name, name, func_name|
         handle_method(nil, var_name, name, func_name)
       end
diff --git a/lib/yard/mruby/handlers/source/module_handler.rb b/lib/yard/handlers/c/mruby_module_handler.rb
index c9243ac..c9243ac 100644
--- a/lib/yard/mruby/handlers/source/module_handler.rb
+++ b/lib/yard/handlers/c/mruby_module_handler.rb
diff --git a/lib/yard/mruby/handlers/header.rb b/lib/yard/handlers/header.rb
index bb39563..bb39563 100644
--- a/lib/yard/mruby/handlers/header.rb
+++ b/lib/yard/handlers/header.rb
diff --git a/lib/yard/mruby/handlers/header/base.rb b/lib/yard/handlers/header/base.rb
index 35859f7..35859f7 100644
--- a/lib/yard/mruby/handlers/header/base.rb
+++ b/lib/yard/handlers/header/base.rb
diff --git a/lib/yard/mruby/handlers/header/define_handler.rb b/lib/yard/handlers/header/define_handler.rb
index e69de29..e69de29 100644
--- a/lib/yard/mruby/handlers/header/define_handler.rb
+++ b/lib/yard/handlers/header/define_handler.rb
diff --git a/lib/yard/mruby/handlers/header/function_handler.rb b/lib/yard/handlers/header/function_handler.rb
index e69de29..e69de29 100644
--- a/lib/yard/mruby/handlers/header/function_handler.rb
+++ b/lib/yard/handlers/header/function_handler.rb
diff --git a/lib/yard/mruby/handlers/header/header_handler.rb b/lib/yard/handlers/header/header_handler.rb
index e69de29..e69de29 100644
--- a/lib/yard/mruby/handlers/header/header_handler.rb
+++ b/lib/yard/handlers/header/header_handler.rb
diff --git a/lib/yard/mruby.rb b/lib/yard/mruby.rb
index d94cd78..683d3c5 100644
--- a/lib/yard/mruby.rb
+++ b/lib/yard/mruby.rb
@@ -1,3 +1,3 @@
 require_relative "mruby/version"
 require_relative "mruby/code_objects"
-require_relative "mruby/handlers"
+require_relative "handlers"
diff --git a/lib/yard/mruby/handlers.rb b/lib/yard/mruby/handlers.rb
deleted file mode 100644
index cb0c898..0000000
--- a/lib/yard/mruby/handlers.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require_relative 'handlers/source'
-require_relative 'handlers/header'
diff --git a/lib/yard/mruby/handlers/source.rb b/lib/yard/mruby/handlers/source.rb
deleted file mode 100644
index af8b0db..0000000
--- a/lib/yard/mruby/handlers/source.rb
+++ /dev/null
@@ -1,5 +0,0 @@
- require_relative 'source/base'
- require_relative 'source/class_handler'
- require_relative 'source/module_handler'
- require_relative 'source/method_handler'
-
diff --git a/lib/yard/mruby/handlers/source/base.rb b/lib/yard/mruby/handlers/source/base.rb
deleted file mode 100644
index 4578079..0000000
--- a/lib/yard/mruby/handlers/source/base.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module YARD
-  module MRuby
-    module Handlers
-      module Source
-        class Base < YARD::Handlers::C::Base
-          DEFAULT_NAMESPACES = {
-            'mrb->object_class' => 'Object'
-          }
-
-          def namespace_for_variable(var)
-            return DEFAULT_NAMESPACES[var] if DEFAULT_NAMESPACES[var]
-            super
-          end
-        end
-      end
-    end
-  end
-end