bitclust-core 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f79dad5d50c6ae45ebf5e028d9b26e73562a71163fc22e4e2bfb218ea790e6a
-  data.tar.gz: d4f215f77dc34e08d46b26ed93c2ddca3d5f90e22ecd28a20c324ff5067fb1f9
+  metadata.gz: 0b2eea15e85eb324e528b0528b01f84eae456154be836941cc43375028336fc7
+  data.tar.gz: 2cda706afc4b6bc09d4ca21e51eb9167068554b00193c23ba07f8e8ab9c31b98
 SHA512:
-  metadata.gz: d819f311b99228af293af81eff952c0f6b05c4320ec2ed42d0046f4d4b6ce61b6e42f7d699893ef8aa39001533bc1664b8371347cfb2bc327302dc249e3244e4
-  data.tar.gz: d7d5e8d7d6e7a307b809c637c1d5337276e46f8b4a398779b9f7dffd547dcda330cd0d78bca449b55e7488113e5c7770f16249a697d1dcec9b1eeeaf47a1f8cf
+  metadata.gz: ed87e3a8a250751dfe518cd40c76b8dc92ee90312810f79e384a78239b7167bbbc80d5da86ca742114f65b977f0338af40a26b8dd62d0890915201c021d1b7ec
+  data.tar.gz: 5377b074eb7f16a473998d9869ae04911f703cdd35fc9306a5153092b185d09f57a8e057dfaded3a08e178f869ae4e3c080ac1bf088756f19636ce5e21f09c62

data/data/bitclust/template.offline/class

@@ -45,12 +45,11 @@
       </li>
     </ol>
   </nav>
+<% headline_init %>
+<%= headline("#{@entry.type} #{@entry.name}" + @entry.ancestors[1..@alevel].map{|c| " + #{c.name}" }.join) %>
 </header>
 
-<%
-    headline_init
-%>
-<%= headline("#{@entry.type} #{@entry.name}" + @entry.ancestors[1..@alevel].map{|c| " + #{c.name}" }.join) %>
+<main>
 <%
     myself, *supers = @entry.ancestors
     n = 0
@@ -67,7 +66,7 @@
         <% n += 1 %>
       <% end %>
       <li>
-        <%= escape_html(myself.name) %>
+        <%= @entry.object? ? class_link(myself.name) : escape_html(myself.name) %>
       </li>
     </ol>
   </nav>
@@ -128,15 +127,18 @@
 <% items.each do |label, entries, prefix| next if entries.empty? %>
 <dt><%= label %></dt>
 <dd>
+<ul class="class-toc">
 <%
-  entries.each do |m|
-    m.names.each do |mname|
+  entries.inject([]){ |ary, m| ary.concat(m.names.map{ |mname| [m.index_id, mname] }) }
+    .uniq
+    .sort_by{ |_, mname| mname.gsub(/(?=[^\da-zA-Z])/, "\t") }
+    .each do |index_id, mname|
 %>
-<a href="#<%= m.index_id %>"><%= "#{prefix}#{mname}" %></a>
+<li><a href="#<%= index_id %>"><%= escape_html "#{prefix}#{mname}" %></a></li>
 <%
-    end
   end
 %>
+</ul>
 </dd>
 <% end %>
 </dl>
@@ -151,14 +153,18 @@ displayed_methods = Set.new(ents.instance_methods.map(&:name))
 <dl>
   <% ancestors.each do |c|
        methods = c.partitioned_entries(@alevel).instance_methods
-         .reject { |m| displayed_methods.include?(m.name) }
+         .flat_map { |m| m.names.map { |n| [n, m] } }
+         .reject { |name,| displayed_methods.include?(name) }
+         .sort
        next if methods.empty? %>
 <dt><%= _('Ancestor Methods %s', c.name) %></dt>
 <dd>
-    <% methods.each do |m| %>
-      <%= method_link(m.spec_string, m.name) %>
-      <% displayed_methods << m.name %>
+  <ul class="class-toc">
+    <% methods.each do |name, m| %>
+      <li><%= method_link(m.spec_string, name) %></li>
+      <% displayed_methods << name %>
     <% end %>
+  </ul>
 </dd>
 <%
   end
@@ -185,3 +191,4 @@ end %>
     end
     headline_pop
 %>
+</main>

data/data/bitclust/template.offline/class-index

@@ -31,12 +31,11 @@
       </li>
     </ol>
   </nav>
