delorean_lang 0.3.2 → 0.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDc1Y2Y0NzUxOGNkMzlmNmE2Y2M5OGM3YjBiOGNiNjBjZTM5OTY1Ng==
+    YWFmZDRkMDU1OTkwMWE1NjVmN2NjYTQ2Yzg3MDZiYjQwMTFkYTM2OQ==
   data.tar.gz: !binary |-
-    ZDgxMGNiOTM4NDhhM2Q3NDM0ZWQ4NjU3NDIzMDc4NzNlNDE4YzUxZg==
+    NTY5YmVjNmY3NDgwNDUzOTU0NjIxODhlZmJhZTdmNzVmN2FiNDMyMQ==
 SHA512:
   metadata.gz: !binary |-
-    MjM0ODI5NmY0NmU4MGE1YWQ5ZmVlMDFkNThmYzdiNGQxNjJmZmE3OGZiNzNl
-    NmRlYzQwZTcyZjNmOThlNTExNDNmZmRiZmQ1MTMyNWFlODMzOTk2NjQzYWNi
-    ZDNjNmNlYzlmNzk5ZTU0Nzk4Y2Q5YzYwNmEzOWFlOWQyYWI0ODk=
+    YmVjYWJlMmRmYzFjNTZkOThjYTg4YzM1MzMxODFmNThjNTNkOWZmNTllNTEy
+    MDJmNWUyZjY5ZjQxZWRlNmJkZmQyZDU4MDI2OTZkMzExMDFkYmMyOTY0MmQ2
+    Mzc5ZTQyZjdlODM0OWU0OWE3ZTkyMjQyZWQ5NzgwMTBjYmEzNmE=
   data.tar.gz: !binary |-
-    NGQwM2M5YWU2MTAwNTlhNGE0ZmU4YjI4NmU5OWE4OTkwNjk0MGRlYTVhZGUz
-    ZDQ3ZTFlNjQ1OTU1MWExZDM0YjI0ZDRiZmMzMzFmNzkwNGM1YThhMjg2MmEz
-    NjZjMjAxZmM1ZmIwNjBjMjY0ZDAyMTc5NTk3ZGFlMzE0MzZlZmU=
+    YmIzN2IxNGU0OTQ2MGVmYzVjMTUzZWJiMjRjM2VhYmQyNGNiNmEzNDk5YzNm
+    NmI2ZDU1M2JlZmY2YmM4ZDllOTIzNzZhNGNmM2FlOTNiNTBmODk4OTQyY2Y1
+    ODBlZDJmYWNkOGFkNWYwM2U2ZjQ2MjdhODNhNGIzNTU4ZmFiYzE=

data/lib/delorean/base.rb

