ios_parser 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9c3428424b6fff808e5dcd94412c3d1e0d17ada
-  data.tar.gz: a5cda3521efcc1c2f7f2826fb9985b9be384a8f1
+  metadata.gz: 171eddd89d5cab8faaa45c3d6a913df8c7b6bc28
+  data.tar.gz: 6bda5b3e474d03a3fa4a02a6399b62ddd89bbc9a
 SHA512:
-  metadata.gz: aaeda92fb563f4416c18fc26e2118e30c90f9dc45e7e9da9559c7f84a6adf46e9c57ac3e0b9ffe0adfca38cef089d20bcb20cd0e6e4bebdf5afa63d3f939d598
-  data.tar.gz: 881b58760c2426e08c49e5cad4db0db21e1fb95f14ddeb31ea465853cd81aa14fca33c5a1d04ec0ee2396b9fec99e27022156b693998eeb666bc664bc54b55af
+  metadata.gz: 310aa7caec14048c544f0f65073a37e9deb6687fe372ead09a1c63a07b7d7189be4f91cbeba4ce40d3ab75264f45358d039980494572ab2077a8ed98dfb2a14e
+  data.tar.gz: 5df2bf63775bb0cba0ad20734494d7252751bb5357761fc28e8defe80eaa9bfec75565206a0011c6cf806749bfb5f26fe7a961678a3339ffb05f2bff713a6b9d

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+bundler_args: --without guard

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.3 (2016-05-17)
+
+Bugfixes:
+
+- raise parse error for unterminated quoted string
+
 ## 0.3.1 (2016-03-07)
 
 Bugfixes:

data/Gemfile

@@ -1,2 +1,9 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 gemspec
+
+group :guard do
+  gem 'guard', '~>2.0'
+  gem 'guard-rake', '~>1.0'
+  gem 'guard-rspec', '~>4.5'
+  gem 'guard-rubocop', '~>1.2'
+end

data/ext/ios_parser/c_lexer/lexer.c

@@ -2,6 +2,7 @@
 
 static VALUE rb_mIOSParser;
 static VALUE rb_cCLexer;
+VALUE rb_eLexError;
 
 typedef enum lex_token_state {
     LEX_STATE_ROOT,
@@ -451,6 +452,13 @@ static VALUE call(VALUE self, VALUE input_text) {
         }
     }
 
+    if (lex->token_state == LEX_STATE_QUOTED_STRING) {
+        rb_raise(rb_eLexError,
+                 "Unterminated quoted string starting at %d: %.*s",
+                 (int)lex->token_start,
+                 (int)lex->token_length, &lex->text[lex->token_start]);
+    }
+
     delimit(lex);
     lex->token_start = lex->pos;
 
@@ -464,6 +472,8 @@ static VALUE call(VALUE self, VALUE input_text) {
 void Init_c_lexer() {
     rb_mIOSParser = rb_define_module("IOSParser");
     rb_cCLexer = rb_define_class_under(rb_mIOSParser, "CLexer", rb_cObject);
+    rb_eLexError = rb_define_class_under(rb_mIOSParser, "LexError",
+                                         rb_eStandardError);
     rb_define_alloc_func(rb_cCLexer, allocate);
     rb_define_method(rb_cCLexer, "initialize", initialize, 0);
     rb_define_method(rb_cCLexer, "call", call, 1);

data/ios_parser.gemspec

@@ -17,9 +17,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rspec', '~>3.2'
   s.add_development_dependency 'rubocop', '~>0.37'
-  s.add_development_dependency 'guard', '~>2.0'
-  s.add_development_dependency 'guard-rake', '~>1.0'
-  s.add_development_dependency 'guard-rspec', '~>4.5'
-  s.add_development_dependency 'guard-rubocop', '~>1.2'
   s.add_development_dependency 'rake-compiler', '~>0.9'
 end

data/lib/ios_parser/lexer.rb

@@ -1,5 +1,7 @@
 module IOSParser
   class PureLexer
+    LexError = IOSParser::LexError
+
     attr_accessor :tokens, :token, :indents, :indent, :state, :char,
                   :string_terminator
 
@@ -23,10 +25,7 @@ module IOSParser
         send(state)
       end
 
-      delimit
-      update_indentation
-      scrub_banner_garbage
-      tokens
+      finalize
     end
 
     ROOT_TRANSITIONS = [
@@ -289,6 +288,17 @@ module IOSParser
       indents.push(indent)
     end
 
-    class LexError < StandardError; end
+    def finalize
+      if state == :quoted_string
+        pos = @text.rindex(string_terminator)
+        raise LexError, "Unterminated quoted string starting at #{pos}: "\
+                        "#{@text[pos..pos + 20]}"
+      end
+
+      delimit
+      update_indentation
+      scrub_banner_garbage
+      tokens
+    end
   end # class PureLexer
 end # module IOSParser

data/lib/ios_parser/version.rb

@@ -1,7 +1,7 @@
 module IOSParser
   class << self
     def version
-      '0.3.1'
+      '0.3.3'
     end
   end
 end

data/lib/ios_parser.rb

@@ -11,6 +11,7 @@ module IOSParser
   end
 
   Lexer = lexer
+  class LexError < StandardError; end
 end
 
 require_relative 'ios_parser/ios'

data/spec/lib/ios_parser/lexer_spec.rb

@@ -264,6 +264,18 @@ END
         it { expect(subject_pure.map(&:last)).to eq output }
         it { expect(subject.map(&:last)).to eq output }
       end
+
+      context 'unterminated quoted string' do
+        let(:input) { '"asdf' }
+        it 'raises a lex error' do
+          expect { subject_pure }.to raise_error IOSParser::LexError
+          expect { subject }.to raise_error IOSParser::LexError
+
+          pattern = /Unterminated quoted string starting at 0: #{input}/
+          expect { subject_pure }.to raise_error(pattern)
+          expect { subject }.to raise_error(pattern)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ios_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Ben Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,62 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.37'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: guard-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.5'
-- !ruby/object:Gem::Dependency
-  name: guard-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement