language-ruby 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d1f823779fa3988a81d38592f61fdf2c741169cd4d676a6865de6e39c9cb063
-  data.tar.gz: d95cdb157fb3da9c59b18fc4f84808fe2368390a132e2be8b9e2bc6a20758503
+  metadata.gz: bdf5e247df3ee0c287a560265c60107d161eb4b7cb71610f6f50c15c81c2e3aa
+  data.tar.gz: acfe4eea02eb399831fd378adb0bd69100efbdecaeead3c99a2faaec11e552cb
 SHA512:
-  metadata.gz: 116fdcc420c21f19456a52a7d5a1ddf4d5c51a8c83e43522c03eaf7855c48d333d7077014bac0bc30afb6a49521d057183f449acaa867597ac67bba1d89c93a0
-  data.tar.gz: 63bce33e3bbe8db8baf4ea842467f98aafc0470277d15665253cca727d29fcfc1e00b79f4f00b35c734937b15dbb17dbc0144b80ae526dbc5075d1b019249047
+  metadata.gz: 318d1dd9888a5aee6aec7fef5410b9092f169e6e12e1d4a0608c6a2e36b2ae4b3bfc6412052a8e331a9b1260bf4387ccfa6340e1ea74f7511da049ff222d4050
+  data.tar.gz: 5c0c443194c047a08c461f9b713fcf131ebd12ce479b81d344415202694106a7db00e19547c37319c6d69d4a0bc78a768b0a8aaf1d29e1b9a7ae1369d87c520e

data/Gemfile

@@ -1,8 +1,5 @@
 source "https://rubygems.org"
 
-gemspec name: "template-ruby"
-gemspec name: "code-ruby"
+gemspec
 
 gem "rspec"
-gem "syntax_tree", github: "dorianmariefr/syntax_tree"
-gem "ruby-prof"

data/language-ruby.gemspec

@@ -1,8 +1,8 @@
-require_relative "lib/template/version"
+require_relative "lib/language/version"
 
 Gem::Specification.new do |s|
   s.name = "language-ruby"
-  s.version = ::Template::Version
+  s.version = ::Language::Version
   s.summary = "A Parsing Expression Grammar (PEG) for making parsers"
   s.description = s.summary
   s.authors = ["Dorian Marié"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($/)
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
-  s.homepage = "https://github.com/dorianmariefr/template-ruby"
+  s.homepage = "https://github.com/dorianmariefr/language-ruby"
   s.license = "MIT"
 
   s.add_dependency "zeitwerk", "~> 2"

data/lib/language/atom/any.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Language
+  class Atom
+    class Any < Atom
+    end
+  end
+end

data/lib/language/atom/repeat.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Language
+  class Atom
+    class Repeat < Atom
+      def initialize(parent:)
+        @parent = parent
+      end
+
+      private
+
+      attr_reader :parent
+    end
+  end
+end

data/lib/language/atom.rb

@@ -1,19 +1,7 @@
+# frozen_string_literal: true
+
 class Language
   class Atom
-    class Rule < Atom
-      def initialize(name:)
-        @name = name
-      end
-
-      def parse(parser)
-        parser.find_rule!(@name).parse(parser)
-      end
-
-      def to_s
-        "rule(#{@name.inspect})"
-      end
-    end
-
     class Any < Atom
       def parse(parser)
         parser.consume(1)
@@ -41,36 +29,34 @@ class Language
     end
 
     class Repeat < Atom
-      def initialize(parent: nil, min: 0, max: nil)
+      def initialize(parent: nil, minimum: 0, maximum: nil)
         @parent = parent
-        @min = min
-        @max = max
+        @minimum = minimum
+        @maximum = maximum
       end
 
       def parse(parser)
         return unless @parent
 
-        if @max.nil?
-          @min.times { match(parser) }
-
+        @minimum.times { match(parser) }
+        if @maximum.nil?
           begin
             loop { match(parser) }
           rescue Parser::Interuption
           end
         else
-          @min.times { match(parser) }
-
           begin
-            (@max - @min).times { match(parser) }
+            (@maximum - @minimum).times { match(parser) }
           rescue Parser::Interuption
           end
         end
       end
 
       def to_s
-        min = @min.zero? ? "" : @min.to_s
-        max = @max.nil? ? "" : ", #{@max}"
-        parenthesis = min.empty? && max.empty? ? "" : "(#{min}#{max})"
+        minimum = @minimum.zero? ? "" : @minimum.to_s
+        maximum = @maximum.nil? ? "" : ", #{@maximum}"
+        parenthesis =
+          minimum.empty? && maximum.empty? ? "" : "(#{minimum}#{maximum})"
 
         @parent ? "(#{@parent}).repeat#{parenthesis}" : "repeat#{parenthesis}"
       end
@@ -100,11 +86,11 @@ class Language
       end
 
       def parse(parser)
-        if parser.next?(@string)
-          parser.consume(@string.size)
-        else
+        unless parser.next?(@string)
           raise Parser::Str::NotFound.new(parser, @string)
         end
+
+        parser.consume(@string.size)
       end
 
       def to_s
@@ -125,7 +111,7 @@ class Language
             cursor: parser.cursor,
             buffer: parser.buffer
           )
-        @parent.parse(clone) if @parent
+        @parent&.parse(clone)
       rescue Parser::Interuption
       else
         raise Parser::Interuption.new(parser, self)
@@ -149,7 +135,7 @@ class Language
             cursor: parser.cursor,
             buffer: parser.buffer
           )
-        @parent.parse(clone) if @parent
+        @parent&.parse(clone)
         parser.cursor = clone.cursor
       end
 
@@ -175,6 +161,7 @@ class Language
         @parent.parse(clone)
       rescue Parser::Interuption
       else
+        parser.buffer = clone.buffer
         parser.cursor = clone.cursor
         parser.output = clone.output
       end
@@ -284,7 +271,7 @@ class Language
     end
 
     def str(string)
-      Str.new(string: string)
+      Str.new(string:)
     end
 
     def absent
@@ -299,12 +286,12 @@ class Language
       Maybe.new(parent: self)
     end
 
-    def repeat(min = 0, max = nil)
-      Repeat.new(parent: self, min: min, max: max)
+    def repeat(minimum = 0, maximum = nil)
+      Repeat.new(parent: self, minimum:, maximum:)
     end
 
     def aka(name)
-      Aka.new(parent: self, name: name)
+      Aka.new(parent: self, name:)
     end
 
     def |(other)
@@ -320,15 +307,11 @@ class Language
     end
 
     def then(&block)
-      Then.new(parent: self, block: block)
-    end
-
-    def rule(name)
-      Rule.new(name: name)
+      Then.new(parent: self, block:)
     end
 
-    def parse(parser)
-      raise NotImplementedError.new("#{self.class}#parse")
+    def parse(_parser)
+      raise NotImplementedError, "#{self.class}#parse"
     end
 
     def to_s

data/lib/language/output.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Language
   class Output
     attr_reader :raw
@@ -10,7 +12,7 @@ class Language
       if raw.is_a?(Array)
         new(raw.map { |element| from_raw(element) })
       elsif raw.is_a?(Hash)
-        new(raw.map { |key, value| [key, from_raw(value)] }.to_h)
+        new(raw.transform_values { |value| from_raw(value) })
       else
         new(raw)
       end
@@ -20,7 +22,7 @@ class Language
       if raw.is_a?(Array)
         raw.map(&:to_raw)
       elsif raw.is_a?(Hash)
-        raw.map { |key, value| [key, value.to_raw] }.to_h
+        raw.transform_values(&:to_raw)
       else
         raw
       end
@@ -35,7 +37,7 @@ class Language
     end
 
     def ==(other)
-      other.is_a?(Output) ? raw == other.raw : raw == other
+      raw == (other.is_a?(Output) ? other.raw : other)
     end
 
     def to_s
@@ -66,7 +68,7 @@ class Language
       when String
         case other.raw
         when String
-          @raw = @raw + other.raw
+          @raw += other.raw
         when Array
           @raw = other.raw
         when Hash
@@ -75,18 +77,18 @@ class Language
       when Array
         case other.raw
         when String
-          return
+          nil
         when Array
-          @raw = @raw + other.raw
+          @raw += other.raw
         when Hash
           @raw << other
         end
       when Hash
         case other.raw
         when String
-          return
+          nil
         when Array
-          return
+          nil
         when Hash
           @raw.merge!(other.raw)
         end
@@ -107,7 +109,7 @@ class Language
       when String
         case other.raw
         when String
-          @raw = @raw + other.raw
+          @raw += other.raw
         when Array
           @raw = [other]
         when Hash
@@ -118,9 +120,9 @@ class Language
       when Hash
         case other.raw
         when String
-          return
+          nil
         when Array
-          return
+          nil
         when Hash
           @raw.merge!(other.raw)
         end

data/lib/language/parser/absent/present.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Language
   class Parser
     class Absent

data/lib/language/parser/absent.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Language
   class Parser
     class Absent

data/lib/language/parser/end_of_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Language
   class Parser
     class EndOfInput < Interuption

data/lib/language/parser/interuption.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Language
   class Parser
     class Interuption < StandardError

data/lib/language/parser/not_end_of_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Language
   class Parser
     class NotEndOfInput < Interuption

data/lib/language/parser/str/not_found.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Language
   class Parser
     class Str

data/lib/language/parser/str.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Language
   class Parser
     class Str

data/lib/language/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Language
   class Parser
     attr_accessor :input, :buffer, :output, :root, :cursor
@@ -13,20 +15,18 @@ class Language
     def parse(check_end_of_input: true)
       @root.parse(self)
 
-      if @cursor == @input.size || !check_end_of_input
-        @output.present? ? @output : Output.new(@buffer)
-      else
-        raise NotEndOfInput.new(self)
+      unless @cursor == @input.size || !check_end_of_input
+        raise NotEndOfInput, self
       end
+
+      @output.present? ? @output : Output.new(@buffer)
     end
 
     def consume(n)
-      if @cursor + n <= @input.size
-        @buffer += @input[@cursor, n]
-        @cursor += n
-      else
-        raise EndOfInput.new(self)
-      end
+      raise EndOfInput, self unless @cursor + n <= @input.size
+
+      @buffer += @input[@cursor, n]
+      @cursor += n
     end
 
     def aka(name)

data/lib/language/version.rb

@@ -0,0 +1,3 @@
+require_relative "../language"
+
+Language::Version = Gem::Version.new("0.6.0")

data/lib/language-ruby.rb

@@ -1,10 +1,5 @@
-require "bigdecimal"
-require "stringio"
-require "timeout"
 require "zeitwerk"
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
-loader.ignore("#{__dir__}/template-ruby.rb")
-loader.ignore("#{__dir__}/code-ruby.rb")
 loader.ignore("#{__dir__}/language-ruby.rb")
 loader.setup

data/lib/language.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Language
   def self.parse(input)
     new.parse(input)
@@ -15,12 +17,12 @@ class Language
     Atom::Maybe.new(parent: new)
   end
 
-  def self.repeat(min = 0, max = nil)
-    Atom::Repeat.new(parent: new, min: min, max: max)
+  def self.repeat(minimum = 0, maximum = nil)
+    Atom::Repeat.new(parent: new, minimum:, maximum:)
   end
 
   def self.aka(name)
-    Atom::Aka.new(parent: new, name: name)
+    Atom::Aka.new(parent: new, name:)
   end
 
   def self.|(other)
@@ -36,7 +38,7 @@ class Language
   end
 
   def self.then(&block)
-    Atom::Then.new(parent: new, block: block)
+    Atom::Then.new(parent: new, block:)
   end
 
   def parse(input_or_parser)
@@ -44,7 +46,7 @@ class Language
       parser = input_or_parser
       clone =
         Parser.new(
-          root: root,
+          root:,
           input: parser.input,
           cursor: parser.cursor,
           buffer: parser.buffer,
@@ -58,12 +60,12 @@ class Language
       parser.output = clone.output
     else
       input = input_or_parser
-      Parser.new(root: root, input: input).parse
+      Parser.new(root:, input:).parse
     end
   end
 
   def str(string)
-    Atom::Str.new(string: string)
+    Atom::Str.new(string:)
   end
 
   def any

data/spec/spec_helper.rb

@@ -1,6 +1 @@
-require_relative "../lib/template-ruby"
-require "json"
-
-RSpec.configure do |c|
-  c.example_status_persistence_file_path = "tmp/examples.txt"
-end
+require_relative "../lib/language-ruby"