rsec 0.4.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0729a60e389265baab9ff529159db7a7027c4b0635640ecfb50cf83c2cc2a0db'
-  data.tar.gz: d74e398d26955b73151494f55b3315e06f61483dbedd5136076bb90164e3f24d
+  metadata.gz: 8977b875ff6997eb73fd119f4227073e59cc8f03252b7393d730169177930373
+  data.tar.gz: 7493d1f6ae1f5e2a8d85d32d0fc1f5c98e1f3dbfed06453dad2c1bc5c02075d1
 SHA512:
-  metadata.gz: e5c81b3f0727c69ff705dcbd0aa077eed43a1f99c7d760e60c49dd4a4a98fd3417c86987a65776f0c88279c1c636cb3812e0be3693d0d3d871653ccee2437251
-  data.tar.gz: 468b07ca8e630158a0605315b381ab40df83c0a4a3bab56e92d60868ddcfcc5fec4e83cc944efdb63e7bd609240fd384f459b3e8204fc8e990363e133fe1fca3
+  metadata.gz: 1e3f20dca6a450a0ef36da2b619ea7bd5083ac99c900b82da08302a02b7ca05db3ea95861fd76f8e87e0518076fc0d8b17091f30dd859094a55a42b9d8fd48be
+  data.tar.gz: 332d704b8ba296f4dd09de79fed738ba23e2e95162ef8230f6da862d0eda05a7379a36ab79c876c1b0d525d9157453129253c294b8fbe5fcf4e73d1e0efcad7b

data/examples/c_minus.rb

@@ -91,7 +91,7 @@ class CMinus
     # p expr.parse! "gcd (v ,u- u/v *v)"
     expr.map{|e| Expr[e] }
   end
-    
+
   # statement parser builder, returns [stmt, block]
   def statement var_decl
     expr = expression()
@@ -114,9 +114,10 @@ class CMinus
     }
     stmt = block | if_stmt | while_stmt | return_stmt | expr_stmt
     # p if_stmt.parse! 'if(v == 0)return u;'
+    # p block.parse! '{ int x; }'
     [stmt, block]
   end
-  
+
   def initialize
     type_id = seq_(TYPE, ID).cached
     # p type_id.parse! 'int a'
@@ -137,10 +138,10 @@ class CMinus
       [ty, id, *maybe_bra]
     }
     params = param.join(COMMA).even | 'void'.r{[]}
-    brace = seq_('(', params, ')')[1]
-    fun_decl = seq_(type_id, brace, block){
-      |(type, id), params, block|
-      Function[type, id, params, block]
+    paren_args = seq_('(', params, ')')[1]
+    fun_decl = seq_(type_id, paren_args, block){|results|
+      type_id_result, params_result, block_result = results
+      Function[*type_id_result, params_result, block_result]
     }
     # p fun_decl.parse! 'int gcd(int u, int v){return 2;}'
     @program = SPACE.join(fun_decl | var_decl | EOSTMT).odd.eof

data/examples/little_markdown.rb

@@ -65,7 +65,7 @@ class LittleMarkdown
       "<span id='#{id}'>#{text}</span>"
     }
     line = (img | link | strong | em | code | escape | id | text).star
-    line.eof.map &:join
+    line.eof.map {|parts, _| parts.join }
   end
   
   # pseudo xml tag parser, except <br> and <hr> and <script>

data/examples/nasm_manual.rb

@@ -42,7 +42,7 @@ module NASMManualParser
     tr_class      = 'TR3/4/5/6/7'
     classes       = (imm_class.r | memoffs_class | mem_class | reg_class | tr_class).fail 'operand class'
     reg           = reg_parser.fail 'register'
-    num           = /\d/.r(&:to_i).fail 'num'
+    num           = /\d/.r{|n, _| n.to_i }.fail 'num'
     # memoffs should be left of mem
     operand       = classes | reg | num
     operands      = operand.join('/').even.join(',').even
@@ -107,7 +107,7 @@ module NASMManualParser
     parsed = ''
     parser = instruction_parser.eof
     src = File.read filename
-    src.lines.with_index do |raw_line, idx|
+    src.lines.to_a.each_with_index do |raw_line, idx|
       line = raw_line.strip
       # this shapy shows the line is something defining an nemonic
       if line =~ /^\w+\s+[^;\[]+;\ [^;\[]+\[.+\]$/

data/examples/slow_json.rb

@@ -40,7 +40,7 @@ class SlowJSON
   end
 
   def generate_parser
-    string  = '"'.r >> chars_parser.star.map(&:join) << '"'
+    string  = '"'.r >> chars_parser.star.map{|cs, _| cs.join } << '"'
     # -? int frac? exp?
     number  = prim(:double, allowed_sign: '-')
     @value  = string | number | lazy{@object} | lazy{@array} |

data/lib/rsec.rb

@@ -11,7 +11,7 @@ module Rsec
     TO_PARSER_METHOD = :r
   end
 
-  VERSION = '0.4.3'
+  VERSION = '1.0.0'
 end
 
 require "strscan"

data/lib/rsec/parsers/misc.rb

@@ -5,7 +5,7 @@ module Rsec #:nodoc
     def _parse ctx
       res = left()._parse ctx
       return INVALID if INVALID[res]
-      right()[res]
+      right()[res, ctx]
     end
   end
 

data/test/test_misc.rb

@@ -41,6 +41,18 @@ class TestMisc < TC
     ase 'bb', p.parse('b')
     ase INVALID, p.parse('.')
   end
+
+  def test_seq_map
+    p = seq('"'.r, /\w/.r, '"'.r).map{|(_, n, _)| n*2}
+    ase 'bb', p.parse('"b"')
+    ase INVALID, p.parse('.')
+  end
+
+  def test_seq_map_with_context
+    p = seq('"'.r, /\w/.r, '"'.r).map{|(_, n, _), ctx| n*ctx.pos}
+    ase 'bbb', p.parse('"b"')
+    ase INVALID, p.parse('.')
+  end
   
   def test_fail
     p = 'v'.r.fail 'omg!'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsec
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.0.0
 platform: ruby
 authors:
 - NS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies: []
 description: Easy and extreme fast dynamic PEG parser combinator.
 email: