junoser 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 713f225a607c33ca8acdd832a0252b217da1c5cfc9d9d5075efee87cde04dff1
-  data.tar.gz: 98bc62a4a4c37c6f654412807f989d486beb4a813d65db661e94883b34294b76
+  metadata.gz: f0f5175a9101056425a61f1d23d8c9ecfc258b25c23deea881bb82a6df7a80b2
+  data.tar.gz: 60ae6a0222865a2f06d05e40fdd9c495103e97b7b60665138a7c1354cb70bb84
 SHA512:
-  metadata.gz: 18c5b6efde1452334353e90676e3375e730fecada9c2b09f173ea40e4f9a6dce54ffe6dc7adfdf65306673f56e86efd50cdbc91a9ed865ae2465f6caddfcdfbc
-  data.tar.gz: c5d9a62f138d08985959bc5dc48213b311a7ea814750e24e4048d4f0c272a6f16b3d60d33ccf06eed2ac72bfd26a0d24bbc19165aa668e8bc8ace2f1f6976049
+  metadata.gz: 4b3db43a02237e582b130324c0cd63340254e9cab85fa9ac525ed7a4fb5c053f06c0eae3d20bd91ebd1a1937ab0aed2ccb537ce6937c25692ab83f8a937e9fe9
+  data.tar.gz: 1fb1f8a6b02658522cdc042fc63bb1a864a4d6be147723169f5e5990762fe51124920d8266759631873e63a80f3186b05642c2584475878218fc2207f5f22fa3

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [0.4.7] - 2022-09-20
+
+### Added
+
+* Faster interface speed up to 800g
+
+### Fixed
+
+* "interfaces interface-range xxx member-range"
+* "classifiers" for QoS
+
+
+## [0.4.6] - 2022-07-02
+
+### Fixed
+
+* Accept quoted strings under "system license keys key"
+* "protocols bgp ... prefix-limit teardown"
+
+
 ## [0.4.5] - 2022-04-27
 
 ### Fixed

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    junoser (0.4.5)
+    junoser (0.4.7)
       parslet
 
 GEM
   remote: https://rubygems.org/
   specs:
     mini_portile2 (2.8.0)
-    nokogiri (1.13.4)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parslet (2.0.0)
@@ -29,4 +29,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.2.26
+   2.3.13

data/lib/junoser/js_ruler.rb

@@ -16,8 +16,9 @@ module Junoser
 
     def rule
       str = @rule.read
+      str = process_lines(str)
       str = str.split(/\n/).map {|l|
-        format(process_line(l)) unless l =~ /^ *#/  # Skip additional comment lines
+        process_line(l) unless l =~ /^ *#/  # Skip additional comment lines
       }.compact.join("\n")
       finalize(str)
     end
@@ -161,9 +162,12 @@ module Junoser
     end
 
     def process_reserved_word(str)
-      # ieee-802.3ad  -> 802.3ad
+      # ieee-802.3ad -> 802.3ad
       str.gsub! 'ieee-802.3ad', '802.3ad'
 
+      # end-range -> to
+      str.gsub! '"end-range"', '"to"'
+
       # "policy | Define a policy context from this zone" -> "from-zone | Define a policy context from this zone"
       str.gsub! 'policy | Define a policy context from this zone', 'from-zone | Define a policy context from this zone'
       # "to-zone-name | Destination zone" -> "to-zone | Destination zone"
@@ -171,6 +175,18 @@ module Junoser
       # "system-name | System name override" -> "name | System name override"
       str.gsub! 'system-name | System name override', 'name | System name override'
 
