cadenza 0.7.2 → 0.8.0

data/lib/cadenza/filters/standard_filters.rb

@@ -1,7 +1,7 @@
 require 'cgi'
 
 # adds slashes to \, ', and " characters in the given string
-define_filter :addslashes do |string|
+define_filter :addslashes do |string, params|
    word = string.dup
    word.gsub!(/\\/, "\\\\\\\\")
    word.gsub!(/'/, "\\\\'")
@@ -10,27 +10,32 @@ define_filter :addslashes do |string|
 end
 
 # capitalizes the first letter of the string
-define_filter :capitalize, &:capitalize
+define_filter :capitalize do |input, params|
+   input.capitalize
+end
 
 # centers the string in a fixed width field with the given padding
-define_filter :center do |string, length, *args|
-   padding = args.first || ' ' # Ruby 1.8.x compatibility
+define_filter :center do |string, params|
+   length = params[0]
+   padding = params[1] || ' '
    string.center(length, padding)
 end
 
 # removes all instances of the given string from the string
-define_filter :cut do |string, value|
-   string.gsub(value, '')
+define_filter :cut do |string, params|
+   string.gsub(params.first, '')
 end
 
 # formats the given date object with the given format string
-define_filter :date do |date, *args|
-   format = args.first || '%F' # Ruby 1.8.x compatibility
+define_filter :date do |date, params|
+   format = params.first || '%F'
    date.strftime(format)
 end
 
 # returns the given value if the input is falsy or is empty
-define_filter :default do |input, default|
+define_filter :default do |input, params|
+   default = params.first
+
    if input.respond_to?(:empty?) and input.empty?
       default
    else
@@ -39,12 +44,12 @@ define_filter :default do |input, default|
 end
 
 # escapes the HTML content of the value
-define_filter :escape do |input|
+define_filter :escape do |input, params|
    CGI::escapeHTML(input)
 end
 
 # returns the first item of an iterable
-define_filter :first do |input|
+define_filter :first do |input, params|
    if input.respond_to?(:[])
       RUBY_VERSION =~ /^1.8/ && input.is_a?(String) ? input[0].chr : input[0]
    else
@@ -53,7 +58,7 @@ define_filter :first do |input|
 end
 
 # returns the last item of an iterable
-define_filter :last do |input|
+define_filter :last do |input, params|
    if input.respond_to?(:[])
       RUBY_VERSION =~ /^1.8/ && input.is_a?(String) ? input[-1].chr : input[-1]
    else
@@ -62,36 +67,90 @@ define_filter :last do |input|
 end
 
 # glues together elements of the input with the glue string
-define_filter :join do |input, glue|
+define_filter :join do |input, params|
+   glue = params.first
    input.join(glue)
 end
 
 # returns the length of the input
-define_filter :length, &:length
+define_filter :length do |input, params|
+   input.length
+end
 
 # returns the string left justified with the given padding character
-define_filter :ljust do |input, length, *args|
-   padding = args.first || ' '  # Ruby 1.8.x compatibility
+define_filter :ljust do |input, params|
+   length = params[0]
+   padding = params[1] || ' '
    input.ljust(length, padding)
 end
 
 # returns the string right justified with the given padding character
-define_filter :rjust do |input, length, *args|
-   padding = args.first || ' '  # Ruby 1.8.x compatibility
+define_filter :rjust do |input, params|
+   length = params[0]
+   padding = params[1] || ' '
    input.rjust(length, padding)
 end
 
 # returns the string downcased
-define_filter :lower, &:downcase
+define_filter :lower do |input, params|
+   input.downcase
+end
 
 # returns the string upcased
-define_filter :upper, &:upcase
+define_filter :upper do |input, params|
+   input.upcase
+end
 
 # returns the given words wrapped to fit inside the given column width.  Wrapping
 # is done on word boundaries so that no word cutting is done.
 # source: http://www.java2s.com/Code/Ruby/String/WordwrappingLinesofText.htm
-define_filter :wordwrap do |input, length, *args|
-   linefeed = args.first || "\n" # Ruby 1.8.x compatibility
-   input.gsub(/(.{1,#{length}})(\s+|\Z)/, "\\1#{linefeed}")
+define_filter :wordwrap do |input, params|
+   length = params[0]
+   linefeed = params[1] || "\n"
+   input.gsub(/(.{1,#{length}})(\s+|\Z)/, "\\1\n").strip.gsub(/\n/, linefeed)
+end
+
+# returns the string or array reversed
+define_filter :reverse do |input, params|
+   input.reverse
+end
+
+# returns the string or array with the first +length+ items/characters contained
+define_filter :limit do |input, params|
+   length = params.first
+
+   if length > 0
+      input.slice(0..length-1)
+   else
+      input.is_a?(Array) ? [] : ""
+   end
+end
+
+# returns the string or array with all items/characters after the +index+ 
+# item/character (where 1 is the first index, not 0 as programmers are used to)
+define_filter :offset do |input, params|
+   index = params.first
+
+   input.slice(index..-1)
 end
 
+# returns an array of objects with the given identifier looked up on all of the
+# input array elements.
+define_filter :pluck do |input, params|
+   identifier = params.first
+
+   input.map {|item| Cadenza::Context.lookup_on_object(identifier, item) }
+end
+
+alias_filter :pluck, :map
+alias_filter :pluck, :collect
+
+define_filter :sort do |input, params|
+   identifier = params.first
+
+   if identifier
+      input.sort {|a,b| Cadenza::Context.lookup_on_object(identifier, a) <=> Cadenza::Context.lookup_on_object(identifier, b) }
+   else
+      input.sort
+   end
+end

data/lib/cadenza/lexer.rb

@@ -4,9 +4,6 @@ module Cadenza
   # The {Lexer} class accepts in input {IO} object which it will parse simple
   # {Token}s from for use in a {Parser} class.
   class Lexer
-    #TODO: look at using the CodeRay scanner instead, it supports reading from
-    # an IO object (unlike StringScanner which must have a string in memory)
-    # http://coderay.rubychan.de/doc/classes/CodeRay/Scanners/Scanner.html
 
     # constructs a new parser and sets it to the position (0, 0)
     def initialize

data/lib/cadenza/nodes/filter_node.rb

@@ -37,8 +37,7 @@ module Cadenza
       # @param [String] value the input value to filter
       # @return the input value when passed through this evaluated filter
       def evaluate(context, value)
-         params = [value] + @parameters.map {|x| x.eval(context) }
-         context.evaluate_filter(@identifier, params)
+         context.evaluate_filter(@identifier, value, @parameters.map {|x| x.eval(context) })
       end
    end
 end

data/lib/cadenza/nodes/filtered_value_node.rb

@@ -0,0 +1,48 @@
+
+module Cadenza
+   # The {FilteredValueNode} applies a list of passed {FilterNode} to it's value
+   # when evaluated.
+   class FilteredValueNode
+      # @return [Node] the value to be filtered
+      attr_accessor :value
+
+      # @return [Array] a list of {FilterNode} to evaluate the value with, once the
+      #                 value has itself been evaluated.
+      attr_accessor :filters
+
+      # creates a new {FilteredValueNode}.
+      # @param [String] identifier see {#identifier}
+      # @param [Array] filters see {#filters}
+      def initialize(value, filters=[])
+         @value = value
+         @filters = filters
+      end
+      
+      # @return [Array] a list of names which are implied to be global variables
+      #                 from this node.
+      def implied_globals
+         (@value.implied_globals + @filters.map(&:implied_globals).flatten).uniq
+      end
+
+      # @param [Context] context
+      # @return [Object] gets the value and returns it after being passed 
+      #                  through all filters
+      def eval(context)
+         value = @value.eval(context)
+
+         @filters.each {|filter| value = filter.evaluate(context, value) }
+
+         value
+      end
+
+      # @param [FilteredValueNode] rhs
+      # @return [Boolean] if the given {FilteredValueNode} is equivalent by 
+      #                   value to this node.
+      def ==(rhs)
+         self.value == rhs.value && self.filters == rhs.filters
+      end
+
+
+   end
+
+end

data/lib/cadenza/nodes/variable_node.rb

@@ -5,30 +5,43 @@ module Cadenza
       # @return [String] the name given to this variable
       attr_accessor :identifier
 
+      # @return [Array] a list of Node objects passed to the {#value} for use in a
+      #         functional variable.  See {Context#define_functional_variable}.
+      attr_accessor :parameters
+
       # creates a new {VariableNode} with the name given.
       # @param [String] identifier see {#identifier}
-      def initialize(identifier)
+      # @param [Array] parameters see {#parameters}
+      def initialize(identifier, parameters=[])
          @identifier = identifier
+         @parameters = parameters
       end
 
       # @return [Array] a list of names which are implied to be global variables
       #                 from this node.
       def implied_globals
-         [self.identifier]
+         ([self.identifier] + @parameters.map(&:implied_globals).flatten).uniq
       end
 
       # @param [Context] context
       # @return [Object] looks up and returns the value of this variable in the
       #                  given {Context}
       def eval(context)
-         context.lookup(@identifier)
+         value = context.lookup(@identifier)
+
+         if value.is_a? Proc
+           args = parameters.map {|p| p.eval(context) }
+           value = value.call(context, *args)
+         end
+
+         value
       end
       
       # @param [VariableNode] rhs
       # @return [Boolean] if the given {VariableNode} is equivalent by value to
       #                   this node.
       def ==(rhs)
-         self.identifier == rhs.identifier
+         self.identifier == rhs.identifier && self.parameters == rhs.parameters
       end
   end
 end

data/lib/cadenza/racc_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.7
+# This file is automatically generated by Racc 1.4.9
 # from Racc grammer file "".
 #
 
@@ -11,243 +11,241 @@ require 'racc/parser.rb'
 module Cadenza
   class RaccParser < Racc::Parser
 
-module_eval(<<'...end cadenza.y/module_eval...', 'cadenza.y', 229)
+module_eval(<<'...end cadenza.y/module_eval...', 'cadenza.y', 223)
 
 ...end cadenza.y/module_eval...
 ##### State transition tables begin ###
 
 racc_action_table = [
-    38,     3,   111,     4,     3,    38,     4,    55,    23,    24,
-    25,    26,     3,    38,   154,    70,    71,     9,    38,    95,
-     9,    70,    71,    31,   115,    34,   118,    35,     9,    38,
-    34,    36,    35,    79,    37,    93,    36,    39,    34,    37,
-    35,   157,    39,    34,    36,    35,    82,    37,    87,    36,
-    39,    38,    37,    93,    34,    39,    35,    82,    83,     3,
-    36,   155,    38,    37,   136,     3,    39,   129,    70,    71,
-    38,    81,    70,    71,    80,     9,    34,   114,    35,    59,
-    60,     9,    36,    38,    91,    37,   141,    34,    39,    35,
-    61,    62,    87,    36,   133,    34,    37,    35,   144,    39,
-     3,    36,    44,     3,    37,   124,   156,    39,    34,    95,
-    35,    97,    83,    96,    36,    91,     9,    37,   128,     9,
-    39,    55,    23,    24,    25,    26,    55,    23,    24,    25,
-    26,    55,    23,    24,    25,    26,   142,    31,   143,   142,
-    77,   149,    31,     3,     3,    40,    40,    31,    55,    23,
-    24,    25,    26,    55,    23,    24,    25,    26,    76,     9,
-     9,     3,   123,     4,    31,     3,     3,     4,     4,    31,
-    22,    23,    24,    25,    26,   122,     3,     9,     4,    61,
-    62,     9,     9,     3,   121,     4,    31,    55,    23,    24,
-    25,    26,     9,    55,    23,    24,    25,    26,     3,     9,
-     4,   120,     3,    31,   137,     3,   117,   134,   116,    31,
-   111,     3,   152,   129,     9,     3,   111,   129,     9,    61,
-    62,     9,    55,    23,    24,    25,    26,     9,     3,    98,
-   124,     9,     3,     3,   124,    44,    61,    62,    31,    70,
-    71,    70,    71,    73,     9,    72,    59,    60,     9,     9,
-    63,    64,    65,    66,    67,    68,    63,    64,    65,    66,
-    67,    68,    55,    23,    24,    25,    26,    55,    23,    24,
-    25,    26,    55,    23,    24,    25,    26,    55,    23,    24,
-    25,    26,    55,    23,    24,    25,    26,    55,    23,    24,
-    25,    26,    55,    23,    24,    25,    26,    55,    23,    24,
-    25,    26,    55,    23,    24,    25,    26,    55,    23,    24,
-    25,    26,    55,    23,    24,    25,    26,    59,    60,    61,
-    62,    61,    62,    61,    62,    54,    95,    51,    48,    18,
-   158,   159 ]
+    39,    39,    95,   134,     3,   131,   122,    22,    23,    24,
+    25,    26,    70,    71,    39,    72,    61,    62,    81,    39,
+     9,    80,   126,    31,    35,    35,    36,    36,   116,    83,
+    37,    37,    39,    38,    38,   152,    40,    40,    35,   121,
+    36,    82,    83,    35,    37,    36,    39,    38,    87,    37,
+    40,   120,    38,   119,    39,    40,    35,   138,    36,    39,
+   139,     3,    37,   135,   118,    38,   115,    39,    40,   114,
+    35,   109,    36,    82,    96,    87,    37,     9,    35,    38,
+    36,    95,    40,    35,    37,    36,    93,    38,    93,    37,
+    40,    35,    38,    36,   151,    40,     3,    37,   132,    91,
+    38,    70,    71,    40,    22,    23,    24,    25,    26,     3,
+    91,   127,     9,    77,     3,    76,   127,   109,    70,    71,
+    31,    61,    62,    61,    62,     9,   112,    59,    60,    79,
+     9,    22,    23,    24,    25,    26,    22,    23,    24,    25,
+    26,    22,    23,    24,    25,    26,   147,    31,    70,    71,
+    61,    62,    31,    70,    71,    73,   113,    31,    22,    23,
+    24,    25,    26,    22,    23,    24,    25,    26,    22,    23,
+    24,    25,    26,     3,    31,   122,     3,    55,   149,    31,
+     3,     3,    41,     4,    31,     3,     3,   150,    45,     9,
+    95,     3,     9,     4,    61,    62,     9,     9,     3,    52,
+    45,     9,     9,     3,     3,     4,    41,     9,     3,    49,
+     4,    61,    62,    18,     9,     3,   153,   127,   154,     9,
+     9,     3,   nil,     4,     9,    22,    23,    24,    25,    26,
+   nil,     9,    22,    23,    24,    25,    26,     9,     3,   nil,
+     4,    31,     3,     3,     4,   122,    59,    60,    31,    22,
+    23,    24,    25,    26,     9,     3,   nil,     4,     9,     9,
+    22,    23,    24,    25,    26,    31,    22,    23,    24,    25,
+    26,     9,    63,    64,    65,    66,    67,    68,    63,    64,
+    65,    66,    67,    68,    22,    23,    24,    25,    26,    22,
+    23,    24,    25,    26,    22,    23,    24,    25,    26,    22,
+    23,    24,    25,    26,    22,    23,    24,    25,    26,    22,
+    23,    24,    25,    26,    22,    23,    24,    25,    26,    22,
+    23,    24,    25,    26,    22,    23,    24,    25,    26,    59,
+    60,    61,    62 ]
 
 racc_action_check = [
-   137,     0,    97,     0,   145,   155,   145,    38,    38,    38,
-    38,    38,   146,     4,   146,    75,    75,     0,    44,    78,
-   145,    56,    56,    38,    75,   137,    78,   137,   146,    40,
-   155,   137,   155,    38,   137,   137,   155,   137,     4,   155,
-     4,   155,   155,    44,     4,    44,    44,     4,    44,    44,
-     4,   134,    44,    51,    40,    44,    40,    40,    40,   153,
-    40,   153,   129,    40,    93,   131,    40,   131,    74,    74,
-   154,    39,   139,   139,    39,   153,   134,    74,   134,    28,
-    28,   131,   134,   124,   134,   134,   111,   129,   134,   129,
-   108,   108,   129,   129,    91,   154,   129,   154,   116,   129,
-     6,   154,     6,   126,   154,   126,   154,   154,   124,    57,
-   124,    57,   124,    57,   124,    48,     6,   124,    87,   126,
-   124,    26,    26,    26,    26,    26,   141,   141,   141,   141,
-   141,    34,    34,    34,    34,    34,   113,    26,   113,   140,
-    37,   140,   141,     5,    42,     5,    42,    34,    35,    35,
-    35,    35,    35,    22,    22,    22,    22,    22,    36,     5,
-    42,    43,    83,    43,    35,     2,    47,     2,    47,    22,
-     3,     3,     3,     3,     3,    82,   119,    43,   119,    29,
-    29,     2,    47,    50,    81,    50,     3,    70,    70,    70,
-    70,    70,   119,    95,    95,    95,    95,    95,    53,    50,
-    53,    80,    94,    70,    94,    92,    77,    92,    76,    95,
-   142,    90,   144,    90,    53,    89,    73,    89,    94,   107,
-   107,    92,    71,    71,    71,    71,    71,    90,    86,    58,
-    86,    89,    85,    46,    85,    46,   106,   106,    71,    33,
-    33,    58,    58,    33,    86,    33,   101,   101,    85,    46,
-    30,    30,    30,    30,    30,    30,    69,    69,    69,    69,
-    69,    69,    63,    63,    63,    63,    63,    64,    64,    64,
-    64,    64,    65,    65,    65,    65,    65,    59,    59,    59,
-    59,    59,    60,    60,    60,    60,    60,    66,    66,    66,
-    66,    66,    61,    61,    61,    61,    61,    68,    68,    68,
-    68,    68,    31,    31,    31,    31,    31,    67,    67,    67,
-    67,    67,    62,    62,    62,    62,    62,   102,   102,   105,
-   105,   104,   104,   103,   103,    18,   150,     8,     7,     1,
-   156,   157 ]
+   150,   122,    78,    93,    86,    91,    86,    95,    95,    95,
+    95,    95,    33,    33,    41,    33,   106,   106,    40,   127,
+    86,    40,    87,    95,   150,   122,   150,   122,    78,   122,
+   150,   122,     4,   150,   122,   150,   150,   122,    41,    83,
+    41,    41,    41,   127,    41,   127,    45,    41,   127,   127,
+    41,    82,   127,    81,   135,   127,     4,   109,     4,   149,
+   111,    94,     4,    94,    80,     4,    77,   132,     4,    76,
+    45,    72,    45,    45,    58,    45,    45,    94,   135,    45,
+   135,    57,    45,   149,   135,   149,    52,   135,   135,   149,
+   135,   132,   149,   132,   149,   149,    92,   132,    92,   132,
+   132,   137,   137,   132,    39,    39,    39,    39,    39,    90,
+    49,    90,    92,    38,    89,    37,    89,   139,    74,    74,
+    39,   103,   103,   105,   105,    90,    74,   100,   100,    39,
+    89,    70,    70,    70,    70,    70,    35,    35,    35,    35,
+    35,    36,    36,    36,    36,    36,   140,    70,    75,    75,
+   102,   102,    35,    56,    56,    34,    75,    36,   138,   138,
+   138,   138,   138,    26,    26,    26,    26,    26,    22,    22,
+    22,    22,    22,    85,   138,    85,   142,    18,   142,    26,
+    43,    44,    43,    44,    22,   148,    47,   148,    47,    85,
+   145,    48,   142,    48,   101,   101,    43,    44,     6,     8,
+     6,   148,    47,    51,     5,    51,     5,    48,    54,     7,
+    54,    29,    29,     1,     6,   129,   151,   129,   152,    51,
+     5,     2,   nil,     2,    54,   114,   114,   114,   114,   114,
+   nil,   129,     3,     3,     3,     3,     3,     2,   117,   nil,
+   117,   114,     0,   124,     0,   124,    28,    28,     3,    71,
+    71,    71,    71,    71,   117,   141,   nil,   141,     0,   124,
+    65,    65,    65,    65,    65,    71,    64,    64,    64,    64,
+    64,   141,    30,    30,    30,    30,    30,    30,    69,    69,
+    69,    69,    69,    69,    63,    63,    63,    63,    63,    62,
+    62,    62,    62,    62,    68,    68,    68,    68,    68,    67,
+    67,    67,    67,    67,    61,    61,    61,    61,    61,    31,
+    31,    31,    31,    31,    59,    59,    59,    59,    59,    66,
+    66,    66,    66,    66,    60,    60,    60,    60,    60,    99,
+    99,   104,   104 ]
 
 racc_action_pointer = [
-   -23,   329,   141,   168,    11,   119,    76,   302,   301,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   325,   nil,
-   nil,   nil,   151,   nil,   nil,   nil,   119,   nil,    71,   169,
-   238,   300,   nil,   220,   129,   146,   156,   138,     5,    69,
-    27,   nil,   120,   137,    16,   nil,   209,   142,    80,   nil,
-   159,    16,   nil,   174,   nil,   nil,     2,    88,   222,   275,
-   280,   290,   310,   260,   265,   270,   285,   305,   295,   244,
-   185,   220,   nil,   214,    49,    -4,   174,   178,    -2,   nil,
-   173,   156,   147,   134,   nil,   208,   204,    90,   nil,   191,
-   187,    66,   181,    36,   178,   191,   nil,     0,   nil,   nil,
-   nil,   238,   309,   313,   311,   309,   226,   209,    80,   nil,
-   nil,    64,   nil,   113,   nil,   nil,    96,   nil,   nil,   152,
-   nil,   nil,   nil,   nil,    81,   nil,    79,   nil,   nil,    60,
-   nil,    41,   nil,   nil,    49,   nil,   nil,    -2,   nil,    53,
-   116,   124,   208,   nil,   184,   -20,   -12,   nil,   nil,   nil,
-   305,   nil,   nil,    35,    68,     3,   302,   303,   nil,   nil ]
+   218,   213,   197,   229,    29,   180,   174,   183,   173,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   177,   nil,
+   nil,   nil,   165,   nil,   nil,   nil,   160,   nil,   237,   200,
+   259,   306,   nil,    -8,   130,   133,   138,   112,   110,   101,
+    15,    11,   nil,   156,   157,    43,   nil,   162,   167,    75,
+   nil,   179,    49,   nil,   184,   nil,   133,    79,    66,   311,
+   321,   301,   286,   281,   263,   257,   316,   296,   291,   265,
+   128,   246,    68,   nil,    98,   128,    35,    38,     0,   nil,
+    36,    25,    23,    11,   nil,   149,   -20,    -6,   nil,    90,
+    85,   -23,    72,   -25,    37,     4,   nil,   nil,   nil,   320,
+   118,   183,   139,   110,   320,   112,     5,   nil,   nil,    35,
+   nil,    37,   nil,   nil,   222,   nil,   nil,   214,   nil,   nil,
+   nil,   nil,    -2,   nil,   219,   nil,   nil,    16,   nil,   191,
+   nil,   nil,    64,   nil,   nil,    51,   nil,    81,   155,   114,
+   118,   231,   152,   nil,   nil,   188,   nil,   nil,   161,    56,
+    -3,   188,   190,   nil,   nil ]
 
 racc_action_default = [
     -2,   -79,    -1,   -79,   -79,   -79,   -79,   -54,   -59,   -67,
    -68,   -69,   -70,   -71,   -72,   -73,   -75,   -77,   -79,   -74,
-   -76,   -78,    -3,    -4,    -5,    -6,   -79,    -8,   -11,   -14,
-   -21,   -79,   -23,   -79,   -79,   -79,   -79,   -79,   -79,   -79,
-   -79,   -41,   -79,   -79,   -79,   -46,   -79,   -79,   -79,   -53,
-   -79,   -79,   -58,   -79,   160,    -3,   -26,   -79,   -79,   -79,
-   -79,   -79,   -79,   -79,   -79,   -79,   -79,   -79,   -79,   -22,
-   -79,   -79,   -32,   -79,   -79,   -79,   -79,   -79,   -79,   -61,
+   -76,   -78,    -5,    -7,    -8,    -9,   -79,   -11,   -14,   -17,
+   -24,   -79,   -26,   -33,   -79,   -79,   -79,   -79,   -79,   -79,
+   -79,   -79,   -41,   -79,   -79,   -79,   -46,   -79,   -79,   -79,
+   -53,   -79,   -79,   -58,   -79,   155,    -3,    -6,   -79,   -79,
+   -79,   -79,   -79,   -79,   -79,   -79,   -79,   -79,   -79,   -25,
+   -79,   -79,   -79,   -35,   -79,   -79,   -79,   -79,   -79,   -61,
    -79,   -79,   -79,   -79,   -42,   -79,   -79,   -79,   -47,   -79,
-   -79,   -79,   -79,   -79,   -79,   -79,   -34,   -79,    -7,    -9,
-   -10,   -12,   -13,   -15,   -16,   -17,   -18,   -19,   -20,   -24,
-   -25,   -28,   -30,   -79,   -36,   -37,   -79,   -56,   -63,   -79,
-   -65,   -66,   -38,   -39,   -79,   -44,   -79,   -43,   -40,   -79,
-   -49,   -79,   -48,   -52,   -79,   -55,   -57,   -79,   -60,   -27,
-   -79,   -79,   -79,   -33,   -79,   -79,   -79,   -45,   -50,   -35,
-   -29,   -31,   -51,   -79,   -79,   -79,   -79,   -79,   -62,   -64 ]
+   -79,   -79,   -79,   -79,   -79,   -79,   -10,   -12,   -13,   -15,
+   -16,   -18,   -19,   -20,   -21,   -22,   -23,   -27,   -28,   -29,
+   -31,   -34,   -36,   -37,   -79,   -56,   -63,   -79,   -65,   -66,
+   -38,   -39,   -79,   -44,   -79,   -43,   -40,   -79,   -49,   -79,
+   -48,   -52,   -79,   -55,   -57,   -79,   -60,    -4,   -79,   -79,
+   -79,   -79,   -79,   -45,   -50,   -30,   -32,   -51,   -79,   -79,
+   -79,   -79,   -79,   -62,   -64 ]
 
 racc_goto_table = [
-    19,    21,    41,    45,    33,    43,    47,    57,   113,    52,
-    20,    50,     2,    69,    49,    99,   100,    42,    46,   109,
-   110,   101,   102,    78,    53,   119,   145,    58,   151,     1,
-   nil,   nil,   140,   nil,   nil,    74,    75,   nil,   nil,    84,
-    19,    21,    85,    88,    19,    21,    89,   nil,   nil,   nil,
-    20,   nil,   nil,   nil,    20,    86,   nil,   nil,   nil,    90,
-   nil,   nil,    92,   nil,   nil,    94,   103,   104,   105,   106,
-   107,   108,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   125,   127,    19,    21,   130,   132,    19,    21,
-    19,    21,    19,    21,    20,   138,   139,   126,    20,   135,
-    20,   131,    20,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   147,    19,    21,   150,   nil,   148,    19,
-    21,   146,   nil,   nil,    20,   nil,   nil,   nil,   nil,    20,
-   nil,   nil,   nil,   nil,    19,    21,   nil,   nil,   nil,   nil,
-   nil,    19,    21,   nil,    20,   nil,   nil,   153,   nil,   nil,
-   nil,    20 ]
+    19,    20,    42,    46,    57,    34,   110,    97,    98,   111,
+    21,    50,     2,    53,    51,    44,    48,    43,    47,   107,
+   108,    78,    56,    99,   100,    54,   117,   141,    58,   101,
+   102,   103,   104,   105,   106,    74,    75,    69,     1,    56,
+    84,    19,    20,   nil,    88,    19,    20,   nil,   nil,   nil,
+   nil,    21,   nil,    85,   nil,    21,    86,    89,   nil,   nil,
+    90,   nil,   nil,    92,   nil,   nil,    94,   nil,   nil,   nil,
+   nil,   nil,   nil,   146,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   123,   125,    19,    20,   128,   130,    19,    20,
+    19,    20,    19,    20,    21,   137,   133,   124,    21,   136,
+    21,   129,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   140,   nil,   nil,   nil,
+   145,   143,    19,    20,   nil,   nil,   144,    19,    20,   142,
+   nil,   nil,    21,   nil,   nil,   nil,   nil,    21,    56,   nil,
+    19,    20,   nil,   nil,   nil,   nil,    19,    20,   nil,   nil,
+    21,   nil,   nil,   148,   nil,   nil,    21 ]
 
 racc_goto_check = [
-    32,    26,    16,    17,     4,    15,    15,     9,    11,    25,
-    31,    23,     2,     7,    21,     3,     3,     2,     2,     8,
-     8,     5,     5,     9,    27,    29,    30,     4,    10,     1,
-   nil,   nil,    11,   nil,   nil,     4,     4,   nil,   nil,    16,
-    32,    26,    15,    17,    32,    26,    15,   nil,   nil,   nil,
-    31,   nil,   nil,   nil,    31,     2,   nil,   nil,   nil,     2,
-   nil,   nil,     2,   nil,   nil,     2,     6,     6,     6,     6,
-     6,     6,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    16,    16,    32,    26,    17,    17,    32,    26,
-    32,    26,    32,    26,    31,    25,     4,     2,    31,    21,
-    31,     2,    31,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    16,    32,    26,     9,   nil,    17,    32,
-    26,     2,   nil,   nil,    31,   nil,   nil,   nil,   nil,    31,
-   nil,   nil,   nil,   nil,    32,    26,   nil,   nil,   nil,   nil,
-   nil,    32,    26,   nil,    31,   nil,   nil,     2,   nil,   nil,
-   nil,    31 ]
+    33,    32,    17,    18,     3,     6,    11,     5,     5,    12,
+    27,    22,     2,    26,    24,    16,    16,     2,     2,    10,
+    10,     3,     4,     7,     7,    28,    30,    31,     6,     8,
+     8,     8,     8,     8,     8,     4,     4,     9,     1,     4,
+    17,    33,    32,   nil,    18,    33,    32,   nil,   nil,   nil,
+   nil,    27,   nil,    16,   nil,    27,     2,    16,   nil,   nil,
+     2,   nil,   nil,     2,   nil,   nil,     2,   nil,   nil,   nil,
+   nil,   nil,   nil,    11,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    17,    17,    33,    32,    18,    18,    33,    32,
+    33,    32,    33,    32,    27,     4,    22,     2,    27,    26,
+    27,     2,    27,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     6,   nil,   nil,   nil,
+     3,    17,    33,    32,   nil,   nil,    18,    33,    32,     2,
+   nil,   nil,    27,   nil,   nil,   nil,   nil,    27,     4,   nil,
+    33,    32,   nil,   nil,   nil,   nil,    33,    32,   nil,   nil,
+    27,   nil,   nil,     2,   nil,   nil,    27 ]
 
 racc_goto_pointer = [
-   nil,    29,    12,   -44,     1,   -40,     3,   -18,   -51,   -15,
-  -114,   -65,   nil,   nil,   nil,     0,    -3,    -3,   nil,   nil,
-   nil,     7,   nil,     4,   nil,     1,    -1,    16,   nil,   -54,
-   -92,     8,    -2 ]
+   nil,    38,    12,   -18,     0,   -52,     2,   -38,   -34,     6,
+   -51,   -66,   -63,   nil,   nil,   nil,    10,    -3,    -3,   nil,
+   nil,   nil,     4,   nil,     7,   nil,     5,     8,    17,   nil,
+   -53,   -89,    -1,    -2 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,    27,    56,    28,    29,    30,    32,   nil,
-   112,   nil,    10,     5,     6,   nil,   nil,   nil,    11,    12,
-     7,   nil,    13,   nil,     8,   nil,    17,   nil,    14,   nil,
-   nil,    16,    15 ]
+   nil,   nil,   nil,   nil,    33,    27,   nil,    28,    29,    30,
+    32,   nil,   nil,    10,     5,     6,   nil,   nil,   nil,    11,
+    12,     7,   nil,    13,   nil,     8,   nil,    17,   nil,    14,
+   nil,   nil,    16,    15 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
   1, 42, :_reduce_none,
   0, 42, :_reduce_2,
   1, 44, :_reduce_3,
-  1, 44, :_reduce_4,
-  1, 44, :_reduce_5,
-  1, 44, :_reduce_6,
-  3, 44, :_reduce_7,
-  1, 46, :_reduce_none,
-  3, 46, :_reduce_9,
+  3, 44, :_reduce_4,
+  1, 46, :_reduce_5,
+  2, 46, :_reduce_6,
+  1, 46, :_reduce_7,
+  1, 46, :_reduce_8,
+  1, 46, :_reduce_9,
   3, 46, :_reduce_10,
-  1, 47, :_reduce_none,
-  3, 47, :_reduce_12,
-  3, 47, :_reduce_13,
   1, 48, :_reduce_none,
-  3, 48, :_reduce_15,
-  3, 48, :_reduce_16,
-  3, 48, :_reduce_17,
-  3, 48, :_reduce_18,
-  3, 48, :_reduce_19,
-  3, 48, :_reduce_20,
+  3, 48, :_reduce_12,
+  3, 48, :_reduce_13,
   1, 49, :_reduce_none,
-  2, 49, :_reduce_22,
+  3, 49, :_reduce_15,
+  3, 49, :_reduce_16,
+  1, 50, :_reduce_none,
+  3, 50, :_reduce_18,
+  3, 50, :_reduce_19,
+  3, 50, :_reduce_20,
+  3, 50, :_reduce_21,
+  3, 50, :_reduce_22,
+  3, 50, :_reduce_23,
+  1, 51, :_reduce_none,
+  2, 51, :_reduce_25,
   1, 45, :_reduce_none,
