delorean_lang 1.0.0 → 1.1.0

data/lib/delorean/delorean.treetop

@@ -46,6 +46,16 @@ grammar Delorean
     getattr_exp
   end
 
+  rule block_args
+		sp4 sp4 sp? i:identifier sp? '=?' sp1? e:expression <BlockParameterDefault>
+		/
+    sp4 sp4 sp? i:identifier sp? '=?' <BlockParameter>
+  end
+  
+  rule block_formulas
+    sp4 sp4 sp? i:identifier sp? '=' sp? e:expression <BlockFormula>
+	end
+
   rule getattr_exp
     v:value dotted:dotted <GetattrExp>
     /
@@ -61,7 +71,11 @@ grammar Delorean
     /
     '(' sp? al:kw_args? sp? ')' <NodeCall>
     /
+    '.' 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 b_args:block_args* expressions:block_formulas+ <BlockExpression>
     /
     '.' sp? i:(identifier / integer) <GetAttr>
   end
@@ -159,6 +173,10 @@ grammar Delorean
     args_rest:(sp? ',' sp? al:kw_args?)? <KwArgs>
   end
 
+  # rule block_args
+    # '|' sp? args:unpack_args sp? '|'
+  # end
+
   rule decimal
     i:integer '.' [0-9]+ <Literal>
   end
@@ -168,7 +186,7 @@ grammar Delorean
   end
 
   rule identifier
-    [a-z] [a-zA-Z0-9_]* <Identifier>
+    [a-z] [a-zA-Z0-9_]* '?'? <Identifier>
   end
 
   rule boolean
@@ -192,10 +210,15 @@ grammar Delorean
     '    '
   end
 
+  rule sp1
+    ' '
+	end
+
   rule sp
     [\s]+
   end
 
+
   rule string
     '"' ('\"' / !'"' .)* '"' <IString>
     /

data/lib/delorean/engine.rb

@@ -252,7 +252,9 @@ module Delorean
       multi_line = nil
       @multi_no = nil
 
-      source.each_line do |line|
+      lines = source.each_line.to_a
+
+      lines.each_with_index do |line, index|
         @line_no += 1
 
         # skip comments
@@ -279,6 +281,24 @@ module Delorean
           end
         end
 
+        # Initially Delorean code is parsed by single line.
+        # If line can not be parsed as valid Delorean expressions, parser
+        # would combine it with the following lines that are indented by more
+        # than 4 spaces and attempt to parse it again.
+
+        # However the first line of method with block can be parsed as a valid
+        # method or attribute call. In order to avoid that, we had to add this
+        # lookahead hack, that treats any expressions as multiline when
+        # the following line is indented by more that 4 spaces.
+        next_line = lines[index + 1] || ''
+
+        if /\A {5}/.match?(next_line)
+          multi_line ||= ''
+          multi_line += line
+          @multi_no ||= @line_no
+          next
+        end
+
         t = parser.parse(line)
 
         if !t

data/lib/delorean/nodes.rb

@@ -123,6 +123,14 @@ eos
 
   class Formula < SNode
     def check(context, *)
+      if i.text_value.include?('?')
+        raise Delorean::ParseError.new(
+          '? in formula names not supported',
+          context.module_name,
+          context.line_no
+        )
+      end
+
       context.parse_define_attr(i.text_value, e.check(context))
     end
 
@@ -410,6 +418,148 @@ eos
     end
   end
 
+  class BlockParameter < Parameter
+    def check(context)
+      context.parse_define_var(i.text_value)
+      context.parse_undef_var(i.text_value)
+    end
+
+    def rewrite(context)
+      a_name = i.text_value
+      expr = defined?(e) ? e.rewrite(context) : ''
+      expr = expr.strip
+
+      return "#{a_name}#{POST}" if expr.empty?
+
+      "#{a_name}#{POST} = #{expr}"
+    end
+
+    def force_def(context)
+      context.parse_define_var(i.text_value)
+    end
+
+    def force_undef(context)
+      context.parse_undef_var(i.text_value)
+    end
+  end
+
+  class BlockParameterDefault < BlockParameter
+    def check(context)
+      context.parse_define_var(i.text_value)
+
+      e.check(context)
+      context.parse_undef_var(i.text_value)
+    end
+  end
+
+  class BlockFormula < SNode
+    def check(context, *)
+      if i.text_value.include?('?')
+        raise Delorean::ParseError.new(
+          '? in formula names not supported',
+          context.module_name,
+          context.line_no
+        )
+      end
+
+      context.parse_define_var(i.text_value)
+      context.parse_undef_var(i.text_value)
+    end
+
+    def rewrite(context)
+      "#{i.text_value}#{POST} = #{e.rewrite(context)}"
+    end
+
+    def force_def(context)
+      context.parse_define_var(i.text_value)
+    end
+
+    def force_undef(context)
+      context.parse_undef_var(i.text_value)
+    end
+  end
+
+  class BlockExpression < SNode
+    def check(context, *)
+      if respond_to?(:al)
+        al.text_value.empty? ? [] : al.check(context)
+      end
+
+      b_args.elements.each do |element|
+        element.check(context)
+        element.force_def(context)
+      end
+
+      formulas = expressions.elements.select do |elem|
+        elem.is_a? BlockFormula
+      end
+
+      result_formula = formulas.find do |formula|
+        formula.i.text_value == 'result'
+      end
+
+      unless result_formula
+        raise Delorean::ParseError.new(
+          'result formula is required in blocks',
+          context.module_name,
+          context.line_no
+        )
+      end
+
+      expressions.elements.each do |element|
+        element.check(context)
+      end
+
+      b_args.elements.each do |element|
+        element.force_undef(context)
+      end
+    end
+
+    def rewrite(context, vcode)
+      if !respond_to?(:al) || 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
+
+      b_args.elements.each do |element|
+        element.force_def(context)
+      end
+
+      block_args_str = if b_args.elements.any?
+                         block_args = b_args.elements.map do |v|
+                           v.rewrite(context)
+                         end
+
+                         "|#{block_args.join(', ')}|"
+                       else
+                         ''
+                       end
+
+      expr_arr = expressions.elements.map do |v|
+        v.rewrite(context)
+      end + ["result#{POST}"]
+
+      expression_str = expr_arr.join('; ')
+
+      b_args.elements.each do |element|
+        element.force_undef(context)
+      end
+
+      block = "{ #{block_args_str} #{expression_str} }"
+
+      "_instance_call(#{vcode}, '#{i.text_value}', [#{args_str}], _e) #{block}"
+    end
+  end
+
   class NodeCall < SNode
     def check(context, *)
       al.text_value.empty? ? [] : al.check(context)

data/lib/delorean/ruby/whitelists/default.rb

@@ -18,44 +18,59 @@ module Delorean
         private
 
         def _add_default_methods
+          add_method :abs do |method|
+            method.called_on Numeric
+          end
+
+          add_method :all? do |method|
+            method.called_on Enumerable
+          end
+
+          add_method :any, match_to: :any?
+
+          add_method :any? do |method|
+            method.called_on Enumerable
+          end
+
           add_method :attributes do |method|
             method.called_on ActiveRecord::Base
             method.called_on ActiveRecord::Relation
           end
 
+          add_method :beginning_of_month do |method|
+            DT_TYPES.each do |type|
+              method.called_on type
+            end
+          end
+
+          add_method :between, match_to: :between?
+
           add_method :between? do |method|
             method.called_on String, with: [String, String]
             method.called_on Numeric, with: [Numeric, Numeric]
           end
 
-          add_method :between, match_to: :between?
+          add_method :ceil do |method|
+            method.called_on Numeric
+          end
 
           add_method :compact do |method|
             method.called_on Array
             method.called_on Hash
           end
 
-          add_method :to_set do |method|
-            method.called_on Array
-          end
-
-          add_method :flatten do |method|
-            method.called_on Array, with: [NUM_OR_NIL]
+          add_method :day do |method|
+            DT_TYPES.each do |type|
+              method.called_on type
+            end
           end
 
-          add_method :length do |method|
+          add_method :downcase do |method|
             method.called_on String
-            method.called_on Enumerable
           end
 
-          add_method :max do |method|
-            method.called_on Array
-          end
-
-          add_method :member, match_to: :member?
-
-          add_method :member? do |method|
-            method.called_on Enumerable, with: [Object]
+          add_method :each_slice do |method|
+            method.called_on Array, with: [Integer]
           end
 
           add_method :empty, match_to: :empty?
@@ -64,134 +79,101 @@ module Delorean
             method.called_on Enumerable
           end
 
-          add_method :except do |method|
-            method.called_on Hash, with: [String] + [[nil, String]] * 9
-          end
-
-          add_method :reverse do |method|
-            method.called_on Array
-          end
-
-          add_method :slice do |method|
-            method.called_on Array, with: [Integer, Integer]
-          end
-
-          add_method :each_slice do |method|
-            method.called_on Array, with: [Integer]
+          add_method :end_of_month do |method|
+            DT_TYPES.each do |type|
+              method.called_on type
+            end
           end
 
-          add_method :sort do |method|
-            method.called_on Array
+          add_method :except do |method|
+            method.called_on Hash, with: [String] + [[nil, String]] * 9
           end
 
-          add_method :split do |method|
-            method.called_on String, with: [String]
+          add_method :fetch do |method|
+            method.called_on Hash, with: [Object, [Object]]
           end
 
-          add_method :uniq do |method|
-            method.called_on Array
+          add_method :find do |method|
+            method.called_on Enumerable
           end
 
-          add_method :sum do |method|
-            method.called_on Array
+          add_method :first do |method|
+            method.called_on ActiveRecord::Relation, with: [NUM_OR_NIL]
+            method.called_on Enumerable, with: [NUM_OR_NIL]
           end
 
-          add_method :transpose do |method|
-            method.called_on Array
+          add_method :flatten do |method|
+            method.called_on Array, with: [NUM_OR_NIL]
           end
 
-          add_method :join do |method|
-            method.called_on Array, with: [String]
+          add_method :floor do |method|
+            method.called_on Numeric
           end
 
-          add_method :zip do |method|
-            method.called_on Array, with: [Array, [Array, nil], [Array, nil]]
+          add_method :hour do |method|
+            DT_TYPES.each do |type|
+              method.called_on type
+            end
           end
 
           add_method :index do |method|
             method.called_on Array, with: [[Object]]
           end
 
-          add_method :product do |method|
-            method.called_on Array, with: [Array]
-          end
-
-          add_method :first do |method|
-            method.called_on ActiveRecord::Relation, with: [NUM_OR_NIL]
-            method.called_on Enumerable, with: [NUM_OR_NIL]
-          end
-
-          add_method :last do |method|
-            method.called_on ActiveRecord::Relation, with: [NUM_OR_NIL]
-            method.called_on Enumerable, with: [NUM_OR_NIL]
-          end
-
           add_method :intersection do |method|
             method.called_on Set, with: [Enumerable]
           end
 
-          add_method :union do |method|
-            method.called_on Set, with: [Enumerable]
+          add_method :iso8601 do |method|
+            DT_TYPES.each do |type|
+              method.called_on type
+            end
           end
 
-          add_method :keys do |method|
-            method.called_on Hash
+          add_method :join do |method|
+            method.called_on Array, with: [String]
           end
 
-          add_method :values do |method|
+          add_method :keys do |method|
             method.called_on Hash
           end
 
-          add_method :fetch do |method|
-            method.called_on Hash, with: [Object, [Object]]
-          end
-
-          add_method :upcase do |method|
-            method.called_on String
+          add_method :last do |method|
+            method.called_on ActiveRecord::Relation, with: [NUM_OR_NIL]
+            method.called_on Enumerable, with: [NUM_OR_NIL]
           end
 
-          add_method :downcase do |method|
+          add_method :length do |method|
             method.called_on String
+            method.called_on Enumerable
           end
 
           add_method :match do |method|
             method.called_on String, with: [[String], NUM_OR_NIL]
           end
 
-          add_method :iso8601 do |method|
-            DT_TYPES.each do |type|
-              method.called_on type
-            end
+          add_method :max do |method|
+            method.called_on Array
           end
 
-          add_method :hour do |method|
-            DT_TYPES.each do |type|
-              method.called_on type
-            end
+          add_method :max_by do |method|
+            method.called_on Enumerable
           end
 
-          add_method :min do |method|
-            (DT_TYPES + [Array]).each do |type|
-              method.called_on type
-            end
-          end
+          add_method :member, match_to: :member?
 
-          add_method :sec do |method|
-            DT_TYPES.each do |type|
-              method.called_on type
-            end
+          add_method :member? do |method|
+            method.called_on Enumerable, with: [Object]
           end
 
-          add_method :to_date do |method|
-            (DT_TYPES + [String]).each do |type|
+          add_method :min do |method|
+            (DT_TYPES + [Array]).each do |type|
               method.called_on type
             end
           end
 
-          add_method :to_time do |method|
-            (DT_TYPES + [String]).each do |type|
-              method.called_on type
-            end
+          add_method :min_by do |method|
+            method.called_on Enumerable
           end
 
           add_method :month do |method|
@@ -200,19 +182,23 @@ module Delorean
             end
           end
 
-          add_method :day do |method|
+          add_method :next_day do |method|
             DT_TYPES.each do |type|
-              method.called_on type
+              method.called_on type, with: [NUM_OR_NIL]
             end
           end
 
-          add_method :year do |method|
+          add_method :next_month do |method|
             DT_TYPES.each do |type|
-              method.called_on type
+              method.called_on type, with: [NUM_OR_NIL]
             end
           end
 
-          add_method :next_month do |method|
+          add_method :none? do |method|
+            method.called_on Enumerable
+          end
+
+          add_method :prev_day do |method|
             DT_TYPES.each do |type|
               method.called_on type, with: [NUM_OR_NIL]
             end
@@ -224,32 +210,64 @@ module Delorean
             end
           end
 
-          add_method :beginning_of_month do |method|
-            DT_TYPES.each do |type|
-              method.called_on type
-            end
+          add_method :product do |method|
+            method.called_on Array, with: [Array]
           end
 
-          add_method :end_of_month do |method|
+          add_method :reduce do |method|
+            method.called_on Enumerable, with: [[nil, Object]]
+          end
+
+          add_method :reject do |method|
+            method.called_on Enumerable
+          end
+
+          add_method :reverse do |method|
+            method.called_on Array
+          end
+
+          add_method :round do |method|
+            method.called_on Numeric, with: [[nil, Integer]]
+          end
+
+          add_method :sec do |method|
             DT_TYPES.each do |type|
               method.called_on type
             end
           end
 
-          add_method :next_day do |method|
-            DT_TYPES.each do |type|
-              method.called_on type, with: [NUM_OR_NIL]
-            end
+          add_method :select do |method|
+            method.called_on Enumerable
           end
 
-          add_method :prev_day do |method|
-            DT_TYPES.each do |type|
-              method.called_on type, with: [NUM_OR_NIL]
+          add_method :slice do |method|
+            method.called_on Array, with: [Integer, Integer]
+          end
+
+          add_method :sort do |method|
+            method.called_on Array
+          end
+
+          add_method :split do |method|
+            method.called_on String, with: [String]
+          end
+
+          add_method :sum do |method|
+            method.called_on Array
+          end
+
+          add_method :to_a do |method|
+            method.called_on Object
+          end
+
+          add_method :to_d do |method|
+            NUM_OR_STR.each do |type|
+              method.called_on type
             end
           end
 
-          add_method :to_i do |method|
-            (NUM_OR_STR + TI_TYPES).each do |type|
+          add_method :to_date do |method|
+            (DT_TYPES + [String]).each do |type|
               method.called_on type
             end
           end
@@ -260,42 +278,62 @@ module Delorean
             end
           end
 
-          add_method :to_d do |method|
-            NUM_OR_STR.each do |type|
+          add_method :to_i do |method|
+            (NUM_OR_STR + TI_TYPES).each do |type|
               method.called_on type
             end
           end
 
-          add_method :to_s do |method|
+          add_method :to_json do |method|
             method.called_on Object
           end
 
-          add_method :to_a do |method|
+          add_method :to_s do |method|
             method.called_on Object
           end
 
-          add_method :to_json do |method|
-            method.called_on Object
+          add_method :to_set do |method|
+            method.called_on Array
           end
 
-          add_method :abs do |method|
-            method.called_on Numeric
+          add_method :to_time do |method|
+            (DT_TYPES + [String]).each do |type|
+              method.called_on type
+            end
           end
 
-          add_method :round do |method|
+          add_method :transpose do |method|
+            method.called_on Array
+          end
+
+          add_method :truncate do |method|
             method.called_on Numeric, with: [[nil, Integer]]
           end
 
-          add_method :ceil do |method|
-            method.called_on Numeric
+          add_method :union do |method|
+            method.called_on Set, with: [Enumerable]
           end
 
-          add_method :floor do |method|
-            method.called_on Numeric
+          add_method :uniq do |method|
+            method.called_on Enumerable
           end
 
-          add_method :truncate do |method|
-            method.called_on Numeric, with: [[nil, Integer]]
+          add_method :upcase do |method|
+            method.called_on String
+          end
+
+          add_method :values do |method|
+            method.called_on Hash
+          end
+
+          add_method :year do |method|
+            DT_TYPES.each do |type|
+              method.called_on type
+            end
+          end
+
+          add_method :zip do |method|
+            method.called_on Array, with: [Array, [Array, nil], [Array, nil]]
           end
         end
       end