trxl 0.1.5 → 0.1.8

data/lib/trxl/trxl_grammar.treetop

@@ -54,10 +54,10 @@ grammar Trxl
     /
     case_expression
     /
-    binary_expression 
-    / 
-    negated_expression 
-    / 
+    binary_expression
+    /
+    negated_expression
+    /
     unary_expression
   end
 
@@ -74,18 +74,18 @@ grammar Trxl
       end
     }
   end
- 
+
   rule unary_expression
     require_directive
     /
     definition
-    / 
+    /
     comparative
     /
     additive
   end
 
-  
+
   rule definition
     variable space '=' space expression {
       def eval(env = Environment.new)
@@ -97,11 +97,11 @@ grammar Trxl
       end
     }
   end
-  
+
 
   rule if_expression
 
-    'if' space '(' space if_exp:expression space ')' SPACE 
+    'if' space '(' space if_exp:expression space ')' SPACE
       if_branch:statement_list space
     elsif_branches:(elsif_expression_list SPACE)?
     else_branch:('else' SPACE statement_list SPACE)?
@@ -152,20 +152,19 @@ grammar Trxl
     case_keyword SPACE case_exp:expression SPACE
       when_expression_list SPACE
       'else' SPACE else_exp:statement_list SPACE
-    end_keyword 
+    end_keyword
 
     {
       def eval(env = Environment.new)
         case_val = case_exp.eval(env)
         else_val = else_exp.eval(env)
-        Kernel.eval <<-CASE_STMT
-          lambda do
-            case #{case_val.is_a?(String) ? "'#{case_val}'" : case_val}
-              #{ruby_when_expressions(env)}
-              else #{else_val.is_a?(String) ? "'#{else_val}'" : else_val}
-            end
-          end [] # call this lambda immediately   
-        CASE_STMT
+
+        Kernel.eval <<-CASE
+          case case_val
+            #{ruby_when_expressions(env)}
+            else #{else_val.is_a?(String) ? "'#{else_val}'" : else_val}
+          end
+        CASE
       end
 
       def ruby_when_expressions(env = Environment.new)
@@ -183,12 +182,21 @@ grammar Trxl
       def eval(env = Environment.new)
         condition = when_exp.eval(env)
         expression = statement_list.eval(env)
-        { 
+        {
           # use '' instead of "" since we don't care about var replacement now
-          :condition =>  (condition.is_a?(String)  ? "'#{condition}'"  : condition),
+          :condition =>  ruby_when_condition(condition),
           :expression => (expression.is_a?(String) ? "'#{expression}'" : expression)
         }
       end
+
+      def ruby_when_condition(condition)
+        case condition
+        when nil then "nil"
+        when String then "'#{condition}'"
+        else
+          condition
+        end
+      end
     }
   end
 
@@ -232,11 +240,11 @@ grammar Trxl
       end
     }
   end
-  
+
   rule operator
     function / variable
   end
-  
+
   rule function
     'fun' formal_parameter_list space '{' space body:statement_list space '}' <Function>
   end
@@ -275,7 +283,7 @@ grammar Trxl
 
       def to_s(env = Environment.new)
         '()'
-      end      
+      end
     }
   end
 
@@ -295,7 +303,7 @@ grammar Trxl
       def eval(env = Environment.new)
         []
       end
-   
+
       def to_s(env = Environment.new)
         '()'
       end
@@ -338,7 +346,7 @@ grammar Trxl
       def eval(env = Environment.new)
         {}
       end
-   
+
       def to_s(env = Environment.new)
         text_value
       end
@@ -365,7 +373,7 @@ grammar Trxl
       def eval(env = Environment.new)
         { key.eval(env) => value.eval(env) }
       end
-   
+
       def to_s(env = Environment.new)
         text_value
       end
@@ -388,7 +396,7 @@ grammar Trxl
       def eval(env = Environment.new)
         []
       end
-   
+
       def to_s(env = Environment.new)
         text_value
       end
@@ -443,7 +451,7 @@ grammar Trxl
       end
     }
   end
-  
+
   rule comparative
     operand_1:additive space operator:equality_op space operand_2:additive <BinaryOperation>
   end
@@ -462,14 +470,14 @@ grammar Trxl
           raise Trxl::InvalidOperationException, "Left operand is not an Array"
         end
       end
-      
+
       # override default behavior since it's not possible to push into nil
       def lhs_nil_allowed?
         false
       end
-    }    
+    }
   end
-  
+
   rule equality_op
     '==' <NilAcceptingOperator>
     /
@@ -483,7 +491,7 @@ grammar Trxl
     /
     '>'  <NilRejectingOperator>
   end
-  
+
   rule additive
     multitive tail:(space additive_op space multitive)* {
       def eval(env = Environment.new)
@@ -498,7 +506,7 @@ grammar Trxl
       end
     }
   end
-  
+
   rule additive_op
     '+' <NilRejectingOperator>
     /
@@ -520,7 +528,7 @@ grammar Trxl
       end
     }
   end
-  
+
   rule multitive_op
     '*' <NilRejectingOperator>
     /
@@ -556,19 +564,19 @@ grammar Trxl
   end
 
   rule exponential
-    operand_1:primary space operator:exponential_op space operand_2:exponential <BinaryOperation>  
+    operand_1:primary space operator:exponential_op space operand_2:exponential <BinaryOperation>
     /
     primary
   end
 
   rule exponential_op
-    '^' <NilRejectingOperator> { 
+    '^' <NilRejectingOperator> {
       def ruby_operator
         :**
       end
     }
   end
-  
+
   rule primary
     predefined_function
     /
@@ -580,7 +588,7 @@ grammar Trxl
       def eval(env = Environment.new)
         true
       end
-    } 
+    }
     /
     'FALSE' {
       def eval(env = Environment.new)
@@ -692,7 +700,7 @@ grammar Trxl
       def pattern(env = Environment.new)
         primary.eval(env)
       end
- 
+
       def match_op
         '=='
       end
@@ -728,7 +736,7 @@ grammar Trxl
   end
 
 
-  rule variable 
+  rule variable
     [a-zA-Z_]+ ([0-9] / [a-zA-Z_])* {
 
       def eval(env = Environment.new)
@@ -747,7 +755,7 @@ grammar Trxl
         if env.has_key?(name)
           value = env[name]
           (value.is_a?(Array) || value.is_a?(Hash)) ? value.inspect : value.to_s
-        else 
+        else
           text_value
         end
       end
@@ -803,8 +811,8 @@ grammar Trxl
     /
     to_array_function
     /
-    round_function 
-    / 
+    round_function
+    /
     min_function
     /
     max_function
@@ -827,7 +835,7 @@ grammar Trxl
       def eval(env = Environment.new)
         to_s(env)
       end
-     
+
       def to_s(env = Environment.new)
         help =  "-----------------------------------------\n"
         help =  "           TRXL Language HELP            \n"
@@ -853,12 +861,20 @@ grammar Trxl
         help << "-----------------------------------------\n"
         help << "6)  Built in functions:\n"
         help << "    HELP,ENV,SIZE,SPLIT,ROUND,MIN,MAX\n"
-        help << "    SUM,MULT,AVG, PRINT, PRINT_LINE\n"
-        help << "    TO_INT, TO_FLOAT, TO_ARRAY\n"
+        help << "    SUM, MULT, AVG, PRINT, PRINT_LINE\n"
+        help << "    TO_INT, TO_FLOAT, TO_ARRAY, AVG_SUM\n"
+        help << "    MATCHING_IDS, VALUES_OF_TYPE\n"
         help << "-----------------------------------------\n"
         help << "7)  Standard library functions:\n"
-        help << "    Use to iterate over Arrays or Strings\n"
-        help << "    FOREACH_IN, INJECT\n"
+        help << "    foreach_in, inject, map, select\n"
+        help << "    reject, in_groups_of, sum_of_type\n"
+        help << "    avg_sum_of_type, avg_range_sum_of_type\n"
+        help << "    total_range_sum_of_type, ratio\n"
+        help << "    year_from_date, month_from_date\n"
+        help << "    hash_values, hash_value_sum\n"
+        help << "    avg_hash_value_sum, hash_range_values\n"
+        help << "    hash_range_value_sum\n"
+        help << "    avg_hash_range_value_sum\n"
         help << "-----------------------------------------\n"
         help << "8)  Access the current environment:\n"
         help << "    ENV; (your output may differ)\n"
@@ -921,12 +937,12 @@ grammar Trxl
         help << "    => 1\n"
         help << "-----------------------------------------\n"
         help << "14) Range variables and literals\n"
-        help << "    range_including_upper = 1..5\n" 
-        help << "    => [ 1, 2, 3, 4, 5 ]\n" 
+        help << "    range_including_upper = 1..5\n"
+        help << "    => [ 1, 2, 3, 4, 5 ]\n"
         help << "    SIZE(range_including_upper);\n"
         help << "    => 5\n"
         help << "    range_excluding_upper = 1...5\n"
-        help << "    => [ 1, 2, 3, 4 ]\n" 
+        help << "    => [ 1, 2, 3, 4 ]\n"
         help << "    SIZE(range_excluding_upper);\n"
         help << "    => 4\n"
         help << "    SIZE([1..5);\n"
@@ -934,8 +950,8 @@ grammar Trxl
         help << "-----------------------------------------\n"
         help << "15) Conditional branching and recursion:\n"
         help << "    factorial = fun(x) {\n"
-        help << "      if(x == 0)\n" 
-        help << "        1\n" 
+        help << "      if(x == 0)\n"
+        help << "        1\n"
         help << "      else\n"
         help << "        x * factorial(x - 1)\n"
         help << "      end\n"
@@ -945,8 +961,8 @@ grammar Trxl
         help << "-----------------------------------------\n"
         help << "16) Conditional branching:\n"
         help << "    foo = fun(x) {\n"
-        help << "      if(x == 0)\n" 
-        help << "        0\n" 
+        help << "      if(x == 0)\n"
+        help << "        0\n"
         help << "      elsif(x == 1)\n"
         help << "        1\n"
         help << "      else\n"
@@ -962,10 +978,11 @@ grammar Trxl
         help << "-----------------------------------------\n"
         help << "17) case expressions:\n"
         help << "    foo = fun(x) {\n"
-        help << "      case x\n" 
-        help << "        when 0 then 0\n" 
-        help << "        when 1 then 1\n" 
-        help << "        when 2 then 2\n" 
+        help << "      case x\n"
+        help << "        when NULL then NULL\n"
+        help << "        when 0 then 0\n"
+        help << "        when 1 then 1\n"
+        help << "        when 2 then 2\n"
         help << "        else 3\n"
         help << "      end\n"
         help << "    }\n"
@@ -1008,7 +1025,7 @@ grammar Trxl
   rule print_line_function
     'PRINT_LINE' space '(' space expression space ')' {
       def eval(env = Environment.new)
-        result = expression.eval(env) 
+        result = expression.eval(env)
         puts (result.is_a?(Array) || result.is_a?(Hash)) ? result.inspect : result.to_s
       end
     }
@@ -1023,7 +1040,7 @@ grammar Trxl
   rule print_function
     'PRINT' space '(' space expression space ')' {
       def eval(env = Environment.new)
-        result = expression.eval(env) 
+        result = expression.eval(env)
         print (result.is_a?(Array) || result.is_a?(Hash)) ? result.inspect : result.to_s
       end
     }
@@ -1101,12 +1118,12 @@ grammar Trxl
   rule sum_function
     'SUM' space '(' space expression more_expressions:( space ',' space expression)* space ')' {
       def eval(env = Environment.new)
-        evaluated_expressions(env).compact.inject(0) do |sum, val| 
+        evaluated_expressions(env).compact.inject(0) do |sum, val|
           sum + if val.is_a?(Array)
             val.flatten.compact.inject(0) { |next_sum, v| next_sum + v }
           else
             val
-          end 
+          end
         end
       end
 
@@ -1131,12 +1148,12 @@ grammar Trxl
       def eval(env = Environment.new)
         values = evaluated_expressions(env).compact
         return 0 if values.size == 0
-        values.inject(1) do |sum, val| 
+        values.inject(1) do |sum, val|
           sum * if val.is_a?(Array)
             val.flatten.compact.inject(1) { |next_sum, v| next_sum * v }
           else
             val
-          end 
+          end
         end
       end
 
@@ -1174,14 +1191,14 @@ grammar Trxl
 
         s = values.inject(0) do |sum, next_val|
           sum + if next_val.is_a?(Array)
-            next_val.flatten.inject(0) do |next_sum, val| 
+            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
         end
         (s != 0 && nr_of_vals != 0) ? s.to_f / nr_of_vals : 0
       end
@@ -1215,12 +1232,16 @@ grammar Trxl
             nr_of_vals = 0
             res = next_val.inject(0) do |next_sum, val|
               if val.is_a?(Array)
-                next_sum + val.inject(0) { |s, v| s + (v || 0) } / val.compact.size
+                if (size = val.compact.size) > 0
+                  next_sum + val.inject(0) { |s, v| s + (v || 0) } / size
+                else
+                  next_sum
+                end
               else
                 nr_of_vals += 1 if val && (strict || (!strict && val != 0))
                 next_sum + (val || 0)
               end
-            end 
+            end
             nr_of_vals != 0 ? res / nr_of_vals : res
           else
             next_val || 0
@@ -1239,7 +1260,7 @@ grammar Trxl
       end
     }
   end
-  
+
   rule min_function
     'MIN' space '(' space expression more_expressions:( space ',' space expression)* space ')' {
       def eval(env = Environment.new)
@@ -1295,17 +1316,17 @@ grammar Trxl
   end
 
   rule values_of_type_function
-    'VALUES_OF_TYPE' space '(' 
-      space match_exp:expression space ',' 
+    'VALUES_OF_TYPE' space '('
+      space match_exp:expression space ','
       space all_types:expression space ','
-      space all_values:expression space 
+      space all_values:expression space
     ')' {
       def eval(env = Environment.new)
         types = all_types.eval(env)
         if types.is_a?(Hash)
           values = all_values.eval(env)
           if values.is_a?(Hash)
-            types.select { |k, v| v == match_exp.eval(env) }.map do |entry| 
+            types.select { |k, v| v == match_exp.eval(env) }.map do |entry|
               values[entry[0]]
             end
           else
@@ -1325,24 +1346,24 @@ grammar Trxl
   end
 
 
-  
+
   rule non_space_char
     !white .
   end
 
-  
+
   rule require_keyword
     'require' !non_space_char
   end
-  
+
   rule case_keyword
     'case' !non_space_char
   end
-  
+
   rule when_keyword
     'when' !non_space_char
   end
-  
+
   rule then_keyword
     'then' !non_space_char
   end
@@ -1377,13 +1398,13 @@ grammar Trxl
 
 
   # whitespace
-  rule white 
+  rule white
     [ \r\t\n]+
   end
 
   # mandatory space
   rule SPACE
-    (white / comment)+ 
+    (white / comment)+
   end
 
   # optional space
@@ -1391,4 +1412,4 @@ grammar Trxl
     SPACE?
   end
 
-end
+end