-  3, 45, :_reduce_24,
-  3, 45, :_reduce_25,
-  1, 50, :_reduce_26,
-  3, 50, :_reduce_27,
-  1, 51, :_reduce_28,
-  3, 51, :_reduce_29,
-  1, 52, :_reduce_30,
-  3, 52, :_reduce_31,
+  3, 45, :_reduce_27,
+  3, 45, :_reduce_28,
+  1, 52, :_reduce_29,
+  3, 52, :_reduce_30,
+  1, 53, :_reduce_31,
   3, 53, :_reduce_32,
-  5, 53, :_reduce_33,
-  4, 53, :_reduce_34,
-  6, 53, :_reduce_35,
-  4, 54, :_reduce_36,
-  4, 55, :_reduce_37,
-  3, 56, :_reduce_38,
-  3, 57, :_reduce_none,
+  1, 47, :_reduce_none,
+  3, 47, :_reduce_34,
+  3, 54, :_reduce_35,
+  4, 55, :_reduce_36,
+  4, 56, :_reduce_37,
+  3, 57, :_reduce_38,
   3, 58, :_reduce_none,
-  2, 59, :_reduce_41,
-  3, 59, :_reduce_42,
-  4, 59, :_reduce_43,
-  4, 59, :_reduce_44,
-  5, 59, :_reduce_45,
-  2, 60, :_reduce_46,
-  3, 60, :_reduce_47,
-  4, 60, :_reduce_48,
-  4, 60, :_reduce_49,
-  5, 60, :_reduce_50,
-  6, 61, :_reduce_51,
-  3, 62, :_reduce_none,
-  2, 63, :_reduce_53,
-  0, 64, :_reduce_54,
-  4, 63, :_reduce_55,
-  4, 65, :_reduce_56,
-  3, 66, :_reduce_none,
-  2, 67, :_reduce_58,
-  0, 68, :_reduce_59,
-  4, 67, :_reduce_60,
-  0, 70, :_reduce_61,
-  8, 69, :_reduce_62,
-  0, 71, :_reduce_63,
-  9, 69, :_reduce_64,
-  4, 72, :_reduce_65,
-  4, 72, :_reduce_66,
-  1, 73, :_reduce_67,
-  1, 73, :_reduce_none,
-  1, 73, :_reduce_none,
-  1, 73, :_reduce_none,
-  1, 73, :_reduce_none,
-  1, 73, :_reduce_none,
+  3, 59, :_reduce_none,
+  2, 60, :_reduce_41,
+  3, 60, :_reduce_42,
+  4, 60, :_reduce_43,
+  4, 60, :_reduce_44,
+  5, 60, :_reduce_45,
+  2, 61, :_reduce_46,
+  3, 61, :_reduce_47,
+  4, 61, :_reduce_48,
+  4, 61, :_reduce_49,
+  5, 61, :_reduce_50,
+  6, 62, :_reduce_51,
+  3, 63, :_reduce_none,
+  2, 64, :_reduce_53,
+  0, 65, :_reduce_54,
+  4, 64, :_reduce_55,
+  4, 66, :_reduce_56,
+  3, 67, :_reduce_none,
+  2, 68, :_reduce_58,
+  0, 69, :_reduce_59,
+  4, 68, :_reduce_60,
+  0, 71, :_reduce_61,
+  8, 70, :_reduce_62,
+  0, 72, :_reduce_63,
+  9, 70, :_reduce_64,
+  4, 73, :_reduce_65,
+  4, 73, :_reduce_66,
+  1, 74, :_reduce_67,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
+  1, 74, :_reduce_none,
   1, 43, :_reduce_73,
   2, 43, :_reduce_74,
   1, 43, :_reduce_75,
@@ -257,31 +255,31 @@ racc_reduce_table = [
 
 racc_reduce_n = 79
 
-racc_shift_n = 160
+racc_shift_n = 155
 
 racc_token_table = {
   false => 0,
   :error => 1,
-  :IDENTIFIER => 2,
-  :INTEGER => 3,
-  :REAL => 4,
-  :STRING => 5,
-  "(" => 6,
-  ")" => 7,
-  "*" => 8,
-  "/" => 9,
-  "+" => 10,
-  "-" => 11,
-  :OP_EQ => 12,
-  :OP_NEQ => 13,
-  :OP_LEQ => 14,
-  :OP_GEQ => 15,
-  ">" => 16,
-  "<" => 17,
-  :NOT => 18,
-  :AND => 19,
-  :OR => 20,
-  "," => 21,
+  "," => 2,
+  :IDENTIFIER => 3,
+  :INTEGER => 4,
+  :REAL => 5,
+  :STRING => 6,
+  "(" => 7,
+  ")" => 8,
+  "*" => 9,
+  "/" => 10,
+  "+" => 11,
+  "-" => 12,
+  :OP_EQ => 13,
+  :OP_NEQ => 14,
+  :OP_LEQ => 15,
+  :OP_GEQ => 16,
+  ">" => 17,
+  "<" => 18,
+  :NOT => 19,
+  :AND => 20,
+  :OR => 21,
   ":" => 22,
   "|" => 23,
   :VAR_OPEN => 24,
@@ -325,6 +323,7 @@ Racc_arg = [
 Racc_token_to_s_table = [
   "$end",
   "error",
+  "\",\"",
   "IDENTIFIER",
   "INTEGER",
   "REAL",
@@ -344,7 +343,6 @@ Racc_token_to_s_table = [
   "NOT",
   "AND",
   "OR",
-  "\",\"",
   "\":\"",
   "\"|\"",
   "VAR_OPEN",
@@ -367,13 +365,14 @@ Racc_token_to_s_table = [
   "$start",
   "target",
   "document",
-  "primary_expression",
+  "parameter_list",
   "logical_expression",
+  "primary_expression",
+  "filtered_expression",
   "multiplicative_expression",
   "additive_expression",
   "boolean_expression",
   "inverse_expression",
-  "parameter_list",
   "filter",
   "filter_list",
   "inject_statement",
@@ -415,215 +414,206 @@ module_eval(<<'.,.,', 'cadenza.y', 8)
 
 module_eval(<<'.,.,', 'cadenza.y', 12)
   def _reduce_3(val, _values, result)
-     result = VariableNode.new(val[0].value) 
+     result = [val[0]] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'cadenza.y', 13)
   def _reduce_4(val, _values, result)
-     result = ConstantNode.new(val[0].value) 
+     result = val[0].push(val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 14)
+module_eval(<<'.,.,', 'cadenza.y', 18)
   def _reduce_5(val, _values, result)
-     result = ConstantNode.new(val[0].value) 
+     result = VariableNode.new(val[0].value) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 15)
+module_eval(<<'.,.,', 'cadenza.y', 19)
   def _reduce_6(val, _values, result)
-     result = ConstantNode.new(val[0].value) 
+     result = VariableNode.new(val[0].value, val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 16)
+module_eval(<<'.,.,', 'cadenza.y', 20)
   def _reduce_7(val, _values, result)
-     result = val[1] 
+     result = ConstantNode.new(val[0].value) 
     result
   end
 .,.,
 
-# reduce 8 omitted
-
 module_eval(<<'.,.,', 'cadenza.y', 21)
-  def _reduce_9(val, _values, result)
-     result = OperationNode.new(val[0], "*", val[2]) 
+  def _reduce_8(val, _values, result)
+     result = ConstantNode.new(val[0].value) 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'cadenza.y', 22)
+  def _reduce_9(val, _values, result)
+     result = ConstantNode.new(val[0].value) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'cadenza.y', 23)
   def _reduce_10(val, _values, result)
-     result = OperationNode.new(val[0], "/", val[2]) 
+     result = val[1] 
     result
   end
 .,.,
 
 # reduce 11 omitted
 
-module_eval(<<'.,.,', 'cadenza.y', 27)
+module_eval(<<'.,.,', 'cadenza.y', 28)
   def _reduce_12(val, _values, result)
-     result = OperationNode.new(val[0], "+", val[2]) 
+     result = OperationNode.new(val[0], "*", val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 28)
+module_eval(<<'.,.,', 'cadenza.y', 29)
   def _reduce_13(val, _values, result)
-     result = OperationNode.new(val[0], "-", val[2]) 
+     result = OperationNode.new(val[0], "/", val[2]) 
     result
   end
 .,.,
 
 # reduce 14 omitted
 
-module_eval(<<'.,.,', 'cadenza.y', 33)
+module_eval(<<'.,.,', 'cadenza.y', 34)
   def _reduce_15(val, _values, result)
-     result = OperationNode.new(val[0], "==", val[2]) 
+     result = OperationNode.new(val[0], "+", val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 34)
+module_eval(<<'.,.,', 'cadenza.y', 35)
   def _reduce_16(val, _values, result)
-     result = OperationNode.new(val[0], "!=", val[2]) 
+     result = OperationNode.new(val[0], "-", val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 35)
-  def _reduce_17(val, _values, result)
-     result = OperationNode.new(val[0], "<=", val[2]) 
-    result
-  end
-.,.,
+# reduce 17 omitted
 
-module_eval(<<'.,.,', 'cadenza.y', 36)
+module_eval(<<'.,.,', 'cadenza.y', 40)
   def _reduce_18(val, _values, result)
-     result = OperationNode.new(val[0], ">=", val[2]) 
+     result = OperationNode.new(val[0], "==", val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 37)
+module_eval(<<'.,.,', 'cadenza.y', 41)
   def _reduce_19(val, _values, result)
-     result = OperationNode.new(val[0], ">", val[2]) 
+     result = OperationNode.new(val[0], "!=", val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 38)
+module_eval(<<'.,.,', 'cadenza.y', 42)
   def _reduce_20(val, _values, result)
-     result = OperationNode.new(val[0], "<", val[2]) 
+     result = OperationNode.new(val[0], "<=", val[2]) 
     result
   end
 .,.,
 
-# reduce 21 omitted
-
 module_eval(<<'.,.,', 'cadenza.y', 43)
-  def _reduce_22(val, _values, result)
-     result = BooleanInverseNode.new(val[1]) 
+  def _reduce_21(val, _values, result)
+     result = OperationNode.new(val[0], ">=", val[2]) 
     result
   end
 .,.,
 
-# reduce 23 omitted
-
-module_eval(<<'.,.,', 'cadenza.y', 48)
-  def _reduce_24(val, _values, result)
-     result = OperationNode.new(val[0], "and", val[2]) 
+module_eval(<<'.,.,', 'cadenza.y', 44)
+  def _reduce_22(val, _values, result)
+     result = OperationNode.new(val[0], ">", val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 49)
-  def _reduce_25(val, _values, result)
-     result = OperationNode.new(val[0], "or", val[2]) 
+module_eval(<<'.,.,', 'cadenza.y', 45)
+  def _reduce_23(val, _values, result)
+     result = OperationNode.new(val[0], "<", val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 53)
-  def _reduce_26(val, _values, result)
-     result = [val[0]] 
+# reduce 24 omitted
+
+module_eval(<<'.,.,', 'cadenza.y', 50)
+  def _reduce_25(val, _values, result)
+     result = BooleanInverseNode.new(val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 54)
+# reduce 26 omitted
+
+module_eval(<<'.,.,', 'cadenza.y', 55)
   def _reduce_27(val, _values, result)
-     result = val[0].push(val[2]) 
+     result = OperationNode.new(val[0], "and", val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 58)
+module_eval(<<'.,.,', 'cadenza.y', 56)
   def _reduce_28(val, _values, result)
-     result = FilterNode.new(val[0].value) 
+     result = OperationNode.new(val[0], "or", val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 59)
+module_eval(<<'.,.,', 'cadenza.y', 60)
   def _reduce_29(val, _values, result)
-     result = FilterNode.new(val[0].value, val[2]) 
+     result = FilterNode.new(val[0].value) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 63)
+module_eval(<<'.,.,', 'cadenza.y', 61)
   def _reduce_30(val, _values, result)
-     result = [val[0]] 
+     result = FilterNode.new(val[0].value, val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 64)
+module_eval(<<'.,.,', 'cadenza.y', 65)
   def _reduce_31(val, _values, result)
-     result = val[0].push(val[2]) 
+     result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 69)
+module_eval(<<'.,.,', 'cadenza.y', 66)
   def _reduce_32(val, _values, result)
