Back off on explicit to_sxp arguments.

dryruby · Dec 19, 2021 · dd64fd6 · dd64fd6
1 parent d03a26a
commit dd64fd6
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 25 deletions.
diff --git a/examples/abnf/parser.rb b/examples/abnf/parser.rb
@@ -273,10 +273,8 @@ def ast
 
   # Output formatted S-Expression of grammar
   #
-  # @param [Hash{Symbol => RDF::URI}] prefixes(nil)
-  # @param [RDF::URI] base_uri(nil)
   # @return [String]
-  def to_sxp(prefixes: nil, base_uri: nil)
+  def to_sxp(**options)
     require 'sxp' unless defined?(SXP)
     # Output rules as a formatted S-Expression
     SXP::Generator.string(ast.map(&:for_sxp))

diff --git a/examples/ebnf-ll1-parser/parser.rb b/examples/ebnf-ll1-parser/parser.rb
@@ -315,10 +315,8 @@ def initialize(input, **options, &block)
 
   # Output formatted S-Expression of grammar
   #
-  # @param [Hash{Symbol => RDF::URI}] prefixes(nil)
-  # @param [RDF::URI] base_uri(nil)
   # @return [String]
-  def to_sxp(prefixes: nil, base_uri: nil)
+  def to_sxp(**options)
     require 'sxp' unless defined?(SXP)
     # Output rules as a formatted S-Expression
     SXP::Generator.string(@ast.map(&:for_sxp))

diff --git a/examples/ebnf-peg-parser/parser.rb b/examples/ebnf-peg-parser/parser.rb
@@ -311,10 +311,8 @@ def initialize(input, **options, &block)
 
   # Output formatted S-Expression of grammar
   #
-  # @param [Hash{Symbol => RDF::URI}] prefixes(nil)
-  # @param [RDF::URI] base_uri(nil)
   # @return [String]
-  def to_sxp(prefixes: nil, base_uri: nil)
+  def to_sxp(**options)
     require 'sxp' unless defined?(SXP)
     # Output rules as a formatted S-Expression
     SXP::Generator.string(@ast.map(&:for_sxp))

diff --git a/examples/isoebnf/parser.rb b/examples/isoebnf/parser.rb
@@ -231,10 +231,8 @@ def initialize(input, **options, &block)
 
   # Output formatted S-Expression of grammar
   #
-  # @param [Hash{Symbol => RDF::URI}] prefixes(nil)
-  # @param [RDF::URI] base_uri(nil)
   # @return [String]
-  def to_sxp(prefixes: nil, base_uri: nil)
+  def to_sxp(**options)
     require 'sxp' unless defined?(SXP)
     # Output rules as a formatted S-Expression
     SXP::Generator.string(@ast.map(&:for_sxp))

diff --git a/lib/ebnf/base.rb b/lib/ebnf/base.rb
@@ -202,10 +202,8 @@ def each(kind, &block)
     ##
     # Write out parsed syntax string as an S-Expression
     #
-    # @param [Hash{Symbol => RDF::URI}] prefixes(nil)
-    # @param [RDF::URI] base_uri(nil)
     # @return [String]
-    def to_sxp(prefixes: nil, base_uri: nil)
+    def to_sxp(**options)
       require 'sxp' unless defined?(SXP)
       SXP::Generator.string(ast.map(&:for_sxp))
     end

diff --git a/lib/ebnf/rule.rb b/lib/ebnf/rule.rb
@@ -206,12 +206,11 @@ def for_sxp
     end
 
     # Return SXP representation of this rule
-    # @param [Hash{Symbol => RDF::URI}] prefixes(nil)
-    # @param [RDF::URI] base_uri(nil)
+    #
     # @return [String]
-    def to_sxp(prefixes: nil, base_uri: nil)
+    def to_sxp(**options)
       require 'sxp' unless defined?(SXP)
-      for_sxp.to_sxp(prefixes: prefixes, base_uri: base_uri)
+      for_sxp.to_sxp(**options)
     end
 
     alias_method :to_s, :to_sxp

diff --git a/spec/ll1/data/parser.rb b/spec/ll1/data/parser.rb
@@ -219,10 +219,8 @@ def initialize(input, **options, &block)
 
   # Output formatted S-Expression of grammar
   #
-  # @param [Hash{Symbol => RDF::URI}] prefixes(nil)
-  # @param [RDF::URI] base_uri(nil)
   # @return [String]
-  def to_sxp(prefixes: nil, base_uri: nil)
+  def to_sxp(**options)
     require 'sxp' unless defined?(SXP)
     # Output rules as a formatted S-Expression
     SXP::Generator.string(@ast.map(&:for_sxp))

diff --git a/spec/peg/data/parser.rb b/spec/peg/data/parser.rb
@@ -160,10 +160,8 @@ def initialize(input, **options, &block)
 
   # Output formatted S-Expression of grammar
   #
-  # @param [Hash{Symbol => RDF::URI}] prefixes(nil)
-  # @param [RDF::URI] base_uri(nil)
   # @return [String]
-  def to_sxp(prefixes: nil, base_uri: nil)
+  def to_sxp(**options)
     require 'sxp' unless defined?(SXP)
     # Output rules as a formatted S-Expression
     SXP::Generator.string(@ast.map(&:for_sxp))