c_lexer 2.5.1.2.0 → 2.5.3.0.0

data/ext/lexer/{literal.h → literal/literal.h}

@@ -6,7 +6,7 @@ typedef struct literal literal;
 #include "lexer.h"
 
 struct literal {
-  struct lexer_state *lexer;
+  struct Lexer *lexer;
   VALUE buffer;
   long buffer_s;
   long buffer_e;
@@ -35,7 +35,7 @@ struct literal {
   int dedent_level;
 };
 
-static void literal_init(literal*, lexer_state*, VALUE, VALUE, long, long, int, int, int);
+static void literal_init(literal*, Lexer*, VALUE, VALUE, long, long, int, int, int);
 static str_type literal_string_to_str_type(VALUE);
 static VALUE literal_str_type_to_string(str_type);
 static void literal_set_start_tok_and_interpolate(literal*, str_type);

data/ext/lexer/literal/methods.h

@@ -1,4 +1,4 @@
-static void literal_init(literal *self, lexer_state *lexer, VALUE str_type,
+static void literal_init(literal *self, Lexer *lexer, VALUE str_type,
                          VALUE delimiter, long str_s, long heredoc_e, int indent,
                          int dedent_body, int label_allowed)
 {

data/ext/lexer/stack_state/cmdarg.h

@@ -0,0 +1,47 @@
+static VALUE lexer_push_cmdarg_state(VALUE self, VALUE bit)
+{
+  Lexer* lexer = GET_LEXER(self);
+  int bitval = RTEST(bit) ? 1 : 0;
+  stack_state_push(&lexer->cmdarg, bitval);
+  return Qnil;
+}
+
+static VALUE lexer_pop_cmdarg_state(VALUE self)
+{
+  Lexer* lexer = GET_LEXER(self);
+  stack_state_pop(&lexer->cmdarg);
+  return Qnil;
+}
+
+static VALUE lexer_lexpop_cmdarg_state(VALUE self)
+{
+  Lexer* lexer = GET_LEXER(self);
+  stack_state_lexpop(&lexer->cmdarg);
+  return Qnil;
+}
+
+static VALUE lexer_clear_cmdarg_state(VALUE self)
+{
+  Lexer* lexer = GET_LEXER(self);
+  stack_state_clear(&lexer->cmdarg);
+  return Qnil;
+}
+
+static VALUE lexer_cmdarg_state_empty_p(VALUE self)
+{
+  Lexer* lexer = GET_LEXER(self);
+  return stack_state_empty_p(&lexer->cmdarg) ? Qtrue : Qfalse;
+}
+
+static VALUE lexer_cmdarg_state_value(VALUE self)
+{
+  Lexer* lexer = GET_LEXER(self);
+  return INT2NUM(stack_state_value(&lexer->cmdarg));
+}
+
+static VALUE lexer_set_cmdarg_state(VALUE self, VALUE value)
+{
+  Lexer* lexer = GET_LEXER(self);
+  stack_set_value(&lexer->cmdarg, NUM2INT(value));
+  return Qtrue;
+}

data/ext/lexer/stack_state/cond.h

@@ -0,0 +1,47 @@
+static VALUE lexer_push_cond_state(VALUE self, VALUE bit)
+{
+  Lexer* lexer = GET_LEXER(self);
+  int bitval = RTEST(bit) ? 1 : 0;
+  stack_state_push(&lexer->cond, bitval);
+  return Qnil;
+}
+
+static VALUE lexer_pop_cond_state(VALUE self)
+{
+  Lexer* lexer = GET_LEXER(self);
+  stack_state_pop(&lexer->cond);
+  return Qnil;
+}
+
+static VALUE lexer_lexpop_cond_state(VALUE self)
+{
+  Lexer* lexer = GET_LEXER(self);
+  stack_state_lexpop(&lexer->cond);
+  return Qnil;
+}
+
+static VALUE lexer_clear_cond_state(VALUE self)
+{
+  Lexer* lexer = GET_LEXER(self);
+  stack_state_clear(&lexer->cond);
+  return Qnil;
+}
+
+static VALUE lexer_cond_state_empty_p(VALUE self)
+{
+  Lexer* lexer = GET_LEXER(self);
+  return stack_state_empty_p(&lexer->cond) ? Qtrue : Qfalse;
+}
+
+static VALUE lexer_cond_state_value(VALUE self)
+{
+  Lexer* lexer = GET_LEXER(self);
+  return INT2NUM(stack_state_value(&lexer->cond));
+}
+
+static VALUE lexer_set_cond_state(VALUE self, VALUE value)
+{
+  Lexer* lexer = GET_LEXER(self);
+  stack_set_value(&lexer->cond, NUM2INT(value));
+  return Qtrue;
+}

data/ext/lexer/{stack_state.h → stack_state/stack_state.h}

@@ -32,9 +32,9 @@ static inline void stack_state_clear(stack_state *ss)
   *ss = 0;
 }
 
-static inline VALUE stack_state_empty_p(stack_state *ss)
+static inline int stack_state_empty_p(stack_state *ss)
 {
-  return *ss == 0 ? Qtrue : Qfalse;
+  return *ss == 0;
 }
 
 static inline int stack_state_value(stack_state *ss)

data/lib/c_lexer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c_lexer
 version: !ruby/object:Gem::Version
-  version: 2.5.1.2.0
+  version: 2.5.3.0.0
 platform: ruby
 authors:
 - Ilya Bylich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.1.2
+        version: 2.5.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.1.2
+        version: 2.5.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -156,18 +156,18 @@ files:
 - bin/console
 - bin/setup
 - c_lexer.gemspec
-- ext/lexer/cmdarg.h
-- ext/lexer/cond.h
 - ext/lexer/emit_tables.h
 - ext/lexer/extconf.rb
 - ext/lexer/lexer.c
 - ext/lexer/lexer.h
 - ext/lexer/lexer.rl
-- ext/lexer/literal.h
+- ext/lexer/literal/literal.h
 - ext/lexer/literal/methods.h
 - ext/lexer/literal/type.h
-- ext/lexer/stack.h
-- ext/lexer/stack_state.h
+- ext/lexer/stack_state/cmdarg.h
+- ext/lexer/stack_state/cond.h
+- ext/lexer/stack_state/stack.h
+- ext/lexer/stack_state/stack_state.h
 - lib/c_lexer.rb
 - lib/c_lexer/version.rb
 homepage: https://github.com/iliabylich/c_lexer

data/ext/lexer/cmdarg.h

@@ -1,47 +0,0 @@
-static VALUE lexer_push_cmdarg_state(VALUE self, VALUE bit)
-{
-  INIT_LEXER_STATE(self, state);
-  int bitval = RTEST(bit) ? 1 : 0;
-  stack_state_push(&state->cmdarg, bitval);
-  return Qnil;
-}
-
-static VALUE lexer_pop_cmdarg_state(VALUE self)
-{
-  INIT_LEXER_STATE(self, state);
-  stack_state_pop(&state->cmdarg);
-  return Qnil;
-}
-
-static VALUE lexer_lexpop_cmdarg_state(VALUE self)
-{
-  INIT_LEXER_STATE(self, state);
-  stack_state_lexpop(&state->cmdarg);
-  return Qnil;
-}
-
-static VALUE lexer_clear_cmdarg_state(VALUE self)
-{
-  INIT_LEXER_STATE(self, state);
-  stack_state_clear(&state->cmdarg);
-  return Qnil;
-}
-
-static VALUE lexer_cmdarg_state_empty_p(VALUE self)
-{
-  INIT_LEXER_STATE(self, state);
-  return stack_state_empty_p(&state->cmdarg);
-}
-
-static VALUE lexer_cmdarg_state_value(VALUE self)
-{
-  INIT_LEXER_STATE(self, state);
-  return INT2NUM(stack_state_value(&state->cmdarg));
-}
-
-static VALUE lexer_set_cmdarg_state(VALUE self, VALUE value)
-{
-  INIT_LEXER_STATE(self, state);
-  stack_set_value(&state->cmdarg, NUM2INT(value));
-  return Qtrue;
-}

data/ext/lexer/cond.h

@@ -1,47 +0,0 @@
-static VALUE lexer_push_cond_state(VALUE self, VALUE bit)
-{
-  INIT_LEXER_STATE(self, state);
-  int bitval = RTEST(bit) ? 1 : 0;
-  stack_state_push(&state->cond, bitval);
-  return Qnil;
-}
-
-static VALUE lexer_pop_cond_state(VALUE self)
-{
-  INIT_LEXER_STATE(self, state);
-  stack_state_pop(&state->cond);
-  return Qnil;
-}
-
-static VALUE lexer_lexpop_cond_state(VALUE self)
-{
-  INIT_LEXER_STATE(self, state);
-  stack_state_lexpop(&state->cond);
-  return Qnil;
-}
-
-static VALUE lexer_clear_cond_state(VALUE self)
-{
-  INIT_LEXER_STATE(self, state);
-  stack_state_clear(&state->cond);
-  return Qnil;
-}
-
-static VALUE lexer_cond_state_empty_p(VALUE self)
-{
-  INIT_LEXER_STATE(self, state);
-  return stack_state_empty_p(&state->cond);
-}
-
-static VALUE lexer_cond_state_value(VALUE self)
-{
-  INIT_LEXER_STATE(self, state);
-  return INT2NUM(stack_state_value(&state->cond));
-}
-
-static VALUE lexer_set_cond_state(VALUE self, VALUE value)
-{
-  INIT_LEXER_STATE(self, state);
-  stack_set_value(&state->cond, NUM2INT(value));
-  return Qtrue;
-}