trxl 0.1.9 → 0.1.10

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/lib/trxl/trxl.rb

@@ -313,6 +313,35 @@ module Trxl
 
   end
 
+  module Builtin
+
+    def self.avg(values)
+      strict = true
+      nr_of_vals = 0
+      strict_flag = values.first
+      if strict_flag.is_a?(TrueClass) || strict_flag.is_a?(FalseClass)
+        values.shift
+        strict = strict_flag
+      end
+
+      # if all values are nil return nil
+      return nil if values.compact.size == 0
+
+      s = values.inject(0) do |sum, next_val|
+        sum + if next_val.is_a?(Array)
+          next_val.flatten.inject(0) do |next_sum, val|
+            nr_of_vals += 1 if val && (strict || (!strict && val != 0))
+            next_sum + (val || 0)
+          end
+        else
+          nr_of_vals += 1 if next_val && (strict || (!strict && next_val != 0))
+          next_val || 0
+        end
+      end
+      (s != 0 && nr_of_vals != 0) ? s.to_f / nr_of_vals : 0
+    end
+  end
+
   module StdLib
 
     FOREACH_IN = <<-PROGRAM

data/lib/trxl/trxl_grammar.rb

@@ -4861,20 +4861,25 @@ module Trxl
                                     if r17
                                       r0 = r17
                                     else
-                                      r18 = _nt_is_empty_function
+                                      r18 = _nt_compact_avg_function
                                       if r18
                                         r0 = r18
                                       else
-                                        r19 = _nt_matching_ids_function
+                                        r19 = _nt_is_empty_function
                                         if r19
                                           r0 = r19
                                         else
-                                          r20 = _nt_values_of_type_function
+                                          r20 = _nt_matching_ids_function
                                           if r20
                                             r0 = r20
                                           else
-                                            @index = i0
-                                            r0 = nil
+                                            r21 = _nt_values_of_type_function
+                                            if r21
+                                              r0 = r21
+                                            else
+                                              @index = i0
+                                              r0 = nil
+                                            end
                                           end
                                         end
                                       end
@@ -4934,7 +4939,7 @@ module Trxl
       help << "    SUM, MULT, AVG, PRINT, PRINT_LINE\n"
       help << "    TO_INT, TO_FLOAT, TO_ARRAY, AVG_SUM\n"
       help << "    MATCHING_IDS, VALUES_OF_TYPE, COMPACT\n"
-      help << "    IS_EMPTY\n"
+      help << "    IS_EMPTY, COMPACT_AVG\n"
       help << "-----------------------------------------\n"
       help << "7)  Standard library functions:\n"
       help << "    foreach_in, inject, map, select\n"
@@ -7082,36 +7087,16 @@ module Trxl
 
   module AvgFunction2
     def eval(env = Environment.new)
-      strict = true
-      nr_of_vals = 0
-      values = expressions
-      strict_flag = values[0].eval(env)
-      if strict_flag.is_a?(TrueClass) || strict_flag.is_a?(FalseClass)
-        values.shift
-        strict = strict_flag
-      end
-
-      # if all values are nil return nil
-      values = values.map { |v| v.eval(env) }
-      return nil if values.compact.size == 0
-
-      s = values.inject(0) do |sum, next_val|
-        sum + if next_val.is_a?(Array)
-          next_val.flatten.inject(0) do |next_sum, val|
-            nr_of_vals += 1 if val && (strict || (!strict && val != 0))
-            next_sum + (val || 0)
-          end
-        else
-          nr_of_vals += 1 if next_val && (strict || (!strict && next_val != 0))
-          next_val || 0
-        end
-      end
-      (s != 0 && nr_of_vals != 0) ? s.to_f / nr_of_vals : 0
+      Trxl::Builtin.avg(values(env))
     end
 
     def expressions
       [ expression ] + more_expressions.elements.map { |e| e.expression }
     end
+
+    def values(env)
+      expressions.map { |e| e.eval(env) }
+    end
   end
 
   module AvgFunction3
@@ -7297,6 +7282,179 @@ module Trxl
     r0
   end
 
+  module CompactAvgFunction0
+    def space1
+      elements[1]
+    end
+
+    def space2
+      elements[3]
+    end
+
+    def expression
+      elements[4]
+    end
+
+    def space3
+      elements[5]
+    end
+
+  end
+
+  module CompactAvgFunction1
+    def eval(env = Environment.new)
+      values = values(env)
+      values.any? ? Trxl::Builtin.avg(values) : nil
+    end
+
+    def values(env)
+      expression.eval(env).compact
+    end
+  end
+
+  module CompactAvgFunction2
+    def space1
+      elements[1]
+    end
+
+    def space2
+      elements[3]
+    end
+
+  end
+
+  module CompactAvgFunction3
+    def eval(env = Environment.new)
+      nil
+    end
+  end
+
+  def _nt_compact_avg_function
+    start_index = index
+    if node_cache[:compact_avg_function].has_key?(index)
+      cached = node_cache[:compact_avg_function][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    i1, s1 = index, []
+    if has_terminal?('COMPACT_AVG', false, index)
+      r2 = instantiate_node(SyntaxNode,input, index...(index + 11))
+      @index += 11
+    else
+      terminal_parse_failure('COMPACT_AVG')
+      r2 = nil
+    end
+    s1 << r2
+    if r2
+      r3 = _nt_space
+      s1 << r3
+      if r3
+        if has_terminal?('(', false, index)
+          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('(')
+          r4 = nil
+        end
+        s1 << r4
+        if r4
+          r5 = _nt_space
+          s1 << r5
+          if r5
+            r6 = _nt_expression
+            s1 << r6
+            if r6
+              r7 = _nt_space
+              s1 << r7
+              if r7
+                if has_terminal?(')', false, index)
+                  r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                  @index += 1
+                else
+                  terminal_parse_failure(')')
+                  r8 = nil
+                end
+                s1 << r8
+              end
+            end
+          end
+        end
+      end
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(CompactAvgFunction0)
+      r1.extend(CompactAvgFunction1)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r0 = r1
+    else
+      i9, s9 = index, []
+      if has_terminal?('COMPACT_AVG', false, index)
+        r10 = instantiate_node(SyntaxNode,input, index...(index + 11))
+        @index += 11
+      else
+        terminal_parse_failure('COMPACT_AVG')
+        r10 = nil
+      end
+      s9 << r10
+      if r10
+        r11 = _nt_space
+        s9 << r11
+        if r11
+          if has_terminal?('(', false, index)
+            r12 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure('(')
+            r12 = nil
+          end
+          s9 << r12
+          if r12
+            r13 = _nt_space
+            s9 << r13
+            if r13
+              if has_terminal?(')', false, index)
+                r14 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure(')')
+                r14 = nil
+              end
+              s9 << r14
+            end
+          end
+        end
+      end
+      if s9.last
+        r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+        r9.extend(CompactAvgFunction2)
+        r9.extend(CompactAvgFunction3)
+      else
+        @index = i9
+        r9 = nil
+      end
+      if r9
+        r0 = r9
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:compact_avg_function][start_index] = r0
+
+    r0
+  end
+
   module AvgSumFunction0
     def space1
       elements[0]

data/lib/trxl/trxl_grammar.treetop

@@ -827,6 +827,8 @@ grammar Trxl
     /
     compact_function
     /
+    compact_avg_function
+    /
     is_empty_function
     /
     matching_ids_function
@@ -868,7 +870,7 @@ grammar Trxl
         help << "    SUM, MULT, AVG, PRINT, PRINT_LINE\n"
         help << "    TO_INT, TO_FLOAT, TO_ARRAY, AVG_SUM\n"
         help << "    MATCHING_IDS, VALUES_OF_TYPE, COMPACT\n"
-        help << "    IS_EMPTY\n"
+        help << "    IS_EMPTY, COMPACT_AVG\n"
         help << "-----------------------------------------\n"
         help << "7)  Standard library functions:\n"
         help << "    foreach_in, inject, map, select\n"
@@ -1211,36 +1213,16 @@ grammar Trxl
   rule avg_function
     'AVG' space '(' space expression more_expressions:( space ',' space expression)* space ')' {
       def eval(env = Environment.new)
-        strict = true
-        nr_of_vals = 0
-        values = expressions
-        strict_flag = values[0].eval(env)
-        if strict_flag.is_a?(TrueClass) || strict_flag.is_a?(FalseClass)
-          values.shift
-          strict = strict_flag
-        end
-
-        # if all values are nil return nil
-        values = values.map { |v| v.eval(env) }
-        return nil if values.compact.size == 0
-
-        s = values.inject(0) do |sum, next_val|
-          sum + if next_val.is_a?(Array)
-            next_val.flatten.inject(0) do |next_sum, val|
-              nr_of_vals += 1 if val && (strict || (!strict && val != 0))
-              next_sum + (val || 0)
-            end
-          else
-            nr_of_vals += 1 if next_val && (strict || (!strict && next_val != 0))
-            next_val || 0
-          end
-        end
-        (s != 0 && nr_of_vals != 0) ? s.to_f / nr_of_vals : 0
+        Trxl::Builtin.avg(values(env))
       end
 
       def expressions
         [ expression ] + more_expressions.elements.map { |e| e.expression }
       end
+
+      def values(env)
+        expressions.map { |e| e.eval(env) }
+      end
     }
     /
     'AVG' space '(' space ')' {
@@ -1250,6 +1232,25 @@ grammar Trxl
     }
   end
 
+  rule compact_avg_function
+    'COMPACT_AVG' space '(' space expression space ')' {
+      def eval(env = Environment.new)
+        values = values(env)
+        values.any? ? Trxl::Builtin.avg(values) : nil
+      end
+
+      def values(env)
+        expression.eval(env).compact
+      end
+    }
+    /
+    'COMPACT_AVG' space '(' space ')' {
+      def eval(env = Environment.new)
+        nil
+      end
+    }
+  end
+
   rule avg_sum_function
     'AVG_SUM' space '(' space expression more_expressions:( space ',' space expression)* space ')' {
       def eval(env = Environment.new)

data/spec/trxl/builtins_spec.rb

@@ -189,6 +189,17 @@ describe "The language" do
     eval(program).should == 4
   end
 
+  it "should provide COMPACT_AVG in order to compact an array before calculating its AVG value" do
+    program =  "COMPACT_AVG([1,2,3])"
+    eval(program).should == 2
+    program =  "COMPACT_AVG([1, NULL])"
+    eval(program).should == 1
+    program =  "COMPACT_AVG([NULL])"
+    eval(program).should == nil
+    program =  "COMPACT_AVG([NULL, NULL])"
+    eval(program).should == nil
+  end
+
   it "should be able to calculate AVG_SUM for an arbitrary number of argument expressions" do
     program =  "AVG_SUM([1,2,3],[4,4,4],[6,6,6])"
     eval(program).should == 12

data/trxl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trxl}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Martin Gamsjaeger (snusnu)}, %q{Michael Aufreiter}]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trxl
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)