+<% headline_init %>
+<%= headline(_("Class Index")) %>
 </header>
 
-<%
-    headline_init
-%>
-<%= headline(_("Class Index")) %>
+<main>
 <p>
 <%= @entries.size %> classes/modules in database
 </p>
@@ -56,3 +55,4 @@
     headline_pop
 %>
 </ul>
+</main>

data/data/bitclust/template.offline/doc

@@ -38,9 +38,11 @@
       <% end %>
     </ol>
   </nav>
-</header>
-
 <% headline_init %>
 <%= headline(@entry.title) %>
+</header>
+
+<main>
 <% headline_push %>
 <%= compile_rd(@entry.source) %>
+</main>

data/data/bitclust/template.offline/function

@@ -39,10 +39,11 @@
       </li>
     </ol>
   </nav>
-</header>
-
 <% headline_init %>
 <%= headline("#{entry.type_label} #{entry.label}") %>
+</header>
+
+<main>
 <dl class="functionlist">
 <dt>
   <code><%= entry.header %></code>
@@ -51,3 +52,4 @@
 <%= compile_function(entry) %>
 </dd>
 </dl>
+</main>

data/data/bitclust/template.offline/function-index

@@ -31,12 +31,11 @@
       </li>
     </ol>
   </nav>
+<% headline_init %>
+<%= headline(_("Function Index")) %>
 </header>
 
-<%
-    headline_init
-%>
-<%= headline(_("Function Index")) %>
+<main>
 <table class="entries functions">
 <%
     headline_push
@@ -51,3 +50,4 @@
     headline_pop
 %>
 </table>
+</main>

data/data/bitclust/template.offline/layout

@@ -1,28 +1,29 @@
 <!DOCTYPE html>
 <html lang="ja-JP">
 <head>
-  <%= google_tag_manager %>
-  <%= meta_robots %>
-  <meta http-equiv="Content-Type" content="text/html; charset=<%=h charset() %>">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" type="text/css" href="<%=h css_url() %>">
-  <link rel="stylesheet" type="text/css" href="<%=h custom_css_url("syntax-highlight.css") %>">
-  <link rel="icon" type="image/png" href="<%=h favicon_url() %>">
-  <% if @conf[:canonical_base_url] %>
-  <link rel="canonical" href="<%= canonical_url() %>">
-  <% end %>
-  <title><%=h @title %> (Ruby <%=h ruby_version %> リファレンスマニュアル)</title>
-  <meta name="description" content="<%=h @description %>">
-  <script src="<%=h custom_js_url('script.js') %>"></script>
+<%= google_tag_manager %>
+<%= meta_robots %>
+<meta charset="<%=h charset() %>">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="stylesheet" href="<%=h css_url() %>">
+<link rel="stylesheet" href="<%=h custom_css_url("syntax-highlight.css") %>">
+<link rel="icon" type="image/png" href="<%=h favicon_url() %>">
+<% if @conf[:canonical_base_url] %>
+<link rel="canonical" href="<%= canonical_url() %>">
+<% end %>
+<title><%=h @title %> (Ruby <%=h ruby_version %> リファレンスマニュアル)</title>
+<meta name="description" content="<%=h @description %>">
+<script src="<%=h custom_js_url('script.js') %>"></script>
 </head>
 <body>
 <%= yield %>
-<div id="footer">
+<footer id="footer">
   <a rel="license" href="https://creativecommons.org/licenses/by/3.0/">
     <img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/3.0/88x31.png" />
   </a>
 
   フィードバックは<a href="https://github.com/rurema/doctree/issues/new" id="feedback-link">こちら</a>
-  <script>if (window.URLSearchParams) { document.getElementById("feedback-link").search = new URLSearchParams({'body': document.location}); }</script></div>
+  <script>if (window.URLSearchParams) { document.getElementById("feedback-link").search = new URLSearchParams({'body': document.location}); }</script>
+</footer>
 </body>
 </html>

data/data/bitclust/template.offline/library

@@ -38,13 +38,11 @@
       </li>
     </ol>
   </nav>
-</header>
-
-<%
-    headline_init
-%>
+<% headline_init %>
 <%= headline(@entry.id == '_builtin' ? _('Builtin Library') : "library #{@entry.name}") %>
+</header>
 
+<main>
 <%
     headline_push
     all_classes = @entry.all_classes
@@ -99,12 +97,17 @@
   end
 %>
 <%
-    ents = @entry.methods.sort
+    ents = @entry.methods.flat_map do |m|
+      c, t, n, = methodid2specparts(m.id)
+      prefix = (t == '$' ? '' : c) + t
+      m.names.map { |name| [prefix + name, c + t + n] }
+    end.sort
     unless ents.empty? %>
 <%= headline(_("Added/Redefined Methods")) %>
 <p><code>
-<%    ents.each do |m| %>
-<%= link_to_method(m, true) %>
+<%    ents.each do |label, spec| %>
+<%= method_link(spec, label) %>
 <%    end %>
 </code></p>
 <%  end %>
+</main>

data/data/bitclust/template.offline/library-index

@@ -31,12 +31,11 @@
       </li>
     </ol>
   </nav>
+<% headline_init %>
+<%= headline(_("Library Index")) %>
 </header>
 
-<%
-    headline_init
-%>
-<%= headline(_("Library Index")) %>
+<main>
 <%
     headline_push
     weight = {"Builtin" => "", "" => "\x7f\x7f"}
@@ -75,3 +74,4 @@
     end
     headline_pop
 %>
+</main>

data/data/bitclust/template.offline/method

@@ -53,10 +53,11 @@
       </li>
     </ol>
   </nav>
-</header>
-
 <% headline_init %>
 <%= headline("#{entry.type_label} #{entry.label}") %>
+</header>
+
+<main>
 <dl class="methodlist">
 <%
     headline_push
@@ -68,3 +69,4 @@
     headline_pop
 %>
 </dl>
+</main>

data/lib/bitclust/classentry.rb

@@ -210,8 +210,14 @@ module BitClust
 
     def ancestors
       @ancestors ||=
+        if self.object? && superclass()
+          myself, *ancestors = superclass().ancestors
+          [ myself, included().map {|m| m.ancestors },
+            ancestors ].flatten
+        else
           [ self, included().map {|m| m.ancestors },
             superclass() ? superclass().ancestors : [] ].flatten
+        end
     end
 
     def included_modules

data/lib/bitclust/nameutils.rb

@@ -19,8 +19,8 @@ module BitClust
     LIBNAME_RE     = %r<[\w\-]+(/[\w\-]+)*>
     CONST_RE       = /[A-Z]\w*/
     CONST_PATH_RE  = /#{CONST_RE}(?:::#{CONST_RE})*/
-    CLASS_NAME_RE  = /(?:#{CONST_RE}(?:::compatible)?|fatal|ARGF.class|main)/
-    CLASS_PATH_RE  = /(?:#{CONST_PATH_RE}(?:::compatible)?|fatal|ARGF.class|main)/
+    CLASS_NAME_RE  = /(?:#{CONST_RE}(?:::compatible)?|fatal|ARGF\.class|main)/
+    CLASS_PATH_RE  = /(?:#{CONST_PATH_RE}(?:::compatible)?|fatal|ARGF\.class|main)/
     METHOD_NAME_RE = /\w+[?!=]?|===|==|=~|<=>|<=|>=|!=|!~|!@|!|\[\]=|\[\]|\*\*|>>|<<|\+@|\-@|[~+\-*\/%&|^<>`]/
     TYPEMARK_RE    = /(?:\.|\#|\.\#|::|\$)/
     METHOD_SPEC_RE = /#{CLASS_PATH_RE}#{TYPEMARK_RE}#{METHOD_NAME_RE}/

data/lib/bitclust/preprocessor.rb

@@ -76,6 +76,11 @@ module BitClust
     def next_line(f)
       while line = f.gets
         case line
+        when /\A(?!\#@)/
+          if current_cond.processing?
+            @buf.push line
+            break
+          end
         when /\A\#@\#/   # preprocessor comment
           ;
         when /\A\#@todo/i
@@ -107,13 +112,8 @@ module BitClust
             parse_error "no matching \#@if", line  if cond_toplevel?
             cond_pop
           end
-        when /\A\#@/
-          parse_error "unknown preprocessor directive", line
         else
-          if current_cond.processing?
-            @buf.push line
-            break
-          end
+          parse_error "unknown preprocessor directive", line
         end
       end
       if @buf.empty?

data/lib/bitclust/rrdparser.rb

@@ -120,11 +120,7 @@ module BitClust
           @context.define_module name
           read_class_body f
         when 'object'
-          if superclass
-            # FIXME
-            tty_warn "#{line.location}: singleton object class not implemented yet"
-          end
-          @context.define_object name
+          @context.define_object name, superclass
           read_object_body f
         when 'reopen'
           @context.reopen_class name
@@ -366,8 +362,9 @@ module BitClust
         register_class :module, name, nil
       end
 
-      def define_object(name)
-        register_class :object, name, nil
+      def define_object(name, singleton_object_class)
+        singleton_object_class = @db.get_class(singleton_object_class) if singleton_object_class
+        register_class :object, name, singleton_object_class
       end
 
       def register_class(type, name, superclass)

data/lib/bitclust/syntax_highlighter.rb

@@ -216,6 +216,7 @@ module BitClust
       when token == "::" && [:class, :module].include?(@stack.last)
         @name_buffer << token
       else
+        @stack.pop if @stack.last == :method_call
         on_default(:on_op, token, data)
       end
       data

data/lib/bitclust/version.rb

@@ -1,3 +1,3 @@
 module BitClust
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

data/test/test_syntax_highlighter.rb

@@ -70,4 +70,16 @@ class TestSyntaxHighlighter < Test::Unit::TestCase
     expected = '<span class="nb">puts</span> <span class="sr">/&lt;a&gt;/</span>'
     assert_equal(expected, highlight(source))
   end
+
+  test 'symbol method' do
+    source = <<~END
+      p 1.!
+      p 2
+    END
+    expected = <<~END
+      <span class="nb">p</span> <span class="mi">1</span><span class="p">.</span><span class="o">!</span>
+      <span class="nb">p</span> <span class="mi">2</span>
+    END
+    assert_equal(expected, highlight(source))
+  end
 end

data/theme/default/script.js

@@ -18,9 +18,8 @@
         elem.appendChild(copyText)
 
         // COPY button
-        const btn = document.createElement('div')
+        const btn = document.createElement('span')
         btn.setAttribute('class', 'highlight__copy-button')
-        // btn.textContent = "COPY"
         elem.insertBefore(btn, elem.firstChild)
 
         btn.onclick = function(){

data/theme/default/style.css

@@ -114,8 +114,8 @@ span.compileerror {
 }
 
 code, pre, tt {
-  font-size: 90%;
-  font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
+    font-size: 90%;
+    font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
 }
 
 pre {
@@ -350,6 +350,22 @@ hr {
     padding-right: 0.3rem;
 }
 
+.class-toc {
+    list-style: none;
+    margin: 0.5em 0;
+    padding: 0;
+    column-gap: 1em;
+    column-width: 10em;
+    column-rule: 1px dotted #BBB;
+}
+
+.class-toc > li {
+    padding-left: 1em;
+    text-indent: -1em;
+    word-break: break-all;
+    break-inside: avoid;
+}
+
 @media print {
     body {
         font-family: osaka,'MS Mincho',serif;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitclust-core
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - https://github.com/rurema
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -232,7 +232,12 @@ files:
 - theme/lillia/test.css
 homepage: https://docs.ruby-lang.org/ja/
 licenses: []
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/rurema/bitclust/issues
+  documentation_uri: https://github.com/rurema/doctree/wiki
+  homepage_uri: https://docs.ruby-lang.org/ja/
+  source_code_uri: https://github.com/rurema/bitclust
+  wiki_uri: https://github.com/rurema/doctree/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -248,24 +253,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: BitClust is a rurema document processor.
 test_files:
-- test/run_test.rb
-- test/test_nameutils.rb
-- test/test_functiondatabase.rb
-- test/test_bitclust.rb
-- test/test_simplesearcher.rb
 - test/test_functionreferenceparser.rb
-- test/test_runner.rb
 - test/test_refsdatabase.rb
-- test/test_methodsignature.rb
-- test/test_libraryentry.rb
 - test/test_rrdparser.rb
-- test/test_preprocessor.rb
-- test/test_entry.rb
+- test/test_syntax_highlighter.rb
 - test/test_methoddatabase.rb
+- test/test_simplesearcher.rb
+- test/test_nameutils.rb
+- test/run_test.rb
+- test/test_methodsignature.rb
 - test/test_rdcompiler.rb
-- test/test_syntax_highlighter.rb
+- test/test_functiondatabase.rb
+- test/test_runner.rb
+- test/test_bitclust.rb
+- test/test_entry.rb
+- test/test_preprocessor.rb
+- test/test_libraryentry.rb