red 3.4.2 → 3.5.0

data/History.txt

@@ -1,3 +1,14 @@
+== 3.5.0 2008-08-13
+
+* 2 major enhancements:
+  * Added support for child classes.
+  * Updated method for "call to returned function"; now use "_".
+
+* 3 bug fixes:
+  * Fixed Prototype library's handling of class_variables; now separated out into an Object.extend declaration.
+  * String quoting is now properly handled in foo["eval#{string}"]-type calls.
+  * Added parentheses wrapping to sugared operators ('+', '*', '||', '&&', etc) in order to solve chained method problems.
+
 == 3.4.2 2008-08-12
 
 * 1 major enhancement:

data/lib/red/assignment_nodes.rb

@@ -64,14 +64,20 @@ module Red
       end
       
       def compile_internals(options = {})
-        variable_name, slot = [@variable_name, @slot].compile_nodes(:quotes => '')
         expression = @expression.compile_node(:as_argument => true)
-        receiver = self.compile_receiver(variable_name, slot)
+        receiver = self.compile_receiver
         return [receiver, expression]
       end
       
-      def compile_receiver(variable_name, slot)
-        return ([:symbol, :string].include?((@slot.data_type rescue :node)) ? "%s.%s" : "%s[%s]") % [variable_name, slot]
+      def compile_receiver
+        variable_name = @variable_name.compile_node
+        if [:symbol, :string].include?((@slot.data_type rescue :node))
+          slot = @slot.compile_node(:quotes => '')
+          "%s.%s"
+        else
+          slot = @slot.compile_node
+          "%s[%s]"
+        end % [variable_name, slot]
       end
     end
     
@@ -107,7 +113,12 @@ module Red
         end
         
         def compile_receiver(receiver, slot)
-          return ([:symbol, :string].include?((@slot.data_type rescue :node)) ? "%s.%s" : "%s[%s]") % [receiver, slot]
+          if [:symbol, :string].include?((@slot.data_type rescue :node))
+            "%s.%s"
+          else
+            slot = @slot.compile_node(:quotes => "'")
+            "%s[%s]"
+          end % [receiver, slot]
         end
       end
       

data/lib/red/call_nodes.rb

@@ -39,13 +39,13 @@ module Red
     
     class MethodNode # :nodoc:
       def compile_node(options = {})
-        call_to_returned_function = [DefinitionNode::InstanceMethodNode, CallNode::BlockNode].include?(@receiver.class) ? :call : false
-        receiver, function = [@receiver, @function].compile_nodes
+        receiver = @receiver.compile_node
+        function = @function.compile_node(:quotes => '')
         arguments = @arguments.compile_nodes(:as_argument => true, :quotes => "'")
         return ("$%s(%s)" % [receiver = ((receiver == '$-') || (receiver == 'id' && @@red_library == :Prototype) ? nil : receiver), arguments.first]).gsub('$$','$').gsub('$class','$$') if @receiver.is_a?(VariableNode::GlobalVariableNode) && function == '-'
         case function.to_sym
-        when :-, :+, :<, :>, :>=, :<=, :%, :*, :/, :^, :==, :===, :instanceof
-          "%s %s %s" % [receiver, function, arguments.first]
+        when :-, :+, :<, :>, :>=, :<=, :%, :*, :/, :^, :==, :===, :instanceof, :in
+          "(%s %s %s)" % [receiver, function, arguments.first]
         when :raise
           "throw(%s)" % [arguments.first]
         when :new
@@ -59,8 +59,8 @@ module Red
           else
             "%s[%s]"
           end % [receiver, arguments.first]
-        when call_to_returned_function
-          "(%s)(%s)" % [receiver, arguments]
+        when :_
+          "%s(%s)" % [receiver, arguments]
         else
           receiver += '.' unless receiver.empty?
           "%s%s(%s)" % [receiver, function, arguments.join(', ')]

data/lib/red/conjunction_nodes.rb

@@ -10,13 +10,13 @@ module Red
     
     class AndNode < ConjunctionNode # :nodoc:
       def compile_node(options = {})
