rggen-markdown 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e35fb93a0fc6227415ad2b8647cd127a579ab0fb98553a116e5b04a970744f4
-  data.tar.gz: 673b9127ce1f4e993a93e06c4cf4928f0976d68fdc3fd06f49e9f934559f4cf1
+  metadata.gz: 0540fea4f7d5b8107d8d1d0ce6b118ca4c50e370fe1c6194eac4eb6f56bf2c3d
+  data.tar.gz: 19c867fc995987188ad41e9a3c6a439d3bd5f4ee7535bce97a3bdd5f8971bb56
 SHA512:
-  metadata.gz: cae81e6fe7ed9aeda80268bccffae0799e438744a857dbfcb82b29054abef4ab43674b884018c3aa65f841e4de1d468c074f1ad6a0dbd8693e94bcd876a336fa
-  data.tar.gz: 137a5c107c1ce1834a1edc333e9b33c8dfdb941b8125ef5229b2fbbf655b9ed501a9d64087d61a3a9cddd792ed8000564d53002beb5de037750f868f6f9733ec
+  metadata.gz: b09d1acd86e7baf2a3b8561186e8f353586d5e8db0e836975048f0d8c5a10e76edfb1211445a55eb9c5fa018ef8764aaeebc5bc6d448a7f7cc7b721549bbee32
+  data.tar.gz: d50dbb295bd443a0cb7dcb4f380477d0cfdd4e83440c9117958ebc137f3e5071922cc7cb31f0e2df995199da671f49992108be2de4bf1ade54cab6cdebe26309

data/lib/rggen/markdown.rb

@@ -18,10 +18,10 @@ module RgGen
     def self.register_component(builder)
       builder.output_component_registry(:markdown) do
         register_component [
-          :register_map, :register_block, :register, :bit_field
+          :root, :register_block, :register_file, :register, :bit_field
         ] do |category|
           component Component, ComponentFactory
-          feature Feature, FeatureFactory if category != :register_map
+          feature Feature, FeatureFactory if category != :root
         end
       end
     end

data/lib/rggen/markdown/register/markdown.erb

@@ -1,13 +1,13 @@
 
-### <%= anchor(anchor_id) %><%= register.name %>
+### <%= anchor(anchor_id) %><%= title %>
 
-<% register.printables.each do |name, values| %>
+<% register_printables.each do |name, value_or_values| %>
 * <%= name %>
-    <% Array(values || [nil]).each do |value| %>
-    * <%= value || 'NA' %>
+    <% Array(value_or_values).each do |value| %>
+    * <%= value %>
     <% end %>
 <% end %>
-<% if register.bit_fields? %>
+<% unless register.bit_fields.empty? %>
 
 <%= bit_field_table %>
-<% end%>
+<% end %>

data/lib/rggen/markdown/register/markdown.rb

@@ -3,13 +3,24 @@
 RgGen.define_simple_feature(:register, :markdown) do
   markdown do
     export def anchor_id
-      [register_block.anchor_id, register.name].join('-')
+      [register_block, *register_files, register]
+        .map(&:name).join('-')
     end
 
     main_code :markdown, from_template: true
 
     private
 
+    def title
+      register.printables[:layer_name]
+    end
+
+    def register_printables
+      register.printables
+        .reject { |key, _| [:name, :layer_name].include?(key) }
+        .compact
+    end
+
     def bit_field_table
       column_names = bit_field_printables.first.keys
       rows =

data/lib/rggen/markdown/register_block/markdown.erb

@@ -1,8 +1,8 @@
-## <%= register_block.name %>
+## <%= title %>
 
-<% register_block.printables.each do |name, printable| %>
+<% register_block_printables.each do |name, printable| %>
 * <%= name %>
-    * <%= printable || 'NA' %>
+    * <%= printable %>
 <% end %>
 
 <%= register_table %>

data/lib/rggen/markdown/register_block/markdown.rb

@@ -8,7 +8,7 @@ RgGen.define_simple_feature(:register_block, :markdown) do
 
     write_file '<%= register_block.name %>.md' do |file|
       file.body do |code|
-        register_block.generate_code(:markdown, :top_down, code)
+        register_block.generate_code(code, :markdown, :top_down)
       end
     end
 
@@ -16,21 +16,28 @@ RgGen.define_simple_feature(:register_block, :markdown) do
 
     private
 
+    def title
+      register_block.name
+    end
+
+    def register_block_printables
+      register_block.printables
+        .reject { |key, _| key == :name }
+        .compact
+    end
+
     def register_table
-      table([:name, :offset_address], table_rows)
+      table([:name], table_rows)
     end
 
     def table_rows
-      register_block.registers
-        .zip(register_block.registers.map(&:printables))
-        .map { |register, printables| table_row(register, printables) }
+      register_block.registers.map(&method(:table_row))
     end
 
-    def table_row(register, printables)
-      [
-        anchor_link(printables[:name], register.anchor_id),
-        printables[:offset_address]
-      ]
+    def table_row(register)
+      name = register.printables[:layer_name]
+      id = register.anchor_id
+      [anchor_link(name, id)]
     end
   end
 end

data/lib/rggen/markdown/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module Markdown
-    VERSION = '0.16.0'
+    VERSION = '0.17.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-markdown
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,5 +74,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: rggen-markdown-0.16.0
+summary: rggen-markdown-0.17.0
 test_files: []