summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSeba Gamboa <[email protected]>2015-09-25 13:24:42 -0300
committerSeba Gamboa <[email protected]>2015-09-25 13:24:42 -0300
commit82e906d74dcc943d737ced7a6ebfee1e71a74aaf (patch)
tree56d3cbebc7d6525788dc4dd847a5c55b51ddb2ce
parent48fb10fef522ab9262061bc612b44d74a8bda17d (diff)
downloadyard-mruby-82e906d74dcc943d737ced7a6ebfee1e71a74aaf.tar.gz
yard-mruby-82e906d74dcc943d737ced7a6ebfee1e71a74aaf.zip
Fixes from MRuby Core testing
-rw-r--r--lib/yard/mruby/code_objects/header_object.rb6
-rw-r--r--lib/yard/mruby/handlers/c/base.rb2
-rw-r--r--templates/default/fulldoc/html/setup.rb2
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/yard/mruby/code_objects/header_object.rb b/lib/yard/mruby/code_objects/header_object.rb
index 2e70230..59f67a3 100644
--- a/lib/yard/mruby/code_objects/header_object.rb
+++ b/lib/yard/mruby/code_objects/header_object.rb
@@ -3,6 +3,12 @@ module YARD::MRuby::CodeObjects
# A HeaderObject represents a MRuby header inside an include directory
# It groups C Functions and define macros.
class HeaderObject < YARD::CodeObjects::NamespaceObject
+ def initialize(*args)
+ super
+
+ raise "Invalid Header" unless self.title.match(/\.h$/)
+ end
+
def functions
children.find_all {|d| d.is_a?(FunctionObject) }
end
diff --git a/lib/yard/mruby/handlers/c/base.rb b/lib/yard/mruby/handlers/c/base.rb
index 32a48aa..6bb2436 100644
--- a/lib/yard/mruby/handlers/c/base.rb
+++ b/lib/yard/mruby/handlers/c/base.rb
@@ -48,5 +48,5 @@ module YARD::MRuby::Handlers
end
- YARD::Handlers::Processor.register_handler_namespace :C, C
+ YARD::Handlers::Processor.register_handler_namespace :c, C
end
diff --git a/templates/default/fulldoc/html/setup.rb b/templates/default/fulldoc/html/setup.rb
index 5e306e8..43e1e15 100644
--- a/templates/default/fulldoc/html/setup.rb
+++ b/templates/default/fulldoc/html/setup.rb
@@ -15,7 +15,7 @@ end
def generate_header_list
headers = Registry.all(:header)
- headers_ordered_by_name = headers.sort {|x,y| x.value.to_s <=> y.value.to_s }
+ headers_ordered_by_name = headers.sort {|x,y| x.name.to_s <=> y.name.to_s }
generate_full_list headers_ordered_by_name, :headers
end