-     result = InjectNode.new(val[1]) 
+     result = val[0].push(val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 71)
-  def _reduce_33(val, _values, result)
-     result = InjectNode.new(val[1], val[3]) 
-    result
-  end
-.,.,
+# reduce 33 omitted
 
-module_eval(<<'.,.,', 'cadenza.y', 74)
+module_eval(<<'.,.,', 'cadenza.y', 71)
   def _reduce_34(val, _values, result)
-            variable = VariableNode.new(val[1].value)
-        result = InjectNode.new(variable, [], val[2])
-      
+     result = FilteredValueNode.new(val[0], val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 79)
+module_eval(<<'.,.,', 'cadenza.y', 75)
   def _reduce_35(val, _values, result)
-            variable = VariableNode.new(val[1].value)
-        result = InjectNode.new(variable, val[4], val[2])
-      
+     result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 87)
+module_eval(<<'.,.,', 'cadenza.y', 81)
   def _reduce_36(val, _values, result)
             @stack.push DocumentNode.new
         result = val[2]
@@ -632,7 +622,7 @@ module_eval(<<'.,.,', 'cadenza.y', 87)
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 95)
+module_eval(<<'.,.,', 'cadenza.y', 89)
   def _reduce_37(val, _values, result)
             @stack.push DocumentNode.new
         result = BooleanInverseNode.new(val[2])
@@ -641,7 +631,7 @@ module_eval(<<'.,.,', 'cadenza.y', 95)
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 101)
+module_eval(<<'.,.,', 'cadenza.y', 95)
   def _reduce_38(val, _values, result)
      @stack.push DocumentNode.new 
     result
@@ -652,21 +642,21 @@ module_eval(<<'.,.,', 'cadenza.y', 101)
 
 # reduce 40 omitted
 
-module_eval(<<'.,.,', 'cadenza.y', 113)
+module_eval(<<'.,.,', 'cadenza.y', 107)
   def _reduce_41(val, _values, result)
      @stack.pop; result = IfNode.new(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 114)
+module_eval(<<'.,.,', 'cadenza.y', 108)
   def _reduce_42(val, _values, result)
      result = IfNode.new(val[0], @stack.pop.children) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 117)
+module_eval(<<'.,.,', 'cadenza.y', 111)
   def _reduce_43(val, _values, result)
             false_children, true_children = @stack.pop.children, @stack.pop.children
         result = IfNode.new(val[0], true_children, false_children)
@@ -675,7 +665,7 @@ module_eval(<<'.,.,', 'cadenza.y', 117)
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 122)
+module_eval(<<'.,.,', 'cadenza.y', 116)
   def _reduce_44(val, _values, result)
             false_children, true_children = @stack.pop.children, @stack.pop.children
         result = IfNode.new(val[0], true_children, false_children)
@@ -684,7 +674,7 @@ module_eval(<<'.,.,', 'cadenza.y', 122)
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 127)
+module_eval(<<'.,.,', 'cadenza.y', 121)
   def _reduce_45(val, _values, result)
             false_children, true_children = @stack.pop.children, @stack.pop.children
         result = IfNode.new(val[0], true_children, false_children)
@@ -693,21 +683,21 @@ module_eval(<<'.,.,', 'cadenza.y', 127)
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 133)
+module_eval(<<'.,.,', 'cadenza.y', 127)
   def _reduce_46(val, _values, result)
      @stack.pop; result = IfNode.new(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 134)
+module_eval(<<'.,.,', 'cadenza.y', 128)
   def _reduce_47(val, _values, result)
      result = IfNode.new(val[0], @stack.pop.children) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 137)
+module_eval(<<'.,.,', 'cadenza.y', 131)
   def _reduce_48(val, _values, result)
             false_children, true_children = @stack.pop.children, @stack.pop.children
         result = IfNode.new(val[0], true_children, false_children)
@@ -716,7 +706,7 @@ module_eval(<<'.,.,', 'cadenza.y', 137)
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 142)
+module_eval(<<'.,.,', 'cadenza.y', 136)
   def _reduce_49(val, _values, result)
             false_children, true_children = @stack.pop.children, @stack.pop.children
         result = IfNode.new(val[0], true_children, false_children)
@@ -725,7 +715,7 @@ module_eval(<<'.,.,', 'cadenza.y', 142)
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 147)
+module_eval(<<'.,.,', 'cadenza.y', 141)
   def _reduce_50(val, _values, result)
             false_children, true_children = @stack.pop.children, @stack.pop.children
         result = IfNode.new(val[0], true_children, false_children)
@@ -734,19 +724,19 @@ module_eval(<<'.,.,', 'cadenza.y', 147)
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 153)
+module_eval(<<'.,.,', 'cadenza.y', 147)
   def _reduce_51(val, _values, result)
-     result = [val[2].value, val[4].value] 
+     result = [val[2].value, val[4]] 
     result
   end
 .,.,
 
 # reduce 52 omitted
 
-module_eval(<<'.,.,', 'cadenza.y', 164)
+module_eval(<<'.,.,', 'cadenza.y', 158)
   def _reduce_53(val, _values, result)
             iterator = VariableNode.new(val[0][0])
-        iterable = VariableNode.new(val[0][1])
+        iterable = val[0][1]
         
         result = ForNode.new(iterator, iterable, [])      
       
@@ -754,17 +744,17 @@ module_eval(<<'.,.,', 'cadenza.y', 164)
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 169)
+module_eval(<<'.,.,', 'cadenza.y', 163)
   def _reduce_54(val, _values, result)
      @stack.push DocumentNode.new 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 171)
+module_eval(<<'.,.,', 'cadenza.y', 165)
   def _reduce_55(val, _values, result)
             iterator = VariableNode.new(val[0][0])
-        iterable = VariableNode.new(val[0][1])
+        iterable = val[0][1]
         
         result = ForNode.new(iterator, iterable, @stack.pop.children)
       
@@ -772,7 +762,7 @@ module_eval(<<'.,.,', 'cadenza.y', 171)
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 179)
+module_eval(<<'.,.,', 'cadenza.y', 173)
   def _reduce_56(val, _values, result)
      result = val[2].value 
     result
@@ -781,70 +771,70 @@ module_eval(<<'.,.,', 'cadenza.y', 179)
 
 # reduce 57 omitted
 
-module_eval(<<'.,.,', 'cadenza.y', 188)
+module_eval(<<'.,.,', 'cadenza.y', 182)
   def _reduce_58(val, _values, result)
      result = BlockNode.new(val[0], []) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 189)
+module_eval(<<'.,.,', 'cadenza.y', 183)
   def _reduce_59(val, _values, result)
      @stack.push DocumentNode.new 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 189)
+module_eval(<<'.,.,', 'cadenza.y', 183)
   def _reduce_60(val, _values, result)
      result = BlockNode.new(val[0], @stack.pop.children) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 193)
+module_eval(<<'.,.,', 'cadenza.y', 187)
   def _reduce_61(val, _values, result)
      @stack.push DocumentNode.new 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 195)
+module_eval(<<'.,.,', 'cadenza.y', 189)
   def _reduce_62(val, _values, result)
      result = GenericBlockNode.new(val[1].value, @stack.pop.children) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 196)
+module_eval(<<'.,.,', 'cadenza.y', 190)
   def _reduce_63(val, _values, result)
      @stack.push DocumentNode.new 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 198)
+module_eval(<<'.,.,', 'cadenza.y', 192)
   def _reduce_64(val, _values, result)
      result = GenericBlockNode.new(val[1].value, @stack.pop.children, val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 202)
+module_eval(<<'.,.,', 'cadenza.y', 196)
   def _reduce_65(val, _values, result)
      result = val[2].value 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 203)
+module_eval(<<'.,.,', 'cadenza.y', 197)
   def _reduce_66(val, _values, result)
      result = VariableNode.new(val[2].value) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 207)
+module_eval(<<'.,.,', 'cadenza.y', 201)
   def _reduce_67(val, _values, result)
      result = TextNode.new(val[0].value) 
     result
@@ -861,42 +851,42 @@ module_eval(<<'.,.,', 'cadenza.y', 207)
 
 # reduce 72 omitted
 
-module_eval(<<'.,.,', 'cadenza.y', 216)
+module_eval(<<'.,.,', 'cadenza.y', 210)
   def _reduce_73(val, _values, result)
      push_child val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 217)
+module_eval(<<'.,.,', 'cadenza.y', 211)
   def _reduce_74(val, _values, result)
      push_child val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 218)
+module_eval(<<'.,.,', 'cadenza.y', 212)
   def _reduce_75(val, _values, result)
      @stack.first.extends = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 219)
+module_eval(<<'.,.,', 'cadenza.y', 213)
   def _reduce_76(val, _values, result)
      @stack.first.extends = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 220)
+module_eval(<<'.,.,', 'cadenza.y', 214)
   def _reduce_77(val, _values, result)
      push_block(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cadenza.y', 221)
+module_eval(<<'.,.,', 'cadenza.y', 215)
   def _reduce_78(val, _values, result)
      push_block(val[1]) 
     result