-        return "%s && %s" % self.compile_internals
+        return "(%s && %s)" % self.compile_internals
       end
     end
     
     class OrNode < ConjunctionNode # :nodoc:
       def compile_node(options = {})
-        return "%s || %s" % self.compile_internals
+        return "(%s || %s)" % self.compile_internals
       end
     end
   end

data/lib/red/definition_nodes.rb

@@ -10,6 +10,7 @@ module Red
         case @@red_library
         when :Prototype
           @initializer = block_node.rassoc(:initialize)
+          @classes = block_node.select {|node| (node.first == :class) rescue false }.build_nodes
           @properties = block_node.select {|node| (node.first == :cvdecl) rescue false }.build_nodes
           @functions = block_node.select {|node| ![:block, :scope].include?(node) && ((node.first != :cvdecl) rescue false) }.build_nodes
         else
@@ -18,6 +19,7 @@ module Red
             @arguments = (args_node[1..-1] || []).build_nodes
             @initializer = initializer_node.assoc(:scope).assoc(:block).reject {|node| node == args_node}.build_node
           end
+          @classes = block_node.select {|node| (node.first == :class) rescue false }.build_nodes
           @properties = block_node.select {|node| (node.first == :cvdecl) rescue false }.build_nodes
           @functions = block_node.select {|node| (node != initializer_node) && ![:block, :scope].include?(node) && ((node.first != :cvdecl) rescue false) }.build_nodes
         end
@@ -27,7 +29,9 @@ module Red
       def compile_node(options = {})
         old_class = @@red_class
         @@red_class = @class
-        if @initializer
+        if options[:as_prototype]
+          output = self.compile_as_child_class
+        elsif @initializer
           case @@red_library
           when :Prototype
             output = self.compile_as_prototype_class
@@ -41,10 +45,17 @@ module Red
         return output
       end
       
+      def compile_as_child_class
+        class_name = @class_name.compile_node
+        slots = (@classes | @properties | @functions).compile_nodes(:as_prototype => true).compact.join(', ')
+        return "%s: { %s }" % [class_name, slots]
+      end
+      
       def compile_as_prototype_class
         class_name = @class_name.compile_node
-        slots = (@properties | @functions).compile_nodes(:as_prototype => true).compact.join(', ')
-        return "%s%s = Class.create({ %s })" % [self.var?, class_name, slots]
+        functions = @functions.compile_nodes(:as_prototype => true).compact.join(', ')
+        properties = @properties.compile_nodes(:as_prototype => true).compact.join(', ')
+        return "%s%s = Class.create({ %s });Object.extend(%s, { %s })" % [self.var?, class_name, functions, class_name, properties]
       end
       
       def compile_as_standard_class(options = {})

data/lib/red/literal_nodes.rb

@@ -15,7 +15,7 @@ module Red
       case @initial
         when DataNode::NilNode    : :nil
         when DataNode::RangeNode  : :range
-        when DataNode::StringNode : :string
+        when DataNode::StringNode : (@subsequent.empty? ? :string : :eval)
         when DataNode::SymbolNode : :symbol
         else @initial.value.is_a?(Numeric) ? :numeric : :regexp
       end
@@ -23,7 +23,7 @@ module Red
     
     class ArrayNode < LiteralNode # :nodoc:
       def compile_node(options = {})
-        elements = @subsequent.unshift(@initial).compile_nodes.join(', ')
+        elements = @subsequent.unshift(@initial).compile_nodes.reject {|element| element.empty? }.join(', ')
         return "[%s]" % [elements]
       end
     end

data/lib/red/version.rb

@@ -1,8 +1,8 @@
 module Red
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 4
-    TINY  = 2
+    MINOR = 5
+    TINY  = 0
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: red
 version: !ruby/object:Gem::Version 
-  version: 3.4.2
+  version: 3.5.0
 platform: ruby
 authors: 
 - Jesse Sielaff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-12 00:00:00 -04:00
+date: 2008-08-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency