abnftt 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc3e072613b51decf47f31c6ccbff2af79e403131d889ce6bbc075d097d5af2
-  data.tar.gz: 0d17df7192ac612129632e001e348f531f2c483041b961d447837a4dd3755b6f
+  metadata.gz: 397c4ddc806faa5fcb39bc900acb4fb828289c2d639a24ff10158bd0d4712bab
+  data.tar.gz: d8e1904fc3a2310ba3ab986840cc57bac9bcca1479cda0939ebda3ae19baa36c
 SHA512:
-  metadata.gz: 729b268fe2df5265d44560cd6dd07dc3a01de87a9d3fca4570953bf920566f35aadd64ba752f83560bf4b47d1404a6146500a0621d95e35416627ef8df5b115a
-  data.tar.gz: e319d947ef1f7ce20ece128b8b993d3b7931c4a3985b54ef8d7849ee79420a4d23b071cf6baa784062b92fec0ca74f4aea42d8e81829ba83f3911b71ede587fa
+  metadata.gz: 280d0eaee9b999e7c9a9b7cac343e1653a6910ecba9e88cb3d8f44652dfd31b440fd2483d8ce4164440a50f15a61e76fa8dbbd4dd98d3cd9004916eb0fb1675a
+  data.tar.gz: b19f0ebe121e9156c2a3f0cec93fc9e20710e69450981a8f76271bb008f9e432f9b5c9b0605194282cda2ffb39ed6216e427ab6eee5e1a4fec7e5e4799ceef5c

data/abnftt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "abnftt"
-  s.version = "0.1.1"
+  s.version = "0.2.1"
   s.summary = "RFC 5234+7405 ABNF to Treetop"
   s.description = %q{Less shifty support for tools based on IETF's ABNF}
   s.author = "Carsten Bormann"

data/bin/abnftt

@@ -2,108 +2,10 @@
 
 require 'pp'
 require 'yaml'
-require 'treetop'
 
 Encoding.default_external = Encoding::UTF_8
 
-require 'abnf'
-
-class Treetop::Runtime::SyntaxNode
-  def clean_abnf
-    if elements
-      elements.map {|el| el.clean_abnf}.join
-    else
-      text_value
-    end
-  end
-  def ast
-    fail "undefined_ast #{inspect}"
-  end
-  def ast_from_percent(base, first, second)
-    c1 = first.to_i(base).chr(Encoding::UTF_8)
-    case second[0]
-    when nil
-      ["cs", c1]
-    when "-"
-      c2 = second[1..-1].to_i(base).chr(Encoding::UTF_8)
-      ["char-range", c1, c2]
-    when "."
-      el = second.split(".")
-      el[0] = first
-      ["cs", el.map {|c| c.to_i(base).chr(Encoding::UTF_8)}.join]
-    else
-      fail "ast_from_percent"
-    end
-  end
-end
-
-def to_treetop(ast, ofn)
-  modname = File.basename(ofn).sub("-", "_").sub(/[^_a-zA-Z]/, "").upcase
-  <<~EOS
-    # Encoding: UTF-8
-    grammar #{modname}
-    #{ast.map {|x| to_treetop0(x)}.join}
-    end
-  EOS
-end
-def to_treetop0(ast)
-  fail ast.inspect unless ast[0] == "="
-  <<~EOS
-    rule #{to_treetop1(ast[1])}
-    #{to_treetop1(ast[2])}
-    end
-  EOS
-end
-FIXUP_NAMES = Hash.new {|h, k| k}
-FIXUP_NAMES.merge!({
-                     "rule" => "r__rule",
-                   })
-def to_treetop1(ast)
-  case ast
-  when String
-    FIXUP_NAMES[ast].gsub("-", "_")
-  when Array
-    case ast[0]
-    when "alt" # ["alt", *a]
-      "(#{ast[1..-1].map {|x| to_treetop1(x)}.join(" / ")})"
-    when "seq" # ["seq", *a]
-      "(#{ast[1..-1].map {|x| to_treetop1(x)}.join(" ")})"
-    when "rep" # ["rep", s, e, a]
-      t = to_treetop1(ast[3]) || "@@@"
-      case [ast[1], ast[2]]
-      when [0, 1]
-        t + "?"
-      when [0, true]
-        t + "*"
-      when [1, true]
-        t + "+"
-      else
-        t + " #{ast[1]}..#{ast[2] == true ? '' : ast[2]}"
-      end
-    when "prose" # ["prose", text]
-      fail "prose not implemented #{ast.inspect}"
-    when "ci" # ["ci", text]
-      s = ast[1]
-      if s =~ /\A[^A-Za-z]*\z/
-        s.inspect
-      else
-        s.inspect << "i"        # could do this always, but reduce noise
-      end
-    when "cs" # ["cs", text]
-      ast[1].inspect
-    when "char-range" # ["char-range", c1, c2]
-      c1 = Regexp.quote(ast[1])
-      c2 = Regexp.quote(ast[2])
-      "[#{c1}-#{c2}]"           # XXX does that always work
-    when "im" # ["im", a, text]
-      to_treetop1(ast[1]) + " " + ast[2]
-    else
-      fail "to_treetop(#{ast.inspect})"
-    end
-  else
-    fail "to_treetop(#{ast.inspect})"
-  end
-end
+require 'abnftt'
 
 unless fn = ARGV[0]
   warn "Usage: abnftt grammar.abnftt"
@@ -111,17 +13,19 @@ unless fn = ARGV[0]
 end
 outfn = fn.sub(/\.abnftt\z/, "")
 
-parser = ABNFParser.new
+parser = ABNFGrammarParser.new
 abnf_file = File.read(fn)
 ast = parser.parse abnf_file
 if ast
 #  p ast
+  abnf = ABNF.new(ast)
   File.open("#{outfn}.yaml", "w") do |f|
-    f.puts ast.ast.to_yaml
+    f.puts abnf.tree.to_yaml
   end
   # pp ast.ast
   File.open("#{outfn}.treetop", "w") do |f|
-    f.puts to_treetop(ast.ast, outfn)
+    modname = File.basename(outfn).gsub("-", "_").gsub(/[^_a-zA-Z]/, "").upcase
+    f.puts abnf.to_treetop(modname)
   end
   File.open("#{outfn}.abnf", "w") do |f|
     f.puts ast.clean_abnf.lines.map(&:rstrip).join("\n")

data/lib/{abnf.rb → abnfgrammar.rb}

@@ -1,7 +1,7 @@
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
-module ABNF
+module ABNFGrammar
   include Treetop::Runtime
 
   def root
@@ -806,17 +806,18 @@ module ABNF
                                                        s = 1
                                                        e = 1
                                                        el = elements.map {|e| e.text_value}
-                                                       if el[1] == "*"
-                                                         if el[0] != ""
-                                                           s = el[0].to_i
-                                                         else
-                                                           s = 0
-                                                         end
-                                                         if el[2] != ""
-                                                           e = el[2].to_i
-                                                         else
-                                                           e = true
-                                                         end
+                                                       if el != []
+                                                         el[2] = el[0] = el.join if el[1] != "*"
+                                                         s = if el[0] != ""
+                                                               el[0].to_i
+                                                             else
+                                                               0
+                                                             end
+                                                         e = if el[2] != ""
+                                                               el[2].to_i
+                                                             else
+                                                               true
+                                                             end
                                                        end
                                                        occ = [s, e]
                                                        if occ == [1, 1]
@@ -2579,8 +2580,8 @@ module ABNF
 
 end
 
-class ABNFParser < Treetop::Runtime::CompiledParser
-  include ABNF
+class ABNFGrammarParser < Treetop::Runtime::CompiledParser
+  include ABNFGrammar
 end
 
 

data/lib/abnftt.rb

@@ -0,0 +1,199 @@
+require 'treetop'
+require 'abnfgrammar'
+
+class Treetop::Runtime::SyntaxNode
+  def clean_abnf
+    if elements
+      elements.map {|el| el.clean_abnf}.join
+    else
+      text_value
+    end
+  end
+  def ast
+    fail "undefined_ast #{inspect}"
+  end
+  def ast_from_percent(base, first, second)
+    c1 = first.to_i(base).chr(Encoding::UTF_8)
+    case second[0]
+    when nil
+      ["cs", c1]
+    when "-"
+      c2 = second[1..-1].to_i(base).chr(Encoding::UTF_8)
+      ["char-range", c1, c2]
+    when "."
+      el = second.split(".")
+      el[0] = first
+      ["cs", el.map {|c| c.to_i(base).chr(Encoding::UTF_8)}.join]
+    else
+      fail "ast_from_percent"
+    end
+  end
+end
+
+
+class ABNF
+  @@parser = ABNFGrammarParser.new
+
+  def self.reason(parser, s)
+    reason = [parser.failure_reason]
+    parser.failure_reason =~ /^(Expected .+) after/m
+    reason << "#{$1.gsub("\n", '<<<NEWLINE>>>')}:" if $1
+    if line = s.lines.to_a[parser.failure_line - 1]
+      reason << line
+      reason << "#{'~' * (parser.failure_column - 1)}^"
+    end
+    reason.join("\n")
+  end
+
+  def self.from_abnf(s)
+    ast = @@parser.parse s
+    if !ast
+      fail self.reason(@@parser, s)
+    end
+    ABNF.new(ast)
+  end
+
+  attr_accessor :ast, :rules, :tree
+  def initialize(ast_)
+    @ast = ast_
+    @tree = ast.ast
+    @rules = {}
+    @tree.each do |x|
+      op, name, val, rest = x
+      fail rest if rest
+      fail op unless op == "="  # XXX
+      if @rules[name]
+        fail "duplicate rule for name #{name}"
+      end
+      @rules[name] = val
+    end
+  end
+
+  def generate
+    generate1(rules.first.first)
+  end
+
+  def generate1(what)
+    case what
+    when String
+      expansion = rules[what]
+      fail "can't find rules #{what}" unless expansion
+      generate1(expansion)
+    when Array
+      op, *args = what
+      case op
+      when "seq"
+        args.map {|arg| generate1(arg)}.join
+      when "alt"
+        generate1(args.sample)
+      when "rep"
+        l, h, x, rest = args
+        fail rest if rest
+        h = l+3 if h == true
+        n = rand(h-l+1)+l
+        (0...n).map { generate1(x) }.join
+      when "ci"
+        s, rest = args
+        fail rest if rest
+        s.chars.map{|x|[x.upcase, x.downcase].sample}.join
+      when "cs"
+        s, rest = args
+        fail rest if rest
+        s
+      when "char-range"
+        l, r = args
+        fail rest if rest
+        (rand(r.ord-l.ord+1)+l.ord).chr(Encoding::UTF_8)
+      when "prose" # ["prose", text]
+        fail "prose not implemented #{what.inspect}"
+      when "im"
+        warn "abnftt-style inline module ignored #{what.inspect}"
+        ''
+      else
+        fail [op, args].inspect
+      end
+    else
+      fail
+    end
+  end
+
+
+  def to_treetop(modname)
+    <<~EOS
+    # Encoding: UTF-8
+    grammar #{modname}
+    #{tree.map {|x| to_treetop0(x)}.join}
+    end
+  EOS
+  end
+  def to_treetop0(ast)
+    fail ast.inspect unless ast[0] == "="
+    <<~EOS
+    rule #{to_treetop1(ast[1])}
+    #{to_treetop1(ast[2])}
+    end
+  EOS
+  end
+  FIXUP_NAMES = Hash.new {|h, k| k}
+  FIXUP_NAMES.merge!({
+                       "rule" => "r__rule",
+                     })
+  def to_treetop1(ast)
+    case ast
+    when String
+      FIXUP_NAMES[ast].gsub("-", "_")
+    when Array
+      case ast[0]
+      when "alt" # ["alt", *a]
+        "(#{ast[1..-1].map {|x| to_treetop1(x)}.join(" / ")})"
+      when "seq" # ["seq", *a]
+        "(#{ast[1..-1].map {|x| to_treetop1(x)}.join(" ")})"
+      when "rep" # ["rep", s, e, a]
+        t = to_treetop1(ast[3]) || "@@@"
+        case [ast[1], ast[2]]
+        when [0, 1]
+          t + "?"
+        when [0, true]
+          t + "*"
+        when [1, true]
+          t + "+"
+        else
+          t + " #{ast[1]}..#{ast[2] == true ? '' : ast[2]}"
+        end
+      when "prose" # ["prose", text]
+        fail "prose not implemented #{ast.inspect}"
+      when "ci" # ["ci", text]
+        s = ast[1]
+        if s =~ /\A[^A-Za-z]*\z/
+          s.inspect
+        else
+          s.inspect << "i"        # could do this always, but reduce noise
+        end
+      when "cs" # ["cs", text]
+        ast[1].inspect
+      when "char-range" # ["char-range", c1, c2]
+        c1 = Regexp.quote(ast[1])
+        c2 = Regexp.quote(ast[2])
+        "[#{c1}-#{c2}]"           # XXX does that always work
+      when "im" # ["im", a, text]
+        to_treetop1(ast[1]) + " " + ast[2]
+      else
+        fail "to_treetop(#{ast.inspect})"
+      end
+    else
+      fail "to_treetop(#{ast.inspect})"
+    end
+  end
+
+  @@gensym = 0
+
+  attr_accessor :parser
+  def validate(s)
+    @parser ||= Treetop.load_from_string(to_treetop("ABNF_Mod" << (@@gensym += 1).to_s))
+    parser_instance ||= @parser.new
+    unless result1 = parser_instance.parse(s)
+      fail self.class.reason(parser_instance, s)
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abnftt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-24 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies: []
 description: Less shifty support for tools based on IETF's ABNF
 email: cabo@tzi.org
@@ -21,12 +21,13 @@ files:
 - abnftt.gemspec
 - bin/abnftt
 - bin/abnftt~
-- lib/abnf.rb
+- lib/abnfgrammar.rb
+- lib/abnftt.rb
 homepage: http://github.com/cabo/abnftt
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -41,8 +42,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: RFC 5234+7405 ABNF to Treetop
 test_files: []