+      # "set class-of-service interfaces all unit"
+      str.gsub! '"unit(*)"', '"unit(*|arg)"'
+      # "classifiers xxx"
+      str.gsub! '["default"]', '["default", "arg"]'
+
+      # keywords "dest-nat-rule-match", "src-nat-rule-match", "static-nat-rule-match" are wrong
+      str.gsub!(/"(dest|src|static)-nat-rule-match/) { '"match' }
+
+      # faster interface speed support
+      str.gsub! '"40g", "oc3"', '"40g", "100g", "200g", "400g", "800g", "oc3"'
+      str.gsub! '"100G"', '"100G", "200G", "400G", "800G"'
+
       fix_route_filter(str)
 
       str
@@ -192,6 +208,15 @@ module Junoser
       str
     end
 
+    def process_lines(str)
+      # "set protocols mpls path"
+      str.gsub!(/("path" arg \(.*Route of a label-switched path.*)(\s*)c\(/) do
+        "#{$1}#{$2}s(#{$2}ipaddr,"
+      end
+
+      str
+    end
+
     def finalize(lines)
       lines = balance_parenthesis(lines)
       objectize_arg_of_s(lines)

data/lib/junoser/parser.rb

@@ -5324,7 +5324,7 @@ module Junoser
                               a(str("member"), arg),
                               b(a(str("member-range"), arg),
                                   sc(
-                                      b(str("end-range"),
+                                      b(str("to"),
                                         interface_device
                                       )
                                   )
@@ -5406,7 +5406,7 @@ module Junoser
                               ),
                               str("no-pseudowire-down-on-core-isolation"),
                               b(str("speed"),
-                                (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("oc3") | str("oc12") | str("oc48"))
+                                (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("100g") | str("200g") | str("400g") | str("800g") | str("oc3") | str("oc12") | str("oc48"))
                               ),
                               b(str("forwarding-class-accounting"),
                                   c(
@@ -21052,7 +21052,7 @@ module Junoser
       b(arg.as(:arg),
         c(
             b(str("pic-mode"),
-              (str("10G") | str("25G") | str("40G") | str("100G"))
+              (str("10G") | str("25G") | str("40G") | str("100G") | str("200G") | str("400G") | str("800G"))
             ),
             b(str("tunnel-port"),
               chassis_port_type
@@ -27760,7 +27760,7 @@ module Junoser
             ),
             str("no-pseudowire-down-on-core-isolation"),
             b(str("speed"),
-              (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("oc3") | str("oc12") | str("oc48"))
+              (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("100g") | str("200g") | str("400g") | str("800g") | str("oc3") | str("oc12") | str("oc48"))
             ),
             b(str("forwarding-class-accounting"),
                 c(
@@ -40179,7 +40179,7 @@ module Junoser
                     b(a(str("dscp"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -40195,7 +40195,7 @@ module Junoser
                     b(a(str("dscp-ipv6"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -40211,7 +40211,7 @@ module Junoser
                     b(a(str("exp"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -40227,7 +40227,7 @@ module Junoser
                     b(a(str("ieee-802.1"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -40243,7 +40243,7 @@ module Junoser
                     b(a(str("inet-precedence"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -40259,7 +40259,7 @@ module Junoser
                     b(a(str("ieee-802.1ad"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -40899,8 +40899,8 @@ module Junoser
                     b(str("classifiers"),
                         c(
                             b(str("exp"),
-                                c(
-                                  (str("default") | arg)
+                                sc(
+                                      (str("default") | arg)
                                 )
                             ).as(:oneline)
                         )
@@ -40978,13 +40978,13 @@ module Junoser
                         c(
                             str("no-default"),
                             b(str("exp"),
-                                c(
-                                  (str("default") | arg)
+                                sc(
+                                      (str("default") | arg)
                                 )
                             ).as(:oneline),
                             b(str("ieee-802.1"),
                                 sc(
-                                      (str("default")),
+                                      (str("default") | arg),
                                     str("encapsulated"),
                                     b(str("vlan-tag"),
                                       (str("outer") | str("inner"))
@@ -40992,13 +40992,13 @@ module Junoser
                                 )
                             ).as(:oneline),
                             b(str("dscp"),
-                                c(
-                                  (str("default") | arg)
+                                sc(
+                                      (str("default") | arg)
                                 )
                             ).as(:oneline),
                             b(str("dscp-ipv6"),
-                                c(
-                                  (str("default") | arg)
+                                sc(
+                                      (str("default") | arg)
                                 )
                             ).as(:oneline)
                         )
@@ -41008,7 +41008,7 @@ module Junoser
                             c(
                               b(str("ieee-802.1"),
                                   sc(
-                                        (str("default")),
+                                        (str("default") | arg),
                                       str("encapsulated"),
                                       b(str("vlan-tag"),
                                         (str("outer") | str("outer-and-inner"))
@@ -41017,7 +41017,7 @@ module Junoser
                               ).as(:oneline),
                               b(str("ieee-802.1ad"),
                                   sc(
-                                        (str("default")),
+                                        (str("default") | arg),
                                       str("encapsulated"),
                                       b(str("vlan-tag"),
                                         (str("outer") | str("outer-and-inner"))
@@ -41039,7 +41039,7 @@ module Junoser
                     b(a(str("dscp"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -41055,7 +41055,7 @@ module Junoser
                     b(a(str("dscp-ipv6"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -41071,7 +41071,7 @@ module Junoser
                     b(a(str("exp"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -41087,7 +41087,7 @@ module Junoser
                     b(a(str("ieee-802.1"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -41103,7 +41103,7 @@ module Junoser
                     b(a(str("inet-precedence"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -41119,7 +41119,7 @@ module Junoser
                     b(a(str("frame-relay-de"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -41135,7 +41135,7 @@ module Junoser
                     b(a(str("ieee-802.1ad"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -41151,7 +41151,7 @@ module Junoser
                     b(a(str("inet6-precedence"), arg),
                         c(
                             b(str("import"),
-                              (str("default"))
+                              (str("default") | arg)
                             ),
                             b(a(str("forwarding-class"), arg),
                                 c(
@@ -41650,7 +41650,7 @@ module Junoser
                 )
             ),
             str("logical-interface-aggregate-statistics"),
-            a(str("unit"), enum(str("*")),
+            a(str("unit"), enum(arg),
                 c(
                     a(str("output-forwarding-class-map"), arg),
                     a(str("forwarding-class"), arg),
@@ -41701,37 +41701,37 @@ module Junoser
                     b(str("classifiers"),
                         c(
                             str("no-default"),
-                            a(str("dscp"), str("default"),
+                            a(str("dscp"), str("default") | arg,
                                 c(
                                     a(str("family"), arg)
                                 )
                             ),
-                            a(str("dscp-ipv6"), str("default"),
+                            a(str("dscp-ipv6"), str("default") | arg,
                                 c(
                                     a(str("family"), arg)
                                 )
                             ),
                             b(str("exp"),
-                                c(
-                                  (str("default") | arg)
+                                sc(
+                                      (str("default") | arg)
                                 )
                             ).as(:oneline),
                             b(str("ieee-802.1"),
                                 sc(
-                                      (str("default")),
+                                      (str("default") | arg),
                                     b(str("vlan-tag"),
                                       (str("outer") | str("inner") | str("transparent"))
                                     )
                                 )
                             ).as(:oneline),
                             b(str("inet-precedence"),
-                                c(
-                                  (str("default") | arg)
+                                sc(
+                                      (str("default") | arg)
                                 )
                             ).as(:oneline),
                             b(str("ieee-802.1ad"),
                                 sc(
-                                      (str("default")),
+                                      (str("default") | arg),
                                     b(str("vlan-tag"),
                                       (str("outer") | str("inner"))
                                     )
@@ -41741,41 +41741,41 @@ module Junoser
                     ),
                     b(str("ingress-rewrite-rules"),
                         c(
-                            a(str("dscp"), str("default")).as(:oneline),
+                            a(str("dscp"), str("default") | arg).as(:oneline),
                             b(str("dscp-ipv6"),
-                                c(
-                                  (str("default") | arg)
+                                sc(
+                                      (str("default") | arg)
                                 )
                             ).as(:oneline),
-                            a(str("inet-precedence"), str("default")).as(:oneline)
+                            a(str("inet-precedence"), str("default") | arg).as(:oneline)
                         )
                     ),
                     b(str("loss-priority-maps"),
                         c(
                             b(str("frame-relay-de"),
-                                c(
-                                  (str("default") | arg)
+                                sc(
+                                      (str("default") | arg)
                                 )
                             ).as(:oneline)
                         )
                     ),
                     b(str("rewrite-rules"),
                         c(
-                            a(str("dscp"), str("default"),
+                            a(str("dscp"), str("default") | arg,
                                 sc(
                                     b(str("protocol"),
                                       (str("mpls") | str("gtp-inet-outer") | str("gtp-inet-both") | str("inet-outer") | str("inet-both"))
                                     )
                                 )
                             ).as(:oneline),
-                            a(str("dscp-ipv6"), str("default"),
+                            a(str("dscp-ipv6"), str("default") | arg,
                                 sc(
                                     b(str("protocol"),
                                       (str("mpls") | str("gtp-inet-outer") | str("gtp-inet-both"))
                                     )
                                 )
                             ).as(:oneline),
-                            a(str("exp"), str("default"),
+                            a(str("exp"), str("default") | arg,
                                 sc(
                                     b(str("protocol"),
                                       (str("mpls-any") | str("mpls-inet-both") | str("mpls-inet-both-non-vpn"))
@@ -41784,13 +41784,13 @@ module Junoser
                             ).as(:oneline),
                             b(str("ieee-802.1"),
                                 sc(
-                                      (str("default")),
+                                      (str("default") | arg),
                                     b(str("vlan-tag"),
                                       (str("outer") | str("outer-and-inner"))
                                     )
                                 )
                             ).as(:oneline),
-                            a(str("inet-precedence"), str("default"),
+                            a(str("inet-precedence"), str("default") | arg,
                                 sc(
                                     b(str("protocol"),
                                       (str("mpls") | str("gtp-inet-outer") | str("gtp-inet-both") | str("inet-outer") | str("inet-both"))
@@ -41812,19 +41812,19 @@ module Junoser
                                 )
                             ).as(:oneline),
                             b(str("frame-relay-de"),
-                                c(
-                                  (str("default") | arg)
+                                sc(
+                                      (str("default") | arg)
                                 )
                             ).as(:oneline),
                             b(str("ieee-802.1ad"),
                                 c(
-                                      (str("default")),
+                                      (str("default") | arg),
                                     b(str("vlan-tag"),
                                       (str("outer") | str("outer-and-inner"))
                                     )
                                 )
                             ),
-                            a(str("inet6-precedence"), str("default"),
+                            a(str("inet6-precedence"), str("default") | arg,
                                 sc(
                                     b(str("protocol"),
                                       (str("mpls"))
@@ -41836,8 +41836,8 @@ module Junoser
                     b(str("loss-priority-rewrites"),
                         c(
                             b(str("frame-relay-de"),
-                                c(
-                                  (str("default") | arg)
+                                sc(
+                                      (str("default") | arg)
                                 )
                             ).as(:oneline)
                         )
@@ -41875,11 +41875,11 @@ module Junoser
             ),
             b(str("classifiers"),
                 c(
-                    a(str("dscp"), str("default")),
-                    a(str("dscp-ipv6"), str("default")),
+                    a(str("dscp"), str("default") | arg),
+                    a(str("dscp-ipv6"), str("default") | arg),
                     b(str("ieee-802.1"),
                         sc(
-                              (str("default")),
+                              (str("default") | arg),
                             b(str("vlan-tag"),
                               (str("outer") | str("inner"))
                             )
@@ -41887,15 +41887,15 @@ module Junoser
                     ).as(:oneline),
                     b(str("ieee-802.1ad"),
                         sc(
-                              (str("default")),
+                              (str("default") | arg),
                             b(str("vlan-tag"),
                               (str("outer") | str("inner"))
                             )
                         )
                     ).as(:oneline),
                     b(str("inet-precedence"),
-                        c(
-                          (str("default") | arg)
+                        sc(
+                              (str("default") | arg)
                         )
                     ).as(:oneline)
                 )
@@ -41903,22 +41903,22 @@ module Junoser
             a(str("forwarding-class"), arg),
             b(str("rewrite-rules"),
                 c(
-                    a(str("dscp"), str("default")).as(:oneline),
-                    a(str("dscp-ipv6"), str("default")).as(:oneline),
+                    a(str("dscp"), str("default") | arg).as(:oneline),
+                    a(str("dscp-ipv6"), str("default") | arg).as(:oneline),
                     b(str("ieee-802.1"),
-                        c(
-                          (str("default") | arg)
+                        sc(
+                              (str("default") | arg)
                         )
                     ).as(:oneline),
                     b(str("ieee-802.1ad"),
                         c(
-                              (str("default")),
+                              (str("default") | arg),
                             b(str("vlan-tag"),
                               (str("outer"))
                             )
                         )
                     ),
-                    a(str("inet-precedence"), str("default")).as(:oneline)
+                    a(str("inet-precedence"), str("default") | arg).as(:oneline)
                 )
             ),
             b(str("multi-destination"),
@@ -43080,7 +43080,7 @@ module Junoser
                             a(str("member"), arg),
                             b(a(str("member-range"), arg),
                                 sc(
-                                    b(str("end-range"),
+                                    b(str("to"),
                                       interface_device
                                     )
                                 )
@@ -43162,7 +43162,7 @@ module Junoser
                             ),
                             str("no-pseudowire-down-on-core-isolation"),
                             b(str("speed"),
-                              (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("oc3") | str("oc12") | str("oc48"))
+                              (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("100g") | str("200g") | str("400g") | str("800g") | str("oc3") | str("oc12") | str("oc48"))
                             ),
                             b(str("forwarding-class-accounting"),
                                 c(
@@ -46532,7 +46532,7 @@ module Junoser
                                     a(str("member"), arg),
                                     b(a(str("member-range"), arg),
                                         sc(
-                                            b(str("end-range"),
+                                            b(str("to"),
                                               interface_device
                                             )
                                         )
@@ -46614,7 +46614,7 @@ module Junoser
                                     ),
                                     str("no-pseudowire-down-on-core-isolation"),
                                     b(str("speed"),
-                                      (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("oc3") | str("oc12") | str("oc48"))
+                                      (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("100g") | str("200g") | str("400g") | str("800g") | str("oc3") | str("oc12") | str("oc48"))
                                     ),
                                     b(str("forwarding-class-accounting"),
                                         c(
@@ -63641,7 +63641,7 @@ module Junoser
     rule(:bgpaf_accepted_prefix_limit) do
         c(
             a(str("maximum"), arg),
-            b(str("teardown"),
+            b(a(str("teardown"), arg),
                 ca(
                     b(str("idle-timeout"),
                         sc(
@@ -63652,7 +63652,8 @@ module Junoser
                         )
                     ).as(:oneline)
                 )
-            )
+            ),
+            str("teardown")
         )
     end
 
@@ -63671,7 +63672,7 @@ module Junoser
     rule(:bgpaf_prefix_limit) do
         c(
             a(str("maximum"), arg),
-            b(str("teardown"),
+            b(a(str("teardown"), arg),
                 ca(
                     b(str("idle-timeout"),
                         sc(
@@ -63682,7 +63683,8 @@ module Junoser
                         )
                     ).as(:oneline)
                 )
-            )
+            ),
+            str("teardown")
         )
     end
 
@@ -97992,7 +97994,7 @@ module Junoser
             ),
             b(str("keys"),
                 c(
-                    a(str("key"), arg)
+                    a(str("key"), quote | arg)
                 )
             ),
             c(

data/lib/junoser/ruler.rb

@@ -14,7 +14,7 @@ module Junoser
       str = @rule.read
       str = remove_comments(str)
       str = process_reserved_element(str)
-      str = str.split(/\n/).map { |l| format(process_line(l)) }.join("\n")
+      str.split(/\n/).map { |l| format(process_line(l)) }.join("\n")
     end
 
     private
@@ -26,16 +26,16 @@ module Junoser
     def process_line(str)
       return str if str =~ /^(.* do|end)$/
 
-      str.gsub!(/("[^"]+")/) { "str(#$1)" } # "foo" -> str("foo")
+      str.gsub!(/("[^"]+")/) { "str(#{$1})" } # "foo" -> str("foo")
 
-      str.gsub!(/^(\s*)arg(\.as\(:\S+\))? \($/) { "#{$1}b(arg#$2," } # arg ( -> b(arg,
-      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f\(|,]+)(\.as\(:\S+\))?(,?)$/) { "#{$1}a(#$2, #$3)#$4#$5" } # str("foo") bar -> a(str("foo"), bar)
-      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\)(,?)$/) { "#{$1}a(#$2, #$3#$4)#$5" } # str("foo") (a | b) -> a(str("foo"), a | b)
+      str.gsub!(/^(\s*)arg(\.as\(:\S+\))? \($/) { "#{$1}b(arg#{$2}," } # arg ( -> b(arg,
+      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f(|,]+)(\.as\(:\S+\))?(,?)$/) { "#{$1}a(#{$2}, #{$3})#{$4}#{$5}" } # str("foo") bar -> a(str("foo"), bar)
+      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\)(,?)$/) { "#{$1}a(#{$2}, #{$3}#{$4})#{$5}" } # str("foo") (a | b) -> a(str("foo"), a | b)
 
-      str.gsub!(/^(\s*)(str\(\S+\)) \($/) { "#{$1}b(#$2," } # str("foo") ( -> b(str("foo"),
-      str.gsub!(/^(\s*)(enum)?(\(.*\))(\.as\(:\S\))? \($/) { "#{$1}b(#$2#$3#$4," } # (a | b) ( -> b((a | b),
-      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f\(|,]+) \($/) { "#{$1}b(a(#$2, #$3)," } # str("foo") bar ( -> b(a(str("foo"), bar),
-      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\) \($/) { "#{$1}a(#$2, #$3#$4," } # str("foo") (a | b) ( -> a(str("foo"), a | b,
+      str.gsub!(/^(\s*)(str\(\S+\)) \($/) { "#{$1}b(#{$2}," } # str("foo") ( -> b(str("foo"),
+      str.gsub!(/^(\s*)(enum)?(\(.*\))(\.as\(:\S\))? \($/) { "#{$1}b(#{$2}#{$3}#{$4}," } # (a | b) ( -> b((a | b),
+      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f(|,]+) \($/) { "#{$1}b(a(#{$2}, #{$3})," } # str("foo") bar ( -> b(a(str("foo"), bar),
+      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\) \($/) { "#{$1}a(#{$2}, #{$3}#{$4}," } # str("foo") (a | b) ( -> a(str("foo"), a | b,
 
       str
     end
@@ -52,7 +52,7 @@ module Junoser
       #
       # Statements can be quoted
       #
-      str.gsub!(/("ssh-\S+") arg/) { "#$1 (quote | arg)" }
+      str.gsub!(/("ssh-\S+") arg/) { "#{$1} (quote | arg)" }
       str.gsub! '"message" arg', '"message" (quote | arg)'
       str.gsub! '"description" arg', '"description" (quote | arg)'
       str.gsub! '"as-path-prepend" arg', '"as-path-prepend" (quote | arg)'
@@ -63,7 +63,7 @@ module Junoser
                 '    quote | arg'], $1)
       end
 
-      str.gsub!(/^rule\(:regular_expression\) do\s*((?!end).)*\s*end/) do
+      str.gsub!(/^rule\(:regular_expression\) do\s.*?\s*end/) do
         <<~EOS
           rule(:regular_expression) do
             (quote | arg).as(:arg)
@@ -99,7 +99,7 @@ module Junoser
       #
       # "arg" matches anything so move to the end
       #
-      str.gsub!(/arg \| (".*")/) { "#$1 | arg" }
+      str.gsub!(/arg \| (".*")/) { "#{$1} | arg" }
       str.gsub!(/^(\s*)c\(\s*arg,$/) { "#{$1}ca(" }
       str.gsub!(/(rule\(:control_route_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
       str.gsub!(/(rule\(:control_source_address_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
@@ -130,18 +130,18 @@ module Junoser
       #
       #   "inet",
       #   "inet6"
-      str.gsub!(/"cspf"(.*\s*.*)"cspf-link"/) { %["cspf-link"#$1"cspf"] }
-      str.gsub!(/"http"(.*\s*.*)"https"/) { %["https"#$1"http"] }
-      str.gsub!(/"inet"(.*\s*.*)"inet6"/) { %["inet6"#$1"inet"] }
-      str.gsub!(/"icmp"(.*\s*.*)"icmp6"/) { %["icmp6"#$1"icmp"] }
-      str.gsub!(/"icmp"(.*\s*.*)"icmpv6"/) { %["icmpv6"#$1"icmp"] }
-      str.gsub!(/"snmp"(.*\s*.*)"snmptrap"/) { %["snmptrap"#$1"snmp"] }
-      str.gsub!(/"ospf"(.*\s*.*)"ospf3"/) { %["ospf3"#$1"ospf"] }
+      str.gsub!(/"cspf"(.*\s*.*)"cspf-link"/) { %["cspf-link"#{$1}"cspf"] }
+      str.gsub!(/"http"(.*\s*.*)"https"/) { %["https"#{$1}"http"] }
+      str.gsub!(/"inet"(.*\s*.*)"inet6"/) { %["inet6"#{$1}"inet"] }
+      str.gsub!(/"icmp"(.*\s*.*)"icmp6"/) { %["icmp6"#{$1}"icmp"] }
+      str.gsub!(/"icmp"(.*\s*.*)"icmpv6"/) { %["icmpv6"#{$1}"icmp"] }
+      str.gsub!(/"snmp"(.*\s*.*)"snmptrap"/) { %["snmptrap"#{$1}"snmp"] }
+      str.gsub!(/"ospf"(.*\s*.*)"ospf3"/) { %["ospf3"#{$1}"ospf"] }
       str.gsub! '"tls1" | "tls11" | "tls12"', '"tls11" | "tls12" | "tls1"'
-      str.gsub!(/("group1" \| "group2" \| "group5") \| ([^\)]+)/) { "#{$2} | #{$1}"}
+      str.gsub!(/("group1" \| "group2" \| "group5") \| ([^)]+)/) { "#{$2} | #{$1}"}
 
       %w[ccc ethernet-over-atm tcc vpls bridge].each do |encap|
-        str.gsub!(/"ethernet"(.*)"ethernet-#{encap}"/) { %["ethernet-#{encap}"#$1"ethernet"] }
+        str.gsub!(/"ethernet"(.*)"ethernet-#{encap}"/) { %["ethernet-#{encap}"#{$1}"ethernet"] }
       end
 
       str.gsub!(/^(\s*)"path" arg \(\s*c\(\s*sc\(\s*"abstract",\s*c\(\s*"loose",\s*"loose-link",\s*"strict"\s*\)\s*\)\.as\(:oneline\)/) do
@@ -163,9 +163,9 @@ 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)" }
+      str.gsub!(/\((.*) \| "vlan-id"\)/) { "(#{$1} | arg)" }
 
       %w[filename].each do |key|
         str.gsub! %["#{key}" arg], 'arg'
@@ -180,6 +180,9 @@ module Junoser
       # Fix .xsd: "icmpv6" is also acceptable
       str.gsub! '"icmp6" |', '"icmp6" | "icmpv6" |'
 
+      # Fix .xsd: "end-range" of "member-range"
+      str.gsub! '"end-range"', '"to"'
+
       #
       # Fix .xsd: "arg" is missing
       #
@@ -197,12 +200,11 @@ module Junoser
       # Fix .xsd: "ieee-802.3ad" is invalid
       str.gsub! '"ieee-802.3ad"', '"802.3ad"'
 
-      # Fix .xsd: "class-of-service interfaces all unit * classifiers exp foo"
-      str.gsub!(/^(\s*)sc\(\s*\("default"\)\s*\)/) do
-        format(['c(',
-                '  ("default" | arg)',
-                ')'], $1)
-      end
+      # Fix .xsd: "classifiers"
+      str.gsub! '("default")', '("default" | arg)'
+
+      # Fix .xsd: "class-of-service interfaces xxx unit x"
+      str.gsub! '"*"', 'arg'
 
       # Fix .xsd: "from-zone" arg is also required
       str.gsub!(/^(\s*)"policy" \(\s*s\(\s*arg,\s*"to-zone-name" arg,\s*c\(\s*"policy" \(\s*policy_type\s*\)\s*\)/) do
@@ -220,10 +222,22 @@ module Junoser
       # Fix .xsd: keywords "dest-nat-rule-match", "src-nat-rule-match", "static-nat-rule-match" are wrong
       str.gsub!(/"(dest|src|static)-nat-rule-match"/) { '"match"' }
 
-      str
-
       # Fix .xsd: "snmp system-name" should be "snmp name"
       str.gsub! '"system-name" arg', '"name" (quote | arg)'
+
+      # Fix .xsd: argument of "system license keys key" can be quoted
+      str.gsub!(/^(rule\(:license_object\) do.*?"key") arg/m) { "#{$1} (quote | arg)"}
+
+      # Fix .xsd: "prefix-limit teardown"
+      str.gsub!(/^(\s*)"teardown" (\(.*?as\(:oneline\)\s*\)\s*\))/m) do
+        "#{$1}\"teardown\" arg #{$2},\n#{$1}\"teardown\""
+      end
+
+      # Fix .xsd: faster interface speed support
+      str.gsub! '"40g" | "oc3"', '"40g" | "100g" | "200g" | "400g" | "800g" | "oc3"'
+      str.gsub! '"100G"', '"100G" | "200G" | "400G" | "800G"'
+
+      str
     end
 
     def format(str, offset = OFFSET)

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.4.5"
+  VERSION = "0.4.7"
 end

data/sig/junoser/ruler.rbs

@@ -0,0 +1,21 @@
+# TypeProf 0.21.2
+
+# Classes
+module Junoser
+  class Ruler
+    OFFSET: String
+    @rule: untyped
+
+    def initialize: (untyped input) -> void
+    def to_rule: -> String
+    def rule: -> untyped
+
+    private
+    def remove_comments: (untyped str) -> untyped
+    def process_line: (untyped str) -> untyped
+    def process_reserved_element: (untyped str) -> untyped
+    def format: (Array[String?] | String str, ?String? offset) -> String?
+    def rule_header: -> String
+    def rule_footer: -> String
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -137,6 +137,7 @@ files:
 - lib/junoser/xsd/simple_type.rb
 - lib/junoser/xsd/union.rb
 - lib/underscorable.rb
+- sig/junoser/ruler.rbs
 homepage: https://github.com/codeout/junoser
 licenses: []
 metadata: {}
@@ -155,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: PEG parser for JUNOS configuration.