bel_parser 1.0.4-java → 1.0.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce3dec94758500ca12f20ec16d93cbf01874a8d3
-  data.tar.gz: 21510b5bc83a203e446ab76b9a19d7daca380731
+  metadata.gz: 33897de47554094c0e1080aefe1d110a10b5e8e2
+  data.tar.gz: aa2c6d0b4b11132b8eef14507af0abdc3c29597a
 SHA512:
-  metadata.gz: 9e30b2bbb3c9ea3a736931ed056ed28b65635aa46a545f3c3a3ca72481f7a37cbeff080ede1b5a94ccec76bd6fa7680bbac1d63ac0310378e2a40c0ede402b03
-  data.tar.gz: 9b4b54e45db28ebbe356cb0942bcd89e845eaefcb04c68b574a5f145587151af9ad228cf9b7bc950fe53a8e4ecd980be6eff7f31645af6bc3eb1e0a295fe647a
+  metadata.gz: 08405ba1235d81e0675fa135717452806fd80719698d8366263ad13796029db8cdf9bb2e34b546a4e765e2c586ff297c1ae0c6b60e30782526ab2b2e1164d569
+  data.tar.gz: 19aecd3a58db40c7a09cbb846fffb0a28c43c61b0fa3ad348c06c7e159e759c3ed4f90c5c2d28e494a63be034dfce0e83addbdb4ad3161cac374299adf3b7c2c

data/.gemspec-java

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
                                  'Anthony Bargnesi',
                                  'Nick Bargnesi',
                                ]
-  spec.date                  = %q{2016-05-09}
+  spec.date                  = %q{2016-06-17}
   spec.email                 = %q{abargnesi@selventa.com}
   spec.files                 = [
                                  Dir.glob('lib/**/*.{rb,rl}'),

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/bel_parser/ast_generator.rb

@@ -2,14 +2,12 @@ require_relative 'parsers/common'
 require_relative 'parsers/expression'
 require_relative 'parsers/bel_script'
 require_relative 'mixin/line_mapping'
-require_relative 'mixin/line_continuator'
 
 module BELParser
   # ASTGenerator yields AST results for each line in some {IO}.
   # See #{ASTGenerator#each}.
   class ASTGenerator
     include LineMapping
-    include LineContinuator
 
     map_const = ->(x) { x.constants.map { |c| x.const_get(c) } }
     PARSERS = [
@@ -17,6 +15,7 @@ module BELParser
       map_const.call(BELParser::Parsers::Expression),
       map_const.call(BELParser::Parsers::BELScript)
     ].flatten!
+    LINE_CONTINUATOR = "\\\n".freeze
 
     def initialize(io)
       @io = io
@@ -48,21 +47,23 @@ module BELParser
     #         {Enumerator#each}
     def each # rubocop:disable MethodLength
       if block_given?
-        line_enumerator = map_lines(@io.each_line.lazy)
-
-        line_number = 1
-        loop do
-          begin
-            line = expand_line_continuator(line_enumerator)
+        line_number   = 1
+        expanded_line = nil
+        map_lines(@io.each_line.lazy).each do |line|
+          if line.end_with?(LINE_CONTINUATOR)
+            expanded_line = "#{expanded_line}#{line.chomp(LINE_CONTINUATOR)}"
+          else
+            expanded_line = "#{expanded_line}#{line}"
 
             ast_results = []
             PARSERS.map do |parser|
-              parser.parse(line) { |ast| ast_results << ast }
+              parser.parse(expanded_line) { |ast| ast_results << ast }
             end
-            yield [line_number, line, ast_results]
+
+            yield [line_number, expanded_line, ast_results]
+
             line_number += 1
-          rescue StopIteration
-            return
+            expanded_line = nil
           end
         end
       else
@@ -77,7 +78,7 @@ if __FILE__ == $PROGRAM_NAME
     line_number, line, ast_results = line_results
     puts "#{line_number}: #{line}"
     ast_results.each do |ast|
-      puts ast.to_s(1)
+      puts ast.to_s
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: java
 authors:
 - Anthony Bargnesi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -308,7 +308,6 @@ files:
 - lib/bel_parser/language/version2_0/value_encodings/protein_abundance.rb
 - lib/bel_parser/language/version2_0/value_encodings/protein_modification.rb
 - lib/bel_parser/language/version2_0/value_encodings/rna_abundance.rb
-- lib/bel_parser/mixin/line_continuator.rb
 - lib/bel_parser/mixin/line_mapping.rb
 - lib/bel_parser/parsers/ast/node.rb
 - lib/bel_parser/parsers/ast/sexp.rb

data/lib/bel_parser/mixin/line_continuator.rb

@@ -1,15 +0,0 @@
-module BELParser
-  # LineContinuator is a mixin for line expansions for BEL Script.
-  module LineContinuator
-    LINE_CONTINUATOR = "\\\n".freeze
-
-    def expand_line_continuator(line_enumerator)
-      line = line_enumerator.next
-      while line.end_with?(LINE_CONTINUATOR)
-        line.chomp!(LINE_CONTINUATOR)
-        line += line_enumerator.next
-      end
-      line
-    end
-  end
-end