c_lexer 2.6.0.0.0 → 2.6.2.0.0

data/ext/lexer/lexer.h

@@ -167,30 +167,30 @@ VALUE kWHILE;
 VALUE kWHILE_MOD;
 VALUE kYIELD;
 
-VALUE tAMPER;
 VALUE tAMPER2;
+VALUE tAMPER;
 VALUE tANDDOT;
 VALUE tANDOP;
 VALUE tAREF;
 VALUE tASET;
 VALUE tASSOC;
-VALUE tBACK_REF;
 VALUE tBACK_REF2;
+VALUE tBACK_REF;
 VALUE tBANG;
 VALUE tCARET;
 VALUE tCHARACTER;
 VALUE tCMP;
-VALUE tCOLON;
 VALUE tCOLON2;
 VALUE tCOLON3;
+VALUE tCOLON;
 VALUE tCOMMA;
 VALUE tCOMMENT;
 VALUE tCONSTANT;
 VALUE tCVAR;
 VALUE tDIVIDE;
-VALUE tDOT;
 VALUE tDOT2;
 VALUE tDOT3;
+VALUE tDOT;
 VALUE tDSTAR;
 VALUE tEH;
 VALUE tEQ;
@@ -211,16 +211,17 @@ VALUE tLAMBDA;
 VALUE tLAMBEG;
 VALUE tLBRACE;
 VALUE tLBRACE_ARG;
-VALUE tLBRACK;
 VALUE tLBRACK2;
+VALUE tLBRACK;
 VALUE tLCURLY;
 VALUE tLEQ;
+VALUE tLPAREN2;
 VALUE tLPAREN;
 VALUE tLPAREN_ARG;
-VALUE tLPAREN2;
 VALUE tLSHFT;
 VALUE tLT;
 VALUE tMATCH;
+VALUE tMETHREF;
 VALUE tMINUS;
 VALUE tNEQ;
 VALUE tNL;
@@ -232,8 +233,8 @@ VALUE tPERCENT;
 VALUE tPIPE;
 VALUE tPLUS;
 VALUE tPOW;
-VALUE tQWORDS_BEG;
 VALUE tQSYMBOLS_BEG;
+VALUE tQWORDS_BEG;
 VALUE tRATIONAL;
 VALUE tRBRACK;
 VALUE tRCURLY;
@@ -243,8 +244,8 @@ VALUE tRPAREN;
 VALUE tRSHFT;
 VALUE tSEMI;
 VALUE tSPACE;
-VALUE tSTAR;
 VALUE tSTAR2;
+VALUE tSTAR;
 VALUE tSTRING;
 VALUE tSTRING_BEG;
 VALUE tSTRING_CONTENT;

data/ext/lexer/lexer.rl

@@ -827,11 +827,12 @@ void Init_lexer()
   init_symbol(tLCURLY);
   init_symbol(tLEQ);
   init_symbol(tLPAREN);
-  init_symbol(tLPAREN_ARG);
   init_symbol(tLPAREN2);
+  init_symbol(tLPAREN_ARG);
   init_symbol(tLSHFT);
   init_symbol(tLT);
   init_symbol(tMATCH);
+  init_symbol(tMETHREF);
   init_symbol(tMINUS);
   init_symbol(tNEQ);
   init_symbol(tNL);
@@ -843,8 +844,8 @@ void Init_lexer()
   init_symbol(tPIPE);
   init_symbol(tPLUS);
   init_symbol(tPOW);
-  init_symbol(tQWORDS_BEG);
   init_symbol(tQSYMBOLS_BEG);
+  init_symbol(tQWORDS_BEG);
   init_symbol(tRATIONAL);
   init_symbol(tRBRACK);
   init_symbol(tRCURLY);
@@ -1412,13 +1413,8 @@ void Init_lexer()
       if (literal_end_interp_brace_and_try_closing(current_literal)) {
         if (lexer->version == 18 || lexer->version == 19) {
           emit_token(lexer, tRCURLY, rb_str_new2("}"), p - 1, p);
-          if (lexer->version < 24) {
-            stack_state_lexpop(&lexer->cond);
-            stack_state_lexpop(&lexer->cmdarg);
-          } else {
-            stack_state_pop(&lexer->cond);
-            stack_state_pop(&lexer->cmdarg);
-          }
+          stack_state_pop(&lexer->cond);
+          stack_state_pop(&lexer->cmdarg);
         } else {
           emit_token(lexer, tSTRING_DEND, rb_str_new2("}"), p - 1, p);
         }
@@ -2364,7 +2360,13 @@ void Init_lexer()
       global_var | class_var_v | instance_var_v
       => { p = ts - 1; fcall expr_variable; };
 
-      '.' | '&.' | '::'
+      '.:' w_space+
+      => { emit_token(lexer, tDOT, tok(lexer, ts, ts + 1), ts, ts + 1);
+           emit_token(lexer, tCOLON, tok(lexer, ts + 1, ts + 2), ts + 1, ts + 2);
+           p = p - (te - ts) + 2;
+           fnext expr_dot; fbreak; };
+
+      '.:' | '.' | '&.' | '::'
       => { emit_table_PUNCTUATION(lexer, tok(lexer, ts, te), ts, te);
            fnext expr_dot; fbreak; };
 

data/lib/c_lexer/version.rb

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

data/lib/c_lexer.rb

@@ -1,6 +1,7 @@
 require 'c_lexer/version'
 require 'parser/ruby25'
 require 'parser/ruby26'
+require 'parser/ruby27'
 
 require_relative 'lexer'
 
@@ -84,6 +85,15 @@ module Parser
       @lexer.static_env  = @static_env
     end
   end
+
+  class Ruby27WithCLexer < Ruby27
+    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.6.0.0.0
+  version: 2.6.2.0.0
 platform: ruby
 authors:
 - Ilya Bylich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast