srl_ruby 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53f0b4c07147644a3298d66dd4db0b7108fc1cc630debc1be7dc5721bca244bf
-  data.tar.gz: 410029ea6b5ddc36c6161d50701500af1cb406e8b39bbfa2b6d6d60839db41eb
+  metadata.gz: 32a18d724b0eaeff828ffc7fa2413834ea9e16dd1c46a06af7d5438c56fec159
+  data.tar.gz: 628b07343fdd3da4a2903b48b392ce6b52880e68ad0f229efd0d702abe3a90df
 SHA512:
-  metadata.gz: 0e6124858fe023541f5fc291790251c2c87a2c36cbf28f9285d4b4ed6b87c3705ce381da3536c5e70627101f17c3b203673ea175fbb3fe58f7d193219ef959c0
-  data.tar.gz: a74fb973b4d74fe3546e10e9466654998f0f675ebaf9253932d8fb04b516feea767ab511c86fd11522df58084049a2b0f6455e1fd54ecde7920fd8f32550fc0b
+  metadata.gz: 376fa359b54c5f5434c70ca9d855d718bfb933e30c5cdf29409f23ee3113659577b5680c073e091ca42c7e3ed0c68836ed9120fb93aa3d2be1a78cdcae08d8fb
+  data.tar.gz: 256f800715bc35d61cf134cddb91f199455357712e5f197d271e7efaebb6e745c66970d4a02935dd6f6779f22eb9309af744f0de47e78226bed924ae22885847

data/lib/srl_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SrlRuby
-  VERSION = '0.4.9'
+  VERSION = '0.4.10'
 end

data/spec/acceptance/support/rule_file_ast_builder.rb

@@ -32,7 +32,7 @@ module Acceptance
       Terminal2NodeClass
     end
 
-    # rule('rule_file' => %w[srl_heading srl_tests]).as 'start_rule'
+    # rule('rule_file' => 'srl_heading tests').as 'start_rule'
     def reduce_start_rule(_production, _range, _tokens, theChildren)
       rule_file = RuleFileTests.new(theChildren[0])
       tests = theChildren.last.flatten
@@ -54,16 +54,6 @@ module Acceptance
       theChildren.last
     end
 
-    # rule('srl_tests' => %w[srl_tests single_test]).as 'test_list'
-    def reduce_test_list(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('srl_tests' => 'single_test').as 'one_test'
-    def reduce_one_test(_production, _range, _tokens, theChildren)
-      [theChildren.last]
-    end
-
     # rule('match_test' => %w[MATCH: STRING_LIT]).as 'match_string'
     def reduce_match_string(_production, _range, _tokens, theChildren)
       MatchTest.new(theChildren.last)
@@ -85,17 +75,6 @@ module Acceptance
       theChildren[2]
     end
 
-    # rule('capture_expectations' => %w[capture_expectations
-    #   single_expectation]).as 'assertion_list'
-    def reduce_assertion_list(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('capture_expectations' => 'single_expectation').as 'one_expectation'
-    def reduce_one_expectation(_production, _range, _tokens, theChildren)
-      [theChildren.last]
-    end
-
     # rule('single_expectation' => %w[DASH INTEGER COLON capture_variable
     #   COLON STRING_LIT]).as 'capture_expectation'
     def reduce_capture_expectation(_production, _range, _tokens, theChildren)

data/spec/acceptance/support/rule_file_grammar.rb

@@ -6,7 +6,6 @@ require 'rley' # Load the Rley gem
 # Grammar for Test-Rule files
 # [File format](https://github.com/SimpleRegex/Test-Rules/blob/master/README.md)
 ########################################
-# Define a grammar for basic arithmetical expressions
 builder = Rley::grammar_builder do
   # Punctuation
   add_terminals('COLON', 'DASH')
@@ -19,24 +18,20 @@ builder = Rley::grammar_builder do
   add_terminals('INTEGER', 'STRING_LIT')
   add_terminals('IDENTIFIER', 'SRL_SOURCE')
 
-  rule('rule_file' => 'srl_heading srl_tests').as 'start_rule'
-  rule('srl_heading' => 'SRL SRL_SOURCE').as 'srl_source'
-  rule('srl_tests' => 'srl_tests single_test').as 'test_list'
-  rule('srl_tests' => 'single_test').as 'one_test'
-  rule('single_test' => 'atomic_test').as 'single_atomic_test'
-  rule('single_test' => 'compound_test').as 'single_compound_test'
-  rule('atomic_test' => 'match_test').as 'atomic_match'
-  rule('atomic_test' => 'no_match_test').as 'atomic_no_match'
-  rule('compound_test' => 'capture_test').as 'compound_capture'
-  rule('match_test' => 'MATCH STRING_LIT').as 'match_string'
-  rule('no_match_test' => 'NO MATCH STRING_LIT').as 'no_match_string'
-  rule('capture_test' => 'capture_heading capture_expectations').as 'capture_test'
-  rule('capture_heading' => 'CAPTURE FOR STRING_LIT COLON').as 'capture_string'
-  rule('capture_expectations' => 'capture_expectations single_expectation').as 'assertion_list'
-  rule('capture_expectations' => 'single_expectation').as 'one_expectation'
-  rule('single_expectation' => 'DASH INTEGER COLON capture_variable COLON STRING_LIT').as 'capture_expectation'
-  rule('capture_variable' => 'INTEGER').as 'var_integer'
-  rule('capture_variable' => 'IDENTIFIER').as 'var_identifier'
+  rule('rule_file' => 'srl_heading srl_test+').tag 'start_rule'
+  rule('srl_heading' => 'SRL SRL_SOURCE').tag 'srl_source'
+  rule('srl_test' => 'atomic_test').tag 'single_atomic_test'
+  rule('srl_test' => 'compound_test').tag 'single_compound_test'
+  rule('atomic_test' => 'match_test').tag 'atomic_match'
+  rule('atomic_test' => 'no_match_test').tag 'atomic_no_match'
+  rule('compound_test' => 'capture_test').tag 'compound_capture'
+  rule('match_test' => 'MATCH STRING_LIT').tag 'match_string'
+  rule('no_match_test' => 'NO MATCH STRING_LIT').tag 'no_match_string'
+  rule('capture_test' => 'capture_heading capture_expectation+').tag 'capture_test'
+  rule('capture_heading' => 'CAPTURE FOR STRING_LIT COLON').tag 'capture_string'
+  rule('capture_expectation' => 'DASH INTEGER COLON capture_variable COLON STRING_LIT').tag 'capture_expectation'
+  rule('capture_variable' => 'INTEGER').tag 'var_integer'
+  rule('capture_variable' => 'IDENTIFIER').tag 'var_identifier'
 end
 
 # And now build the grammar...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: srl_ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Dimitri Geshef