junoser 0.7.6 → 0.8.0

data/lib/junoser/ruler.rb

@@ -166,7 +166,7 @@ module Junoser
 
       str.gsub! '"any" | "any-ipv4" | "any-ipv6"', '"any-ipv4" | "any-ipv6" | "any"'
 
-                # Fix overkill
+      # Fix overkill
       str.gsub!(/^(\s*)"priority" \(\s*ca\(\s*arg\s*\)/) do
         fmt(['"priority" (',
              '  a(arg, arg)', $1])
@@ -219,8 +219,8 @@ module Junoser
       # Fix .xsd: Elements without "nokeyword" flag
       #
       str.gsub!(/\((.*) \| "name"\)/) { "(#{$1} | arg)" }
+      str.gsub!(/\("name" \| (.*?)\)/) { "(#{$1} | arg)" }
       str.gsub! '"vlan" ("all" | "vlan-name")', '"vlan" ("all" | arg)'
-      str.gsub!(/\((.*) \| "vlan-id"\)/) { "(#{$1} | arg)" }
 
       %w[filename].each do |key|
         str.gsub! %("#{key}" arg), 'arg'
@@ -297,6 +297,12 @@ module Junoser
       str.gsub!(/^(\s*)\)(,\s*"fpc" enum\(\("all" \| "fpc-slot-number"\)\) \(\s*)c\((.*"lldp-priority"\s*\)\s*\))/m) do
         "#{$1}).as(:oneline)#{$2}sc(#{$3}.as(:oneline)"
       end
+      str.gsub! '"fpc" enum(("all" | "fpc-slot-number"))', '"fpc" ("all" | arg)'
+
+      # Fix .xsd: slot numbers in "set chassis alarm fru-absence ignore fpc xxx pem xxx"
+      # these must come after the "poe" section above, which matches "fpc" enum(("all" | "fpc-slot-number"))
+      str.gsub! '("all" | "fpc-slot-number")', '("all" | arg)'
+      str.gsub! '("all" | "psu-slot-number")', '("all" | arg)'
 
       # Fix .xsd: support "set protocols iccp peer xxx liveness-detection single-hop"
       str.gsub!(/(^rule\(:peer_group\) do.*?\n(\s*)"detection-time" \(\s*c\(\s*"threshold" arg\s*\)\s*\))/m) do

data/lib/junoser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Junoser
-  VERSION = '0.7.6'
+  VERSION = '0.8.0'
 end

data/lib/junoser/xsd/base.rb

@@ -40,13 +40,13 @@ module Junoser
         @oneliner ||= !xml.xpath('./xsd:annotation/xsd:appinfo/*[local-name()="flag" and text()="oneliner"]').empty?
       end
 
-      private
-
       def nokeyword?
         # don't use "/flag" as xsd manipulation automatically add "xsd:" prefix
         @nokeyword ||= !xml.xpath('./xsd:annotation/xsd:appinfo/*[local-name()="flag" and text()="nokeyword"]').empty?
       end
 
+      private
+
       def has_single_child_of?(klass) # rubocop:disable Naming/PredicatePrefix
         config.size == 1 && config.first.is_a?(klass)
       end

data/lib/junoser/xsd/choice.rb

@@ -25,15 +25,38 @@ module Junoser
         if config.empty?
           ''
         elsif has_single_child_of?(Junoser::Xsd::Choice)
-          fmt('c(', config.first.config.map(&:to_s).join(",\n"), ')')
+          child = config.first
+          str = join(child.config)
+          return '' if str.empty?
+
+          child.sequential_arguments? ? fmt('s(', str, ')') : fmt('c(', str, ')')
+        elsif sequential_arguments?
+          fmt('s(', join(config), ')')
         else
-          fmt('c(', config.map(&:to_s).join(",\n"), ')')
+          fmt('c(', join(config), ')')
         end
       end
 
       def unbounded?
         xml['maxOccurs'] == 'unbounded'
       end
+
+      # xsd describes a sequence of positional arguments as an unbounded choice of
+      # "nokeyword" elements, eg. "priority <setup-priority> <reservation-priority>".
+      def sequential_arguments?
+        # a bounded choice means one of the arguments, which is a single argument
+        unbounded? && config.size > 1 &&
+          # Strictly, a sequence should cover the arguments only, eg. c("foo", s(arg, arg)).
+          # In .xsd, however, such a choice always has arguments only, so all? is enough.
+          config.all? { |c| c.is_a?(Junoser::Xsd::Element) && c.nokeyword? }
+      end
+
+      private
+
+      # drop a child that renders as an empty string, because an empty operand breaks the generated parser
+      def join(children)
+        children.map(&:to_s).reject(&:empty?).join(",\n")
+      end
     end
   end
 end

data/lib/junoser/xsd/sequence.rb

@@ -35,7 +35,9 @@ module Junoser
           return if str.empty?
 
           # Assuming that <xsd:sequence> always has <xsd:complexType> as the parent
-          if parent.parent&.oneliner? && config.first.unbounded?
+          if child.sequential_arguments?
+            fmt('s(', str, ')')
+          elsif parent.parent&.oneliner? && child.unbounded?
             fmt('sc(', str, ')')
           else
             fmt('c(', str, ')')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Shintaro Kojima