code-ruby-parser 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32cb9a8a8f8c5a8e0094282f299aac29f658dff93cde750d082a379a50e740e4
-  data.tar.gz: 17d8de30653fd59b4f0772fd9123aab8bbbf1c891aa4b7c87aa11eafe1ca4dcd
+  metadata.gz: e0b771db0340e7e46f375f056056480d1b92ec6210fae8aa91025b3b10cdccad
+  data.tar.gz: 71fff0149a4e017fc03e0b4b9798d23fb94c874c937f51b8ee89a3c752619cc9
 SHA512:
-  metadata.gz: cd2f019703431f38c529646697b0ea369d616ae81493f5987c7deda64bb816af05dcd7b21765fb8f0053bd0d8f04f0eb96173ec8a6677811446db6bfe234c029
-  data.tar.gz: 6028c01692f95c52d83f58023bedc2a97f7c056776fc373b4fe8ff1c2e8cd900fbd5a7264d826bbf5f255029298c190086c5728d17b8beb943e9b1aa52948f02
+  metadata.gz: 6480f03895aa2958809b4d7cf849b2720de2d8eba33af43e2999db8d6609cb83936a4649e931da459dd376c489f9c8d4f0671cdb56a6a45706c931adc0fd9cff
+  data.tar.gz: 3a51ac65786932de2ed2bd1c64f022e7a498e78233aea3085ffb6acd4f26970bcfb7ef3520078c7a94bdc7bf7f2c6e7d4d72a95155cac6e3b2c9d3ba9d84a6a8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.1.2 - November 12, 2022
+
+- Fix parsing `&:even?`
+
 ### 0.1.1 - November 12, 2022
 
 - Fix `:even?` and `:update?` strings

data/bin/push

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+rm -f *.gem
+git pull
+git push
+gem build template-ruby-parser.gemspec
+gem build code-ruby-parser.gemspec
+
+for file in *.gem
+do
+  gem push $file
+done
+
+rm *.gem

data/lib/code/parser/call.rb

@@ -38,7 +38,7 @@ class Code
 
         {
           call: {
-            **identifier,
+            identifier: identifier,
             arguments: arguments,
             block: block,
             comments: comments
@@ -117,7 +117,7 @@ class Code
             comments_after: comments_after,
             default: default,
             keyword: true,
-            **key
+            identifier: key
           }.compact
         else
           @cursor = previous_cursor
@@ -140,13 +140,13 @@ class Code
               comments_before: comments_before,
               comments_after: comments_after,
               default: default,
-              **identifier
+              identifier: identifier
             }.compact
           else
             {
               comments_before: comments_before,
               comments_after: comments_after,
-              **identifier
+              identifier: identifier
             }.compact
           end
         else

data/lib/code/parser/function.rb

@@ -68,7 +68,7 @@ class Code
             keyword: true,
             comments_before: comments_before,
             comments_after: comments_after,
-            **key
+            identifier: key
           }.compact
         else
           @cursor = previous_cursor
@@ -96,7 +96,7 @@ class Code
             default: default,
             comments_before: comments_before,
             comments_after: comments_after,
-            **identifier
+            identifier: identifier
           }.compact
         else
           @cursor = previous_cursor

data/lib/code/parser/identifier.rb

@@ -9,36 +9,22 @@ class Code
       def parse
         return if end_of_input?
 
-        previous_cursor = cursor
-
-        if !simple? && match(AMPERSAND) && !next?(SPECIAL)
-          kind = :block
-        elsif !simple && match(ASTERISK + ASTERISK) && !next?(SPECIAL)
-          kind = :keyword
-        elsif !simple? && match(ASTERISK) && !next?(SPECIAL)
-          kind = :regular
-        elsif !next?(SPECIAL)
-          kind = nil
-        else
-          @cursor = previous_cursor
-          buffer!
-          return
-        end
-
-        buffer!
+        if !simple? && match(AMPERSAND)
+          { block: parse_subclass(::Code::Parser::Statement) }
+        elsif !simple && match(ASTERISK + ASTERISK)
+          { keyword_splat: parse_subclass(::Code::Parser::Statement) }
+        elsif !simple? && match(ASTERISK)
+          { regular_splat: parse_subclass(::Code::Parser::Statement) }
+        elsif !next?(SPECIAL) && !next?(KEYWORDS)
+          consume while !next?(SPECIAL) && !end_of_input?
 
-        consume while !next?(SPECIAL) && !end_of_input?
+          match(QUESTION_MARK) || match(EXCLAMATION_POINT) if !simple?
 
-        match(QUESTION_MARK) || match(EXCLAMATION_POINT) if !simple?
+          name = buffer!
 
-        name = buffer!
-
-        if KEYWORDS.include?(name)
-          @cursor = previous_cursor
-          buffer!
-          return
+          { name: name }
         else
-          { name: name, kind: kind }.compact
+          return
         end
       end
 

data/lib/code/parser/operation.rb

@@ -11,28 +11,38 @@ class Code
       def parse
         previous_cursor = cursor
         left = parse_subclass(subclass)
-        right = []
-        previous_cursor = cursor
-        comments = parse_comments
-
-        while operator = match(operators)
+        if left
+          right = []
+          previous_cursor = cursor
           comments = parse_comments
-          statement = parse_subclass(subclass)
-          right << {
-            comments: comments,
-            statement: statement,
-            operator: operator
-          }.compact
-        end
 
-        if right.empty?
+          while operator = match(operators)
+            comments = parse_comments
+            statement = parse_subclass(subclass)
+            right << {
+              comments: comments,
+              statement: statement,
+              operator: operator
+            }.compact
+          end
+
+          if right.empty?
+            @cursor = previous_cursor
+            buffer!
+            left
+          else
+            {
+              operation: {
+                left: left,
+                comments: comments,
+                right: right
+              }.compact
+            }
+          end
+        else
           @cursor = previous_cursor
           buffer!
-          left
-        else
-          {
-            operation: { left: left, comments: comments, right: right }.compact
-          }
+          return
         end
       end
 

data/lib/template/parser.rb

@@ -1,6 +1,6 @@
 class Template
   class Parser < ::Code::Parser
-    Version = Gem::Version.new("0.1.1")
+    Version = Gem::Version.new("0.1.2")
 
     def parse
       parts = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dorian Marié
@@ -23,8 +23,8 @@ files:
 - Gemfile.lock
 - bin/code-parser
 - bin/format
+- bin/push
 - bin/template-parser
-- code-ruby-parser-0.1.0.gem
 - code-ruby-parser.gemspec
 - docs/class.code
 - docs/meetup.code
@@ -112,7 +112,6 @@ files:
 - spec/code/parser/while_spec.rb
 - spec/spec_helper.rb
 - spec/template/parser_spec.rb
-- template-ruby-parser-0.1.0.gem
 - template-ruby-parser.gemspec
 homepage: https://github.com/dorianmariefr/template-ruby-parser
 licenses: