lineparser 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d174a713864f0a8db2939fd5b81461d358bd121
-  data.tar.gz: ccd279d086903f8819808d7fce4c5d769323a4c1
+  metadata.gz: 5b17ab2c8546919d2a3eedeedb5ab9a90a07fdae
+  data.tar.gz: 1169df54ee693a8a7b8025cff77b2d4cb7fa42cd
 SHA512:
-  metadata.gz: fffa692929c6342fd8baefaa0ff047e4452ca14456d85cb3bd60517355589c0d9e9896b2ccf68af7bd0f0f582d197197890f6648fa632836845184ff6b025a95
-  data.tar.gz: 60543a5400d571eced3c9cedc813ed18af805403d5bcabdda18255eec56338a0a5c75294d172b50c832f436b593d108e82c498bd798cb1f0fd6b86facb2e5416
+  metadata.gz: c094653ed8f021cc12ac859dcb663f41067db4b6afd75a802259de0a15489b551ad84b381624c1c226f499bd2d5c130c24b0a18f559ab463ee0cbe2f5111b477
+  data.tar.gz: 5ac836e962ff35aec46538f51115875df085c10467304564e971ab48204748ca46270d72b20c085c96f257e46e6dc6ac0135b132b092f834a6f3395a39265e3f

data/lib/lineparser.rb

@@ -70,12 +70,14 @@ class LineParser
 
   def scan(xpatterns, items)
 
+    puts 'xpatterns : ' + xpatterns.inspect
     records = []
 
     while items.any? do
 
       x = items.shift
-      params = nil
+      puts 'x : '  + x.inspect
+      params, context = nil, nil
 
       xpatterns = [xpatterns] unless xpatterns[0].is_a? Array
 
@@ -84,19 +86,34 @@ class LineParser
       end
 
       if found then
+
         children = nil
         children = scan(found.last, x[1..-1]) if found.last.is_a? Array
         records << [found[2], params, x, children]
+
       else
 
-        found = xpatterns.detect do |_, pattern| 
-          params = @h[pattern.class.to_s.to_sym].call x.first, pattern
+        found = xpatterns.detect do |_, pattern, id|
+
+          if pattern == :root then 
+
+            found = @tree_patterns.detect do |_, pattern2, id|
+              params = @h[pattern2.class.to_s.to_sym].call x.first, pattern2
+              context = id if params
+            end
+
+          else
+
+            params = @h[pattern.class.to_s.to_sym].call x.first, pattern
+            context = id if params
+          end
         end
         
         if found then
+
           children = nil
           children = scan(found[3..-1], x[1..-1]) if found.last.is_a? Array
-          records << [found[2], params, x, children]
+          records << [context, params, x, children]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lineparser
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   91WD0+jYVX++HpUKNCp85+avduv17ztFqGGok26cpRFYNdIIFFu8T4cl2jsqGI2l
   hT3uS3yIJ12YEQ==
   -----END CERTIFICATE-----
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree