delorean_lang 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aefcc15664badb32e23cd629f7888a3984cf3fd0c01a351b652a71094c5ff3fc
-  data.tar.gz: b3391aa0c8a00c49487ba6039838e9fd1e98f172539e06bbbb810b8c9e8cc737
+  metadata.gz: 84e137368e1c85b7005b7662f33e54e7cf6c7f1b0eb7fd2e3ebc8d9ebfbd8a04
+  data.tar.gz: 1b2039558b54352be0a030a2992aa50fc99c498fe3c1a96c84e36f9b4febb194
 SHA512:
-  metadata.gz: beea3a643c91eaa8374ce126d0e07836545b7e141174ec38a05030b0b45b087fc48ba2ad880ce65a101125de9889c9ff67cfe786e752b0ebfff6127dbbc56633
-  data.tar.gz: f3562421c5d037bf42da11f215b5f2c6d78c5c9987db1c0e1efdecaeb8c33c7f9ad38ad2b63db9b2d137b7179552b47ef99f0eb88d031d1ea98fb1fb9409f0c3
+  metadata.gz: 641d20f5de1251faaae77f7e571e6c2d43de03cc314d450b1c6246e00074c4fcb6a59506615d67968cc73b627901eedb7b3ee6375353b4a59e488ff43e4d06b7
+  data.tar.gz: 85afcad55380bb346f84fae8aa7e8b29601e28fe6a55e1f04d1bd9b968c064d40ab7235e2c19cf9791b3c7dc6b33d9339428e1809e9f51d5e81f1f7fea5cde9a

data/lib/delorean/base.rb

@@ -83,6 +83,12 @@ module Delorean
     end
 
     class BaseClass
+      def self._safe_navigation_get_attr(obj, attr, _e)
+        return nil if obj.nil?
+
+        _get_attr(obj, attr, _e)
+      end
+
       def self._get_attr(obj, attr, _e)
         # REALLY FIXME: this really needs to be another "when" in the
         # case statement below. However, Gemini appears to create Hash
@@ -195,6 +201,11 @@ module Delorean
       end
 
       ######################################################################
+      def self._safe_navigation_instance_call(obj, method, args, _e, &block)
+        return nil if obj.nil?
+
+        _instance_call(obj, method, args, _e, &block)
+      end
 
       def self._instance_call(obj, method, args, _e, &block)
         begin

data/lib/delorean/cache/adapters.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'delorean/cache/adapters/ruby_cache'
+require 'delorean/cache/adapters/no_cache'
 
 module Delorean
   module Cache

data/lib/delorean/cache/adapters/no_cache.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative './base'
+
+module Delorean
+  module Cache
+    module Adapters
+      class NoCache < ::Delorean::Cache::Adapters::Base
+        attr_reader :lookup_cache, :size_per_class
+
+        def initialize(size_per_class: 1000); end
+
+        def cache_item?(klass:, method_name:, args:)
+          false
+        end
+
+        def cache_item(klass:, cache_key:, item:); end
+
+        def fetch_item(klass:, cache_key:, default: nil)
+          default
+        end
+
+        def cache_key(klass:, method_name:, args:)
+          :no_cache_key
+        end
+
+        def clear!(klass:); end
+
+        def clear_all!; end
+
+        private
+
+        def clear_outdated_items(klass:); end
+      end
+    end
+  end
+end

data/lib/delorean/delorean.rb

@@ -1764,6 +1764,17 @@ module Delorean
       elements[2]
     end
 
+    def al
+      elements[5]
+    end
+
+  end
+
+  module DotExp5
+    def i
+      elements[2]
+    end
+
     def b_args
       elements[3]
     end
@@ -1773,7 +1784,13 @@ module Delorean
     end
   end
 
-  module DotExp5
+  module DotExp6
+    def i
+      elements[2]
+    end
+  end
+
+  module DotExp7
     def i
       elements[2]
     end
@@ -2092,11 +2109,11 @@ module Delorean
             r0 = r35
           else
             i48, s48 = index, []
-            if (match_len = has_terminal?('.', false, index))
-              r49 = true
+            if (match_len = has_terminal?('&.', false, index))
+              r49 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('\'.\'')
+              terminal_parse_failure('\'&.\'')
               r49 = nil
             end
             s48 << r49
@@ -2112,40 +2129,56 @@ module Delorean
                 r52 = _nt_identifier
                 s48 << r52
                 if r52
-                  s53, i53 = [], index
-                  loop do
-                    r54 = _nt_block_args
-                    if r54
-                      s53 << r54
-                    else
-                      break
-                    end
+                  if (match_len = has_terminal?('(', false, index))
+                    r53 = true
+                    @index += match_len
+                  else
+                    terminal_parse_failure('\'(\'')
+                    r53 = nil
                   end
-                  r53 = instantiate_node(SyntaxNode,input, i53...index, s53)
                   s48 << r53
                   if r53
-                    s55, i55 = [], index
-                    loop do
-                      r56 = _nt_block_formulas
-                      if r56
-                        s55 << r56
+                    r55 = _nt_sp
+                    if r55
+                      r54 = r55
+                    else
+                      r54 = instantiate_node(SyntaxNode,input, index...index)
+                    end
+                    s48 << r54
+                    if r54
+                      r57 = _nt_fn_args
+                      if r57
+                        r56 = r57
                       else
-                        break
+                        r56 = instantiate_node(SyntaxNode,input, index...index)
+                      end
+                      s48 << r56
+                      if r56
+                        r59 = _nt_sp
+                        if r59
+                          r58 = r59
+                        else
+                          r58 = instantiate_node(SyntaxNode,input, index...index)
+                        end
+                        s48 << r58
+                        if r58
+                          if (match_len = has_terminal?(')', false, index))
+                            r60 = true
+                            @index += match_len
+                          else
+                            terminal_parse_failure('\')\'')
+                            r60 = nil
+                          end
+                          s48 << r60
+                        end
                       end
                     end
-                    if s55.empty?
-                      @index = i55
-                      r55 = nil
-                    else
-                      r55 = instantiate_node(SyntaxNode,input, i55...index, s55)
-                    end
-                    s48 << r55
                   end
                 end
               end
             end
             if s48.last
-              r48 = instantiate_node(BlockExpression,input, i48...index, s48)
+              r48 = instantiate_node(SafeNavigationCall,input, i48...index, s48)
               r48.extend(DotExp4)
             else
               @index = i48
@@ -2155,55 +2188,168 @@ module Delorean
               r48 = SyntaxNode.new(input, (index-1)...index) if r48 == true
               r0 = r48
             else
-              i57, s57 = index, []
+              i61, s61 = index, []
               if (match_len = has_terminal?('.', false, index))
-                r58 = true
+                r62 = true
                 @index += match_len
               else
                 terminal_parse_failure('\'.\'')
-                r58 = nil
+                r62 = nil
               end
-              s57 << r58
-              if r58
-                r60 = _nt_sp
-                if r60
-                  r59 = r60
+              s61 << r62
+              if r62
+                r64 = _nt_sp
+                if r64
+                  r63 = r64
                 else
-                  r59 = instantiate_node(SyntaxNode,input, index...index)
+                  r63 = instantiate_node(SyntaxNode,input, index...index)
                 end
-                s57 << r59
-                if r59
-                  i61 = index
-                  r62 = _nt_identifier
-                  if r62
-                    r62 = SyntaxNode.new(input, (index-1)...index) if r62 == true
-                    r61 = r62
-                  else
-                    r63 = _nt_integer
-                    if r63
-                      r63 = SyntaxNode.new(input, (index-1)...index) if r63 == true
-                      r61 = r63
-                    else
-                      @index = i61
-                      r61 = nil
+                s61 << r63
+                if r63
+                  r65 = _nt_identifier
+                  s61 << r65
+                  if r65
+                    s66, i66 = [], index
+                    loop do
+                      r67 = _nt_block_args
+                      if r67
+                        s66 << r67
+                      else
+                        break
+                      end
+                    end
+                    r66 = instantiate_node(SyntaxNode,input, i66...index, s66)
+                    s61 << r66
+                    if r66
+                      s68, i68 = [], index
+                      loop do
+                        r69 = _nt_block_formulas
+                        if r69
+                          s68 << r69
+                        else
+                          break
+                        end
+                      end
+                      if s68.empty?
+                        @index = i68
+                        r68 = nil
+                      else
+                        r68 = instantiate_node(SyntaxNode,input, i68...index, s68)
+                      end
+                      s61 << r68
                     end
                   end
-                  s57 << r61
                 end
               end
-              if s57.last
-                r57 = instantiate_node(GetAttr,input, i57...index, s57)
-                r57.extend(DotExp5)
+              if s61.last
+                r61 = instantiate_node(BlockExpression,input, i61...index, s61)
+                r61.extend(DotExp5)
               else
-                @index = i57
-                r57 = nil
+                @index = i61
+                r61 = nil
               end
-              if r57
-                r57 = SyntaxNode.new(input, (index-1)...index) if r57 == true
-                r0 = r57
+              if r61
+                r61 = SyntaxNode.new(input, (index-1)...index) if r61 == true
+                r0 = r61
               else
-                @index = i0
-                r0 = nil
+                i70, s70 = index, []
+                if (match_len = has_terminal?('.', false, index))
+                  r71 = true
+                  @index += match_len
+                else
+                  terminal_parse_failure('\'.\'')
+                  r71 = nil
+                end
+                s70 << r71
+                if r71
+                  r73 = _nt_sp
+                  if r73
+                    r72 = r73
+                  else
+                    r72 = instantiate_node(SyntaxNode,input, index...index)
+                  end
+                  s70 << r72
+                  if r72
+                    i74 = index
+                    r75 = _nt_identifier
+                    if r75
+                      r75 = SyntaxNode.new(input, (index-1)...index) if r75 == true
+                      r74 = r75
+                    else
+                      r76 = _nt_integer
+                      if r76
+                        r76 = SyntaxNode.new(input, (index-1)...index) if r76 == true
+                        r74 = r76
+                      else
+                        @index = i74
+                        r74 = nil
+                      end
+                    end
+                    s70 << r74
+                  end
+                end
+                if s70.last
+                  r70 = instantiate_node(GetAttr,input, i70...index, s70)
+                  r70.extend(DotExp6)
+                else
+                  @index = i70
+                  r70 = nil
+                end
+                if r70
+                  r70 = SyntaxNode.new(input, (index-1)...index) if r70 == true
+                  r0 = r70
+                else
+                  i77, s77 = index, []
+                  if (match_len = has_terminal?('&.', false, index))
+                    r78 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                    @index += match_len
+                  else
+                    terminal_parse_failure('\'&.\'')
+                    r78 = nil
+                  end
+                  s77 << r78
+                  if r78
+                    r80 = _nt_sp
+                    if r80
+                      r79 = r80
+                    else
+                      r79 = instantiate_node(SyntaxNode,input, index...index)
+                    end
+                    s77 << r79
+                    if r79
+                      i81 = index
+                      r82 = _nt_identifier
+                      if r82
+                        r82 = SyntaxNode.new(input, (index-1)...index) if r82 == true
+                        r81 = r82
+                      else
+                        r83 = _nt_integer
+                        if r83
+                          r83 = SyntaxNode.new(input, (index-1)...index) if r83 == true
+                          r81 = r83
+                        else
+                          @index = i81
+                          r81 = nil
+                        end
+                      end
+                      s77 << r81
+                    end
+                  end
+                  if s77.last
+                    r77 = instantiate_node(SafeNavigationGetAttr,input, i77...index, s77)
+                    r77.extend(DotExp7)
+                  else
+                    @index = i77
+                    r77 = nil
+                  end
+                  if r77
+                    r77 = SyntaxNode.new(input, (index-1)...index) if r77 == true
+                    r0 = r77
+                  else
+                    @index = i0
+                    r0 = nil
+                  end
+                end
               end
             end
           end

data/lib/delorean/delorean.treetop

@@ -83,10 +83,14 @@ grammar Delorean
     '.' sp? i:identifier '(' sp? al:fn_args? sp? ')' b_args:block_args* expressions:block_formulas+ <BlockExpression>
     /
     '.' sp? i:identifier '(' sp? al:fn_args? sp? ')' <Call>
+    /
+    '&.' sp? i:identifier '(' sp? al:fn_args? sp? ')' <SafeNavigationCall>
 		/
     '.' sp? i:identifier b_args:block_args* expressions:block_formulas+ <BlockExpression>
     /
     '.' sp? i:(identifier / integer) <GetAttr>
+    /
+    '&.' sp? i:(identifier / integer) <SafeNavigationGetAttr>
   end
 
   rule unpack_args

data/lib/delorean/functions.rb

@@ -45,6 +45,7 @@ module Delorean
         cache_key = delorean_cache_adapter.cache_key(
           klass: self, method_name: name, args: args
         )
+
         cached_item = delorean_cache_adapter.fetch_item(
           klass: self, cache_key: cache_key, default: :NF
         )

data/lib/delorean/nodes.rb

@@ -395,6 +395,14 @@ eos
     end
   end
 
+  class SafeNavigationGetAttr < GetAttr
+    def rewrite(_context, vcode)
+      attr = i.text_value
+      attr = "'#{attr}'" unless /\A[0-9]+\z/.match?(attr)
+      "_safe_navigation_get_attr(#{vcode}, #{attr}, _e)"
+    end
+  end
+
   class Call < SNode
     def check(context, *)
       al.text_value.empty? ? [] : al.check(context)
@@ -420,6 +428,29 @@ eos
     end
   end
 
+  class SafeNavigationCall < Call
+    def rewrite(context, vcode)
+      if al.text_value.empty?
+        args_str = ''
+        arg_count = 0
+      else
+        args_str = al.rewrite(context)
+        arg_count = al.arg_count
+      end
+
+      if vcode.is_a?(ClassText)
+        # FIXME: Do we really need this check here?
+        # ruby class call
+        class_name = vcode.text
+        context.parse_check_call_fn(i.text_value, arg_count, class_name)
+      end
+
+      "_safe_navigation_instance_call(
+        #{vcode}, '#{i.text_value}', [#{args_str}], _e
+      )"
+    end
+  end
+
   class BlockParameter < Parameter
     def check(context)
       context.parse_define_var(i.text_value)

data/lib/delorean/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delorean
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/spec/cache_spec.rb

@@ -3,6 +3,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe 'Delorean cache' do
+  after do
+    ::Delorean::Cache.adapter = ::Delorean::Cache::Adapters::RubyCache.new
+  end
+
   before do
     Dummy.clear_lookup_cache!
   end
@@ -64,4 +68,19 @@ describe 'Delorean cache' do
     expect(item_10).to be_a(OpenStruct)
     expect(item_10['10']).to eq(10)
   end
+
+  describe 'No cache adapter' do
+    before do
+      ::Delorean::Cache.adapter = ::Delorean::Cache::Adapters::NoCache.new
+    end
+
+    it "doesn't use cache" do
+      expect(OpenStruct).to receive(:new).twice.and_call_original
+
+      res1 = Dummy.returns_cached_openstruct(1, 2)
+      res2 = Dummy.returns_cached_openstruct(1, 2)
+
+      expect(res1).to eq res2
+    end
+  end
 end

data/spec/eval_spec.rb

@@ -1588,6 +1588,29 @@ eof
       expect(r).to eq([[], 1])
     end
 
+    it 'works with safe navigation' do
+      engine.parse defn(*default_node,
+                        '    b = [1]',
+                        '    c = b[1]    ',
+                        '    d = c&.round(1)     ',
+                        '    e = c&.round     ',
+                        '    f = c&.round(1)&.round(2)&.round(3)     ',
+                        '    g = c&.round&.round&.round     ',
+                       )
+
+      r = engine.evaluate('A', 'd')
+      expect(r).to eq(nil)
+
+      r = engine.evaluate('A', 'e')
+      expect(r).to eq(nil)
+
+      r = engine.evaluate('A', 'f')
+      expect(r).to eq(nil)
+
+      r = engine.evaluate('A', 'g')
+      expect(r).to eq(nil)
+    end
+
     describe 'methods' do
       it 'all?' do
         engine.parse defn(*default_node,

data/spec/perf_spec.rb

@@ -190,7 +190,7 @@ describe 'Delorean' do
     cache_factor = h['delorean_node_cache'] / h['delorean']
     # p cache_factor
 
-    expected_cache_factor = ENV['COVERAGE'] ? 64 : 80
+    expected_cache_factor = ENV['COVERAGE'] ? 60 : 80
     expect(cache_factor).to be > expected_cache_factor
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -145,6 +145,7 @@ files:
 - lib/delorean/cache.rb
 - lib/delorean/cache/adapters.rb
 - lib/delorean/cache/adapters/base.rb
+- lib/delorean/cache/adapters/no_cache.rb
 - lib/delorean/cache/adapters/ruby_cache.rb
 - lib/delorean/const.rb
 - lib/delorean/debug.rb