@@ -7,62 +7,65 @@ module Delorean
   # hash.  The whole whitelist mechanism should be eventually
   # rethought.
   RUBY_WHITELIST = {
-    compact:    [Array],
-    flatten:    [Array, [Fixnum, nil]],
-    length:     [[Array, String]],
-    max:        [Array],
-    member:     "member?",
-    member?:    [Array, [Fixnum, String]],
-    reverse:    [Array],
-    slice:      [Array, Fixnum, Fixnum],
-    sort:       [Array],
-    split:      [String, String],
-    uniq:       [Array],
-    sum:        [Array],
-    zip:        [Array, [Array, Array, Array]],
-    index:      [Array, [Integer, Numeric, String, Array, Fixnum]],
-    product:    [Array, Array],
-    first:      [Enumerable, [nil, Fixnum]],
-
-    keys:       [Hash],
-    values:     [Hash],
-    upcase:     [String],
-    downcase:   [String],
-    match:      [String, [String], [nil, Fixnum]],
-
-    hour:       [[Date, Time, ActiveSupport::TimeWithZone]],
-    min:        [[Date, Time, ActiveSupport::TimeWithZone, Array]],
-    sec:        [[Date, Time, ActiveSupport::TimeWithZone]],
-    to_date:    [[Date, Time, ActiveSupport::TimeWithZone]],
-
-    month:      [[Date, Time, ActiveSupport::TimeWithZone]],
-    day:        [[Date, Time, ActiveSupport::TimeWithZone]],
-    year:       [[Date, Time, ActiveSupport::TimeWithZone]],
-
-    next_month: [[Date, Time, ActiveSupport::TimeWithZone],
-                 [nil, Fixnum],
-                ],
-    prev_month: [[Date, Time, ActiveSupport::TimeWithZone],
-                 [nil, Fixnum],
-                ],
+    compact:            [Array],
+    to_set:             [Array],
+    flatten:            [Array, [Fixnum, nil]],
+    length:             [[Array, String]],
+    max:                [Array],
+    member:             "member?",
+    member?:            [Array, [Fixnum, String]],
+    reverse:            [Array],
+    slice:              [Array, Fixnum, Fixnum],
+    sort:               [Array],
+    split:              [String, String],
+    uniq:               [Array],
+    sum:                [Array],
+    zip:                [Array, [Array, Array, Array]],
+    index:              [Array, [Integer, Numeric, String, Array, Fixnum]],
+    product:            [Array, Array],
+    first:              [Enumerable, [nil, Fixnum]],
+    intersection:       [Set, Enumerable],
+    union:              [Set, Enumerable],
+
+    keys:               [Hash],
+    values:             [Hash],
+    upcase:             [String],
+    downcase:           [String],
+    match:              [String, [String], [nil, Fixnum]],
+
+    hour:               [[Date, Time, ActiveSupport::TimeWithZone]],
+    min:                [[Date, Time, ActiveSupport::TimeWithZone, Array]],
+    sec:                [[Date, Time, ActiveSupport::TimeWithZone]],
+    to_date:            [[Date, Time, ActiveSupport::TimeWithZone]],
+
+    month:              [[Date, Time, ActiveSupport::TimeWithZone]],
+    day:                [[Date, Time, ActiveSupport::TimeWithZone]],
+    year:               [[Date, Time, ActiveSupport::TimeWithZone]],
+
+    next_month:         [[Date, Time, ActiveSupport::TimeWithZone],
+                         [nil, Fixnum],
+                        ],
+    prev_month:         [[Date, Time, ActiveSupport::TimeWithZone],
+                         [nil, Fixnum],
+                        ],
 
     beginning_of_month: [[Date, Time, ActiveSupport::TimeWithZone]],
 
     end_of_month:       [[Date, Time, ActiveSupport::TimeWithZone]],
 
-    next_day:   [[Date, Time, ActiveSupport::TimeWithZone],
-                 [nil, Fixnum],
-                ],
-    prev_day:   [[Date, Time, ActiveSupport::TimeWithZone],
-                 [nil, Fixnum],
-                ],
-
-    to_i:       [[Numeric, String]],
-    to_f:       [[Numeric, String]],
-    to_d:       [[Numeric, String]],
-    to_s:       [Object],
-    abs:        [Numeric],
-    round:      [Numeric, [nil, Integer]],
+    next_day:           [[Date, Time, ActiveSupport::TimeWithZone],
+                         [nil, Fixnum],
+                        ],
+    prev_day:           [[Date, Time, ActiveSupport::TimeWithZone],
+                         [nil, Fixnum],
+                        ],
+
+    to_i:               [[Numeric, String]],
+    to_f:               [[Numeric, String]],
+    to_d:               [[Numeric, String]],
+    to_s:               [Object],
+    abs:                [Numeric],
+    round:              [Numeric, [nil, Integer]],
   }
 
   module BaseModule
@@ -110,14 +113,6 @@ module Delorean
 
           return obj.send(attr.to_sym) if
             klass.reflect_on_all_associations.map(&:name).member? attr.to_sym
-
-          # FIXME: should call _instance_call for other types as well.
-          # Too lazy to implement this now.
-          begin
-            return _instance_call(obj, attr, [])
-          rescue
-            raise InvalidGetAttribute, "ActiveRecord lookup '#{attr}' on #{obj}"
-          end
         elsif obj.instance_of?(NodeCall)
           return obj.evaluate(attr)
         elsif obj.instance_of?(Hash)
@@ -126,8 +121,13 @@ module Delorean
         elsif obj.instance_of?(Class) && (obj < BaseClass)
           return obj.send((attr + POST).to_sym, _e)
         end
-        raise InvalidGetAttribute,
-        "bad attribute lookup '#{attr}' on <#{obj.class}> #{obj}"
+
+        begin
+          return _instance_call(obj, attr, [], _e)
+        rescue
+          raise InvalidGetAttribute,
+          "bad attribute lookup '#{attr}' on <#{obj.class}> #{obj}"
+        end
       end
 
       ######################################################################
@@ -156,7 +156,7 @@ module Delorean
       def self._sanitize_hash(_e)
         _e.each_with_object({}) do
           |(k,v), h|
-          h[k] = v if k =~ /\A[a-z][A-Za-z0-9_]*\z/
+          h[k] = v if k.is_a?(Integer) || k =~ /\A[a-z][A-Za-z0-9_]*\z/
         end
       end
 
@@ -182,19 +182,26 @@ module Delorean
 
       ######################################################################
 
-      def self._instance_call(obj, method, args)
+      def self._instance_call(obj, method, args, _e)
         begin
           msg = method.to_sym
         rescue NoMethodError
           raise "bad method #{method}"
         end
 
+        # FIXME: this is pretty hacky -- should probably merge
+        # RUBY_WHITELIST and SIG mechanisms.
+        if obj.is_a?(Class)
+          _e[:_engine].parse_check_call_fn(method, args.count, obj)
+          return obj.send(msg, *args)
+        end
+
         sig = RUBY_WHITELIST[msg]
 
         raise "no such method #{method}" unless sig
 
         # if sig is a string, then method mapped to another name
-        return _instance_call(obj, sig, args) if sig.is_a? String
+        return _instance_call(obj, sig, args, _e) if sig.is_a? String
 
         raise "too many args to #{method}" if args.length>(sig.length-1)
 

data/lib/delorean/delorean.rb

@@ -1133,7 +1133,19 @@ module Delorean
             end
             s31 << r33
             if r33
-              r35 = _nt_identifier
+              i35 = index
+              r36 = _nt_identifier
+              if r36
+                r35 = r36
+              else
+                r37 = _nt_integer
+                if r37
+                  r35 = r37
+                else
+                  @index = i35
+                  r35 = nil
+                end
+              end
               s31 << r35
             end
           end
@@ -2288,136 +2300,141 @@ module Delorean
     end
 
     i0 = index
-    r1 = _nt_number
+    r1 = _nt_decimal
     if r1
       r0 = r1
     else
-      r2 = _nt_string
+      r2 = _nt_integer
       if r2
         r0 = r2
       else
-        r3 = _nt_boolean
+        r3 = _nt_string
         if r3
           r0 = r3
         else
-          r4 = _nt_nil_val
+          r4 = _nt_boolean
           if r4
             r0 = r4
           else
-            r5 = _nt_identifier
+            r5 = _nt_nil_val
             if r5
               r0 = r5
             else
-              r6 = _nt_self
+              r6 = _nt_identifier
               if r6
                 r0 = r6
               else
-                r7 = _nt_list_expr
+                r7 = _nt_self
                 if r7
                   r0 = r7
                 else
-                  r8 = _nt_set_expr
+                  r8 = _nt_list_expr
                   if r8
                     r0 = r8
                   else
-                    r9 = _nt_hash_expr
+                    r9 = _nt_set_expr
                     if r9
                       r0 = r9
                     else
-                      i10, s10 = index, []
-                      i12, s12 = index, []
-                      r13 = _nt_class_name
-                      s12 << r13
-                      if r13
-                        if has_terminal?('::', false, index)
-                          r14 = instantiate_node(SyntaxNode,input, index...(index + 2))
-                          @index += 2
-                        else
-                          terminal_parse_failure('::')
-                          r14 = nil
-                        end
-                        s12 << r14
-                      end
-                      if s12.last
-                        r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
-                        r12.extend(Value0)
-                      else
-                        @index = i12
-                        r12 = nil
-                      end
-                      if r12
-                        r11 = r12
-                      else
-                        r11 = instantiate_node(SyntaxNode,input, index...index)
-                      end
-                      s10 << r11
-                      if r11
-                        r15 = _nt_class_name
-                        s10 << r15
-                      end
-                      if s10.last
-                        r10 = instantiate_node(NodeAsValue,input, i10...index, s10)
-                        r10.extend(Value1)
-                      else
-                        @index = i10
-                        r10 = nil
-                      end
+                      r10 = _nt_hash_expr
                       if r10
                         r0 = r10
                       else
-                        i16, s16 = index, []
-                        if has_terminal?('(', false, index)
-                          r17 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                          @index += 1
+                        i11, s11 = index, []
+                        i13, s13 = index, []
+                        r14 = _nt_class_name
+                        s13 << r14
+                        if r14
+                          if has_terminal?('::', false, index)
+                            r15 = instantiate_node(SyntaxNode,input, index...(index + 2))
+                            @index += 2
+                          else
+                            terminal_parse_failure('::')
+                            r15 = nil
+                          end
+                          s13 << r15
+                        end
+                        if s13.last
+                          r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
+                          r13.extend(Value0)
+                        else
+                          @index = i13
+                          r13 = nil
+                        end
+                        if r13
+                          r12 = r13
+                        else
+                          r12 = instantiate_node(SyntaxNode,input, index...index)
+                        end
+                        s11 << r12
+                        if r12
+                          r16 = _nt_class_name
+                          s11 << r16
+                        end
+                        if s11.last
+                          r11 = instantiate_node(NodeAsValue,input, i11...index, s11)
+                          r11.extend(Value1)
                         else
-                          terminal_parse_failure('(')
-                          r17 = nil
+                          @index = i11
+                          r11 = nil
                         end
-                        s16 << r17
-                        if r17
-                          r19 = _nt_sp
-                          if r19
-                            r18 = r19
+                        if r11
+                          r0 = r11
+                        else
+                          i17, s17 = index, []
+                          if has_terminal?('(', false, index)
+                            r18 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                            @index += 1
                           else
-                            r18 = instantiate_node(SyntaxNode,input, index...index)
+                            terminal_parse_failure('(')
+                            r18 = nil
                           end
-                          s16 << r18
+                          s17 << r18
                           if r18
-                            r20 = _nt_expression
-                            s16 << r20
+                            r20 = _nt_sp
                             if r20
-                              r22 = _nt_sp
-                              if r22
-                                r21 = r22
-                              else
-                                r21 = instantiate_node(SyntaxNode,input, index...index)
-                              end
-                              s16 << r21
+                              r19 = r20
+                            else
+                              r19 = instantiate_node(SyntaxNode,input, index...index)
+                            end
+                            s17 << r19
+                            if r19
+                              r21 = _nt_expression
+                              s17 << r21
                               if r21
-                                if has_terminal?(')', false, index)
-                                  r23 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                                  @index += 1
+                                r23 = _nt_sp
+                                if r23
+                                  r22 = r23
                                 else
-                                  terminal_parse_failure(')')
-                                  r23 = nil
+                                  r22 = instantiate_node(SyntaxNode,input, index...index)
+                                end
+                                s17 << r22
+                                if r22
+                                  if has_terminal?(')', false, index)
+                                    r24 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                                    @index += 1
+                                  else
+                                    terminal_parse_failure(')')
+                                    r24 = nil
+                                  end
+                                  s17 << r24
                                 end
-                                s16 << r23
                               end
                             end
                           end
-                        end
-                        if s16.last
-                          r16 = instantiate_node(Expr,input, i16...index, s16)
-                          r16.extend(Value2)
-                        else
-                          @index = i16
-                          r16 = nil
-                        end
-                        if r16
-                          r0 = r16
-                        else
-                          @index = i0
-                          r0 = nil
+                          if s17.last
+                            r17 = instantiate_node(Expr,input, i17...index, s17)
+                            r17.extend(Value2)
+                          else
+                            @index = i17
+                            r17 = nil
+                          end
+                          if r17
+                            r0 = r17
+                          else
+                            @index = i0
+                            r0 = nil
+                          end
                         end
                       end
                     end
@@ -2810,37 +2827,11 @@ module Delorean
     r0
   end
 
-  def _nt_number
-    start_index = index
-    if node_cache[:number].has_key?(index)
-      cached = node_cache[:number][index]
-      if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0 = index
-    r1 = _nt_decimal
-    if r1
-      r0 = r1
-    else
-      r2 = _nt_integer
-      if r2
-        r0 = r2
-      else
-        @index = i0
-        r0 = nil
-      end
+  module Decimal0
+    def i
+      elements[0]
     end
 
-    node_cache[:number][start_index] = r0
-
-    r0
-  end
-
-  module Decimal0
   end
 
   def _nt_decimal
@@ -2855,58 +2846,39 @@ module Delorean
     end
 
     i0, s0 = index, []
-    s1, i1 = [], index
-    loop do
-      if has_terminal?('\G[0-9]', true, index)
-        r2 = true
-        @index += 1
-      else
-        r2 = nil
-      end
-      if r2
-        s1 << r2
-      else
-        break
-      end
-    end
-    if s1.empty?
-      @index = i1
-      r1 = nil
-    else
-      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-    end
+    r1 = _nt_integer
     s0 << r1
     if r1
       if has_terminal?('.', false, index)
-        r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         terminal_parse_failure('.')
-        r3 = nil
+        r2 = nil
       end
-      s0 << r3
-      if r3
-        s4, i4 = [], index
+      s0 << r2
+      if r2
+        s3, i3 = [], index
         loop do
           if has_terminal?('\G[0-9]', true, index)
-            r5 = true
+            r4 = true
             @index += 1
           else
-            r5 = nil
+            r4 = nil
           end
-          if r5
-            s4 << r5
+          if r4
+            s3 << r4
           else
             break
           end
         end
-        if s4.empty?
-          @index = i4
-          r4 = nil
+        if s3.empty?
+          @index = i3
+          r3 = nil
         else
-          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
         end
-        s0 << r4
+        s0 << r3
       end
     end
     if s0.last
@@ -2922,6 +2894,9 @@ module Delorean
     r0
   end
 
+  module Integer0
+  end
+
   def _nt_integer
     start_index = index
     if node_cache[:integer].has_key?(index)
@@ -2933,25 +2908,56 @@ module Delorean
       return cached
     end
 
-    s0, i0 = [], index
-    loop do
-      if has_terminal?('\G[0-9]', true, index)
-        r1 = true
+    i0 = index
+    if has_terminal?('0', false, index)
+      r1 = instantiate_node(Literal,input, index...(index + 1))
+      @index += 1
+    else
+      terminal_parse_failure('0')
+      r1 = nil
+    end
+    if r1
+      r0 = r1
+    else
+      i2, s2 = index, []
+      if has_terminal?('\G[1-9]', true, index)
+        r3 = true
         @index += 1
       else
-        r1 = nil
+        r3 = nil
       end
-      if r1
-        s0 << r1
+      s2 << r3
+      if r3
+        s4, i4 = [], index
+        loop do
+          if has_terminal?('\G[0-9]', true, index)
+            r5 = true
+            @index += 1
+          else
+            r5 = nil
+          end
+          if r5
+            s4 << r5
+          else
+            break
+          end
+        end
+        r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+        s2 << r4
+      end
+      if s2.last
+        r2 = instantiate_node(Literal,input, i2...index, s2)
+        r2.extend(Integer0)
       else
-        break
+        @index = i2
+        r2 = nil
+      end
+      if r2
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
       end
-    end
-    if s0.empty?
-      @index = i0
-      r0 = nil
-    else
-      r0 = instantiate_node(Literal,input, i0...index, s0)
     end
 
     node_cache[:integer][start_index] = r0
@@ -3267,7 +3273,7 @@ module Delorean
       end
     end
     if s1.last
-      r1 = instantiate_node(DString,input, i1...index, s1)
+      r1 = instantiate_node(IString,input, i1...index, s1)
       r1.extend(String1)
     else
       @index = i1

data/lib/delorean/delorean.treetop

@@ -52,7 +52,7 @@ grammar Delorean
     /
     '.' sp? i:identifier '(' sp? al:kw_args? sp? ')' <Call>
     /
-    '.' sp? i:identifier <GetAttr>
+    '.' sp? i:(identifier / integer) <GetAttr>
   end
 
   rule list_expr
@@ -92,7 +92,8 @@ grammar Delorean
   # Arrays).  So, be cautious about which opertaions are added.
   rule binary_op
     '==' / '!=' / '>=' / '<=' / '&&' / '||' /
-    '>' / '<' / '+' / '-' / '*' / '/' / '%' / '&' / '^' / '|'
+    '>'  / '<'  / '+' / '-' / '*' / '/' / '%' /
+    '&'  / '^'  / '|'
   end
 
   rule unary_op
@@ -100,7 +101,8 @@ grammar Delorean
   end
 
   rule value
-    number                                              /
+    decimal                                             /
+    integer                                             /
     string                                              /
     boolean                                             /
     nil_val                                             /
@@ -110,7 +112,7 @@ grammar Delorean
     set_expr                                            /
     hash_expr                                           /
     mod:(m:class_name '::')? c:class_name <NodeAsValue> /
-    '(' sp? e:expression sp? ')'         <Expr>
+    '(' sp? e:expression sp? ')'          <Expr>
   end
 
   rule fn_args
@@ -118,23 +120,21 @@ grammar Delorean
   end
 
   rule hash_args
-    e0:expression sp? ':' sp? e1:expression args_rest:(sp? ',' sp? al:hash_args?)? <HashArgs>
+    e0:expression sp? ':' sp? e1:expression
+    args_rest:(sp? ',' sp? al:hash_args?)? <HashArgs>
   end
 
   rule kw_args
-    k:(i:identifier sp? '=' sp?)? arg0:expression args_rest:(sp? ',' sp? al:kw_args?)? <KwArgs>
-  end
-
-  rule number
-    decimal / integer
+    k:(i:identifier sp? '=' sp?)? arg0:expression
+    args_rest:(sp? ',' sp? al:kw_args?)? <KwArgs>
   end
 
   rule decimal
-    [0-9]+ '.' [0-9]+ <Literal>
+    i:integer '.' [0-9]+ <Literal>
   end
 
   rule integer
-    [0-9]+ <Literal>
+    '0' <Literal> / [1-9] [0-9]* <Literal>
   end
 
   rule identifier
@@ -163,7 +163,7 @@ grammar Delorean
   end
 
   rule string
-    '"' ('\"' / !'"' .)* '"' <DString>
+    '"' ('\"' / !'"' .)* '"' <IString>
     /
     "'" [^']* "'" <DString>
   end

data/lib/delorean/engine.rb

@@ -189,7 +189,14 @@ module Delorean
     end
 
     def parse_check_call_fn(fn, argcount, class_name=nil)
-      klass = class_name ? parse_class(class_name) : (@m::BaseClass)
+      klass = case class_name
+              when nil
+                @m::BaseClass
+              when String
+                parse_class(class_name)
+              else
+                class_name
+              end
 
       err(UndefinedFunctionError, "Function #{fn} not found") unless
         klass.methods.member? fn.to_sym

data/lib/delorean/nodes.rb

@@ -105,8 +105,7 @@ eos
       # an attr is defined as a class function on the node class.
       "class #{context.last_node}; " +
         "def self.#{i.text_value}#{POST}(_e); " +
-        "_e[self.name+'.#{i.text_value}'] ||= " +
-        e.rewrite(context) + "; end; end;"
+        "_e[self.name+'.#{i.text_value}'] ||= #{e.rewrite(context)}; end; end;"
     end
   end
 
@@ -116,7 +115,19 @@ eos
     end
 
     def rewrite(context)
-      "(" + e.rewrite(context) + ")"
+      "(#{e.rewrite(context)})"
+    end
+  end
+
+  class ClassText
+    attr_reader :text
+
+    def initialize(text)
+      @text = text
+    end
+
+    def to_s
+      text
     end
   end
 
@@ -140,9 +151,9 @@ eos
         context.parse_check_defined_mod_node(node_name, mname)
         context.super_name(node_name, mname)
       rescue UndefinedError, ParseError
-        # kind of hacky, we wrap the class name in a list so Call will
-        # be able to tell it apart from a regular value.
-        [text_value]
+        # FIXME: wrap the class name so Call will be able to tell it
+        # apart from a regular value.
+        ClassText.new(text_value)
       end
     end
   end
@@ -213,6 +224,16 @@ eos
     end
   end
 
+  class IString < Literal
+    def rewrite(context)
+      # FIXME: hacky to just fail
+      raise "String interpolation not supported" if text_value =~ /\#\{.*\}/
+
+      # FIXME: syntax check?
+      text_value
+    end
+  end
+
   class DString < Literal
     def rewrite(context)
       # remove the quotes and requote.  We don't want the likes of #{}
@@ -275,7 +296,9 @@ eos
     end
 
     def rewrite(context, vcode)
-      "_get_attr(#{vcode}, '#{i.text_value}', _e)"
+      attr = i.text_value
+      attr = "'#{attr}'" unless attr =~ /\A[0-9]+\z/
+      "_get_attr(#{vcode}, #{attr}, _e)"
     end
   end
 
@@ -293,13 +316,13 @@ eos
 
       args_str = args.reverse.join(',')
 
-      if vcode.is_a? Array
+      if vcode.is_a?(ClassText)
         # ruby class call
-        class_name = vcode[0]
+        class_name = vcode.text
         context.parse_check_call_fn(i.text_value, args.count, class_name)
         "#{class_name}.#{i.text_value}(#{args_str})"
       else
-        "_instance_call(#{vcode}, '#{i.text_value}', [#{args_str}])"
+        "_instance_call(#{vcode}, '#{i.text_value}', [#{args_str}], _e)"
       end
 
     end
@@ -314,10 +337,9 @@ eos
     def rewrite(context, node_name)
       args, kw = al.text_value.empty? ? [[], {}] : al.rewrite(context)
 
-      raise "No positional arguments to node call" unless
-        args.empty?
-
-      kw_str = kw.map {|k, v| "'#{k}' => #{v}"}.join(',')
+      kw_str =
+        (kw.map {|k, v| "'#{k}' => #{v}"} +
+         args.each_with_index.map {|v, i| "#{i} => #{v}"}).join(',')
 
       "_node_call(#{node_name}, _e, {#{kw_str}})"
     end
@@ -331,13 +353,13 @@ eos
     end
 
     def rewrite(context)
-      attr_list = ga.text_value.split('.')
+      attrs = ga.text_value.split('.')
 
       # If ga.text_value is not "", then we need to drop the 1st
       # element since it'll be "".
-      attr_list.shift
+      attrs.shift
 
-      attr_list.inject(v.rewrite(context)) {|x, y| "_get_attr(#{x}, '#{y}', _e)"}
+      attrs.inject(v.rewrite(context)) {|x, y| "_get_attr(#{x}, '#{y}', _e)"}
     end
   end
 
@@ -403,7 +425,7 @@ eos
     def rewrite(context)
       res = "(#{e1.rewrite(context)})"
       context.parse_define_var(i.text_value)
-      res += ".select{|#{i.rewrite(context)}| (#{ifexp.e3.rewrite(context)})}" if
+      res += ".select{|#{i.rewrite(context)}|(#{ifexp.e3.rewrite(context)})}" if
         defined?(ifexp.e3)
       res += ".map{|#{i.rewrite(context)}| (#{e2.rewrite(context)}) }"
       context.parse_undef_var(i.text_value)

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/eval_spec.rb

@@ -40,6 +40,15 @@ describe "Delorean" do
     r.should == -122
   end
 
+  it "proper string interpolation" do
+    engine.parse defn("A:",
+                      '    a = "\n123\n"',
+                      )
+
+    r = engine.evaluate("A", "a")
+    r.should == "\n123\n"
+  end
+
   it "should handle getattr in expressions" do
     engine.parse defn("A:",
                       "    a = {'x':123, 'y':456, 'z':789}",
@@ -48,6 +57,14 @@ describe "Delorean" do
     engine.evaluate_attrs("A", ["b"]).should == [123*456-789]
   end
 
+  it "should handle numeric getattr" do
+    engine.parse defn("A:",
+                      "    a = {1:123, 0:456, 'z':789, 2: {'a':444}}",
+                      "    b = A.a.1 * A.a.0 - A.a.z - A.a.2.a",
+                      )
+    engine.evaluate_attrs("A", ["b"]).should == [123*456-789-444]
+  end
+
   it "should be able to evaluate multiple node attrs" do
     engine.parse defn("A:",
                       "    a =? 123",
@@ -63,7 +80,7 @@ describe "Delorean" do
   it "should give error when accessing undefined attr" do
     engine.parse defn("A:",
                       "    a = 1",
-                      "    c = a.to_s",
+                      "    c = a.to_ss",
                       )
 
     lambda {
@@ -71,6 +88,15 @@ describe "Delorean" do
     }.should raise_error(Delorean::InvalidGetAttribute)
   end
 
+  it "should be able to call 0-ary functions without ()" do
+    engine.parse defn("A:",
+                      "    a = 1",
+                      "    d = a.to_s",
+                      )
+
+    engine.evaluate("A", "d").should == "1"
+  end
+
   it "should handle default param values" do
     engine.parse defn("A:",
                       "    a =? 123",
@@ -170,6 +196,16 @@ describe "Delorean" do
     res["backtrace"].should == [["XXX", 2, "b"]]
   end
 
+  it "should handle optional args to external fns" do
+    engine.parse defn("A:",
+                      "    b = Dummy.one_or_two(['a', 'b'])",
+                      "    c = Dummy.one_or_two([1,2,3], ['a', 'b'])",
+                      )
+
+    engine.evaluate("A", "b").should == [['a', 'b'], nil]
+    engine.evaluate("A", "c").should == [[1,2,3], ['a', 'b']]
+  end
+
   it "should handle operator precedence properly" do
     engine.parse defn("A:",
                       "    b = 3+2*4-1",
@@ -216,6 +252,18 @@ describe "Delorean" do
     r.should == 123*123 + 5
   end
 
+  it "should be able to access nodes and node attrs dynamically " do
+    engine.parse defn("A:",
+                      "    b = 123",
+                      "B:",
+                      "    b = A",
+                      "    c = b.b * 456",
+                      )
+
+    r = engine.evaluate("B", "c")
+    r.should == 123*456
+  end
+
   it "should be able to call class methods on ActiveRecord classes" do
     engine.parse defn("A:",
                       "    b = Dummy.call_me_maybe(1, 2, 3, 4)",
@@ -324,13 +372,13 @@ eoc
     r.should == 867 + 5309
   end
 
-  it "should not eval inside strings" do
+  it "should be able to use AR classes as values and call their methods" do
     engine.parse defn("A:",
-                      '    d = "#{this is a test}"',
+                      "    a = M::LittleDummy",
+                      "    b = a.heres_my_number(867, 5309)",
                       )
-
-    r = engine.evaluate("A", "d")
-    r.should == '#{this is a test}'
+    r = engine.evaluate("A", "b")
+    r.should == 867 + 5309
   end
 
   it "should ignore undeclared params sent to eval which match attr names" do
@@ -827,4 +875,17 @@ eof
     engine.evaluate("A", "y", {"a"=>1, "b"=>2, "c"=>3}).should == h
     engine.evaluate("A", "z", {"a"=>1, "b"=>2, "c"=>3}).should == -1
   end
+
+  it "implements positional args in node calls" do
+    engine.parse defn("B:",
+                      "    a =?",
+                      "    b =?",
+                      "    x = (_.0 - _.1) * (a - b)",
+                      "A:",
+                      "    a = _.0 - _.1",
+                      "    z = B(10, 20, a=3, b=7).x",
+                      )
+    engine.evaluate_attrs("A", ["a", "z"], {0 => 123, 1 => 456}).should ==
+      [123-456, -40]
+  end
 end

data/spec/parse_spec.rb

@@ -60,7 +60,8 @@ describe "Delorean" do
   it "should accept default param definitions" do
     lambda {
       engine.parse defn("A:",
-                        "    b =? 1",
+                        "    a =? 0.0123",
+                        "    b =? 0",
                         "    c =? -1.1",
                         "    d = b + c",
                         )
@@ -83,6 +84,22 @@ describe "Delorean" do
     }.should raise_error(Delorean::ParseError)
   end
 
+  it "should disallow leading 0s in numbers" do
+    lambda {
+      engine.parse defn("A:",
+                        "    a = 00.123",
+                        )
+    }.should raise_error(Delorean::ParseError)
+  end
+
+  it "should disallow leading 0s in numbers (2)" do
+    lambda {
+      engine.parse defn("A:",
+                        "    a = 0123",
+                        )
+    }.should raise_error(Delorean::ParseError)
+  end
+
   it "should disallow bad attr names" do
     lambda {
       engine.parse defn("A:",
@@ -648,15 +665,10 @@ describe "Delorean" do
                       )
   end
 
-  it "should not allow positional args to node calls" do
-    begin
-      engine.parse defn("A:",
-                        "    d = A(1, 2, 3)",
-                        )
-      raise "fail"
-    rescue Delorean::ParseError => exc
-      exc.line.should == 2
-    end
+  it "should allow positional args to node calls" do
+    engine.parse defn("A:",
+                      "    d = A(1, 2, 3, a=123, b=456)",
+                      )
   end
 
   it "should parse instance calls" do
@@ -728,6 +740,18 @@ describe "Delorean" do
     end
   end
 
+  # this is a parsing limitation which should go away
+  it "should not parse interpolated strings" do
+    begin
+      engine.parse defn("A:",
+                        '    d = "#{this is a test}"',
+                        )
+      raise "fail"
+    rescue Delorean::ParseError => exc
+      exc.line.should == 2
+    end
+  end
+
   it "should parse imports" do
     engine.parse defn("import AAA",
                       "A:",

data/spec/spec_helper.rb

@@ -30,6 +30,8 @@ ActiveRecord::Migration.create_table :dummies do |t|
 end
 
 class Dummy < ActiveRecord::Base
+  include Delorean::Model
+
   attr_accessible :name, :number, :dummy
   belongs_to :dummy
 
@@ -64,6 +66,14 @@ class Dummy < ActiveRecord::Base
   def name2
     "#{name}-#{number}"
   end
+
+  delorean_fn :one_or_two, sig: [1, 2] do
+    |*args|
+    # FIXME: |a,b| will not work properly with delorean_fn
+    a, b = args
+
+    [a, b]
+  end
 end
 
 module M

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop