c_lexer 2.5.3.0.0 → 2.6.0.0.0

data/ext/lexer/lexer.rl

@@ -1314,18 +1314,16 @@ void Init_lexer()
         literal_extend_string(current_literal, escaped_char, ts, te);
       }
     } else {
-      if (literal_regexp_p(current_literal)) {
+      if (literal_squiggly_heredoc_p(current_literal) && newline_char_p(escaped_char)) {
+        literal_extend_string(current_literal, tok(lexer, ts, te), ts, te);
+      } else if (literal_supports_line_continuation_via_slash_p(current_literal) && newline_char_p(escaped_char)) {
+        VALUE token = tok(lexer, ts, te);
+        rb_funcall(token, rb_intern("gsub!"), 2, escaped_newline, blank_string);
+        literal_extend_string(current_literal, token, ts, te);
+      } else if (literal_regexp_p(current_literal)) {
         VALUE token = tok(lexer, ts, te);
         rb_funcall(token, rb_intern("gsub!"), 2, escaped_newline, blank_string);
         literal_extend_string(current_literal, token, ts, te);
-      } else if (literal_heredoc_p(current_literal) && newline_char_p(escaped_char)) {
-        if (literal_squiggly_heredoc_p(current_literal)) {
-          literal_extend_string(current_literal, tok(lexer, ts, te), ts, te);
-        } else {
-          VALUE token = tok(lexer, ts, te);
-          rb_funcall(token, rb_intern("gsub!"), 2, escaped_newline, blank_string);
-          literal_extend_string(current_literal, token, ts, te);
-        }
       } else if (lexer->escape == Qnil) {
         literal_extend_string(current_literal, tok(lexer, ts, te), ts, te);
       } else {

data/ext/lexer/literal/literal.h

@@ -58,5 +58,6 @@ static int newline_char_p(VALUE);
 static void literal_infer_indent_level(literal*, VALUE);
 static int next_state_for_literal(literal*);
 static void literal_clear_buffer(literal*);
+static int literal_supports_line_continuation_via_slash_p(literal*);
 
 #endif

data/ext/lexer/literal/methods.h

@@ -369,3 +369,23 @@ inline int newline_char_p(VALUE str)
 {
   return RTEST(rb_str_equal(str, rb_str_new2("\n")));
 }
+
+static int literal_supports_line_continuation_via_slash_p(literal *lit)
+{
+  if (literal_heredoc_p(lit) || literal_regexp_p(lit)) {
+    return 1;
+  }
+
+  switch (lit->str_type) {
+  case DOUBLE_QUOTE:
+  case PERCENT_Q:
+  case BIG_PERCENT_Q:
+  case BARE_PERCENT:
+  case SYM_DOUBLE_QUOT:
+  case PERCENT_X:
+  case BACKTICK:
+    return 1;
+  default:
+    return 0;
+  }
+}

data/lib/c_lexer/version.rb

@@ -1,3 +1,3 @@
 module CLexer
-  VERSION = '2.5.3.0.0'
+  VERSION = '2.6.0.0.0'
 end

data/lib/c_lexer.rb

@@ -1,5 +1,6 @@
 require 'c_lexer/version'
 require 'parser/ruby25'
+require 'parser/ruby26'
 
 require_relative 'lexer'
 
@@ -74,6 +75,15 @@ module Parser
       @lexer.static_env  = @static_env
     end
   end
+
+  class Ruby26WithCLexer < Ruby26
+    def initialize(builder=Parser::Builders::Default.new)
+      super(builder)
+      @lexer = ::Parser::CLexer.new(version)
+      @lexer.diagnostics = @diagnostics
+      @lexer.static_env  = @static_env
+    end
+  end
 end
 
 module CLexer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c_lexer
 version: !ruby/object:Gem::Version
-  version: 2.5.3.0.0
+  version: 2.6.0.0.0
 platform: ruby
 authors:
 - Ilya Bylich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.3.0
+        version: 2.6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.3.0
+        version: 2.6.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -188,8 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in C