Stylistic fixes

This corrects metanorma#106
hmdne · Jul 1, 2024 · 8c5a87b · 8c5a87b
1 parent d365dd0
commit 8c5a87b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 20 deletions.
diff --git a/lib/coradoc/element/comment_block.rb b/lib/coradoc/element/comment_block.rb
@@ -10,9 +10,11 @@ def initialize(text, options = {})
         end
 
         def to_adoc
-          "////\n" +
-          "#{@text}\n" +
-          "////#{@line_break}"
+          <<~ADOC.chomp
+            ////
+            #{@text}
+            ////#{@line_break}
+          ADOC
         end
       end
     end

diff --git a/lib/coradoc/element/document_attributes.rb b/lib/coradoc/element/document_attributes.rb
@@ -17,11 +17,9 @@ def to_hash
       end
 
       def to_adoc
-        adoc = ""
-        to_hash.each do |key, value|
-          adoc << ":#{key}: #{value}\n"
-        end
-        adoc
+        to_hash.map do |key, value|
+          ":#{key}: #{value}\n"
+        end.join("\n") + "\n"
       end
     end
   end

diff --git a/lib/coradoc/parser/asciidoc/attribute_list.rb b/lib/coradoc/parser/asciidoc/attribute_list.rb
@@ -25,20 +25,39 @@ def positional_attribute
             ).as(:positional)
         end
 
+        def named_many
+          (named_attribute.repeat(1,1) >>
+              (str(",") >> named_attribute).repeat(0))
+        end
+
+        def positional_one_named_many
+          (positional_attribute.repeat(1,1) >>
+            (str(",") >> named_attribute).repeat(1))
+        end
+
+        def positional_many_named_many
+          (positional_attribute.repeat(1,1) >>
+            (str(",") >> positional_attribute).repeat(1) >>
+            (str(",") >> named_attribute).repeat(1))
+        end
+
+        def positional_many
+          (positional_attribute.repeat(1,1) >>
+            (str(",") >> positional_attribute).repeat(0))
+        end
+
+        def positional_zero_or_one
+          positional_attribute.repeat(0,1)
+        end
+
         def attribute_list
           str("[") >>
-          (
-            (named_attribute.repeat(1,1) >>
-              (str(",") >> named_attribute).repeat(0)) |
-            (positional_attribute.repeat(1,1) >>
-              (str(",") >> named_attribute).repeat(1)) |
-            (positional_attribute.repeat(1,1) >>
-              (str(",") >> positional_attribute).repeat(1) >>
-              (str(",") >> named_attribute).repeat(1)) |
-            (positional_attribute.repeat(1,1) >>
-              (str(",") >> positional_attribute).repeat(0)) |
-            positional_attribute.repeat(0,1)
-            ).as(:attribute_array).as(:attribute_list) >>
+          ( named_many |
+            positional_one_named_many |
+            positional_many_named_many |
+            positional_many |
+            positional_zero_or_one
+          ).as(:attribute_array).as(:attribute_list) >>
           str("]")
         end