red 4.0.6 → 4.1.0

data/Manifest.txt

@@ -27,9 +27,10 @@ script/destroy
 script/generate
 script/txt2html
 setup.rb
-spec/red_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
+spec/array.red
+spec/hash.red
+spec/object.red
+spec/string.red
 tasks/deployment.rake
 tasks/environment.rake
 tasks/rspec.rake

data/bin/red

@@ -15,6 +15,7 @@ include Red
 parser = OptionParser.new do |opts|
   opts.banner = RED_MESSAGES[:banner]
   opts.separator ""
+  opts.on('-d',"--debug","Translate Red files to JavaScript in debug mode.")          { Red.instance_eval "def debug;true;end" }
   opts.on('-h',"--help","Show this help message.")                                    { puts opts; exit }
   opts.on('-r',"--rails","Add Red plugin to ./vendor/plugins.")                       { build_red_plugin_for_rails }
   opts.on('-s',"--string=RUBY_STRING","Translate a single string to JavaScript.")     { |string| Red.init && direct_translate(string) }

data/lib/red/executable.rb

@@ -72,9 +72,12 @@ module Red # :nodoc:
       puts "File #{filename}.red does not exist."
       exit
     end
+    @@red_filepath = File.dirname(File.expand_path(filename))
     js_output = hush_warnings { File.read(file).translate_to_sexp_array }.red!
     ruby_js   = compile_ruby_js_source
-    File.open("%s%s.js" % [dir, filename], 'w') {|f| f.write(ruby_js + js_output)} unless dry_run
+    pre  = Red.debug ? "try{" : ""
+    post = Red.debug ? "}catch(e){if(e.__class__){m$raise(e);};$ee=e;var m=e.message.match(/([^\\$]+)\\.m\\$(\\w+)\\sis\\snot\\sa\\sfunction/);if(m){m$raise(c$NoMethodError,$q('undefined method \"'+m[2]+'\" for '+m[1]));};var c=e.message.match(/([\\s\\S]+)\\sis\\sundefined/);if(c){c=c[1].replace(/\\./g,'::').replace(/c\\$/g,'');m$raise(c$NameError,$q('uninitialized constant '+c));};}" : ""
+    File.open("%s%s.js" % [dir, filename], 'w') {|f| f.write(pre + ruby_js + js_output + post)} unless dry_run
     print_js(js_output, filename, dry_run)
   end
   

data/lib/red/nodes/assignment_nodes.rb

@@ -46,8 +46,9 @@ module Red
       def initialize(variable_name_sexp, expression_sexp, options)
         variable_name = variable_name_sexp.red!
         expression    = expression_sexp.red!(:as_assignment => true)
+        a             = @@red_boolean.succ!.dup
         if options[:as_argument_default]
-          self << "%s=$T(_a=%s)?_a:%s" % [variable_name, variable_name, expression]
+          self << "%s=$T($.%s=%s)?$.%s:%s" % [variable_name, a, variable_name, a, expression]
         else
           self << "%s=%s" % [variable_name, expression]
         end
@@ -82,7 +83,7 @@ module Red
           method     = (METHOD_ESCAPE[method_sexp] || method_sexp).red!
           expression = expression_sexp.red!(:as_argument => true)
           object     = "%s.m$_brac(%s)" % [receiver, arguments]
-          unless string = ((method == '||' && LogicNode::Conjunction::Or::STRING) || (method == '&&' && LogicNode::Conjunction::And::STRING))
+          unless string = ((method == '||' && LogicNode::Conjunction::Or.string) || (method == '&&' && LogicNode::Conjunction::And.string))
             operation = "%s.m$%s(%s)" % [object, method, expression]
           else
             operation = string % [object, expression]
@@ -100,7 +101,7 @@ module Red
           method     = (METHOD_ESCAPE[method_sexp] || method_sexp).red!
           expression = expression_sexp.red!(:as_argument => true)
           object     = "%s.m$%s()" % [receiver, reader]
-          unless string = ((method == '||' && LogicNode::Conjunction::Or::STRING) || (method == '&&' && LogicNode::Conjunction::And::STRING))
+          unless string = ((method == '||' && LogicNode::Conjunction::Or.string) || (method == '&&' && LogicNode::Conjunction::And.string))
             operation = "%s.m$%s(%s)" % [object, method, expression]
           else
             operation = string % [object, expression]
@@ -114,7 +115,7 @@ module Red
         def initialize(variable_name_sexp, assignment_sexp, options)
           variable_name = variable_name_sexp.red!
           expression    = assignment_sexp.last.red!(:as_argument => true)
-          conjunction   = LogicNode::Conjunction::Or::STRING % [variable_name, expression]
+          conjunction   = LogicNode::Conjunction::Or.string % [variable_name, expression]
           self << "%s=%s" % [variable_name, conjunction]
         end
       end
@@ -124,7 +125,7 @@ module Red
         def initialize(variable_name_sexp, assignment_sexp, options)
           variable_name = variable_name_sexp.red!
           expression    = assignment_sexp.last.red!(:as_argument => true)
-          conjunction   = LogicNode::Conjunction::And::STRING % [variable_name, expression]
+          conjunction   = LogicNode::Conjunction::And.string % [variable_name, expression]
           self << "%s=%s" % [variable_name, conjunction]
         end
       end

data/lib/red/nodes/call_nodes.rb

@@ -3,7 +3,7 @@ module Red
     class Ampersand < CallNode # :nodoc:
       # [:block_pass, {expression}, {expression}]
       def initialize(block_pass_sexp, function_call_sexp, options)
-        block_string = "%s.m$toProc()._block" % block_pass_sexp.red!(:as_receiver => true)
+        block_string = "%s.m$to_proc().__block__" % block_pass_sexp.red!(:as_receiver => true)
         function_call = function_call_sexp.red!(options.merge(:block_string => block_string))
         self << "%s" % [function_call]
       end
@@ -79,17 +79,32 @@ module Red
           arguments   = args_array.join(",")
           case function_sexp
           when :require
-            #cached_import_status = @@red_import
-            #@@red_import = true
-            self << hush_warnings { File.read((arguments_array_sexp.assoc(:array).assoc(:str).last rescue '')).translate_to_sexp_array }.red!
-            #@@red_import = cached_import_status
+            basename = File.basename((arguments_array_sexp.assoc(:array).assoc(:str).last rescue ''))
+            dirname  = File.dirname((arguments_array_sexp.assoc(:array).assoc(:str).last rescue ''))
+            short_filename = File.join(@@red_filepath, basename)
+            long_filename  = File.join(@@red_filepath, dirname, basename)
+            unless @@red_required.include?(basename)
+              @@red_required |= [basename]
+              file = Dir.glob(short_filename)[0] || Dir.glob('%s.red' % short_filename)[0] || Dir.glob('%s.rb' % short_filename)[0] || Dir.glob(long_filename)[0] || Dir.glob('%s.red' % long_filename)[0] || Dir.glob('%s.rb' % long_filename)[0] || Dir.glob('%s/../../source/redshift/%s' % [File.dirname(__FILE__),basename])[0] || Dir.glob('%s/../../source/redshift/%s.red' % [File.dirname(__FILE__),basename])[0]
+              stored_filepath = @@red_filepath
+              @@red_filepath = File.dirname(file)
+              self << hush_warnings { File.read(file).translate_to_sexp_array }.red!
+              @@red_filepath = stored_filepath
+            else
+              self << "false";
+            end
           when :[]
             self << "this.m$%s(%s)" % [function, arguments]
           when :block_given?
-            self << "m$blockGivenBool(%s._block)" % @@red_block_arg
+            self << "m$block_given_bool(%s.__block__)" % (@@red_block_arg || 'nil')
           else
-            arguments = ','+arguments unless arguments.empty?
-            self << "(this.m$%s||m$%s).call(this%s)" % [function, function, arguments]
+            if Red.debug
+              error_function = arguments.empty? ? 'n' : 'm'
+              self << "((this.m$%s&&this.m$%s(%s))||(window.m$%s&&window.m%s(%s))||$%s(this,'%s'))" % [function,function,arguments,function,function,arguments,error_function,function_sexp]
+            else
+              arguments = ','+arguments unless arguments.empty?
+              self << "(this.m$%s||window.m$%s).call(this%s)" % [function, function, arguments]
+            end
             @@red_methods |= [function_sexp] unless @@red_import
           end
         end

data/lib/red/nodes/control_nodes.rb

@@ -62,15 +62,10 @@ module Red
     class For < ControlNode # :nodoc:
       # [:for, {expression}, {expression}, {expression | :block}]
       def initialize(source_sexp, iterator_assignment_sexp, body_sexp, options)
-        body = body_sexp.red!
-        unless source_sexp.is_sexp?(:xstr, :dxstr)
-          source   = source_sexp.red!(:as_argument => true)
-          iterator = iterator_assignment_sexp.last.red!
-          self << "for(var %s in %s){%s;}" % [iterator, source, body]
-        else
-          loop_statement = source_sexp.red!
-          self << "for(%s){%s;}" % [loop_statement, body]
-        end
+        iterator = iterator_assignment_sexp.last.red!
+        source   = source_sexp.red!(:as_receiver => true)
+        body     = body_sexp.red!
+        self << "%s.m$each(function(%s){%s;}.m$(this))" % [source, iterator, body]
       end
     end
     

data/lib/red/nodes/data_nodes.rb

@@ -44,7 +44,8 @@ module Red
     class String < DataNode # :nodoc:
       # 'foo'
       def initialize(value_data, options)
-        value  = options[:no_escape] ? value_data : value_data.gsub(/'/, "\\\\'")
+      # value  = options[:no_escape] ? value_data : value_data.gsub(/"/, '\\"')
+        value  = value_data
         string = options[:unquoted] ? "%s" % [value] : "%s" % [value.inspect]
         self << string
       end
@@ -54,15 +55,16 @@ module Red
       # :foo
       def initialize(value_data, options)
         value  = self.camelize(value_data.to_s, options[:not_camelized])
-        string = options[:as_receiver] ? "$q('%s')" : options[:as_argument] ? "'%s'" : "%s"
+        string = options[:as_receiver] ? "$q(\"%s\")" : options[:as_argument] ? "\"%s\"" : "%s"
         self << string % [value]
       end
       
       def camelize(string, disabled = false)
-        return string unless self.camelize?(string) && !disabled
-        words = string.gsub(/@/,'').gsub('?','_bool').gsub('!','_bang').gsub('=','_eql').split(/_/)
-        underscore = words.shift if words.first.empty?
-        return (underscore ? '_' : '') + words[0] + words[1..-1].map {|word| word == word.upcase ? word : word.capitalize }.join
+        return string.gsub(/@/,'').gsub('?','_bool').gsub('!','_bang').gsub('=','_eql')
+      # return string unless self.camelize?(string) && !disabled
+      # words = string.gsub(/@/,'').gsub('?','_bool').gsub('!','_bang').gsub('=','_eql').split(/_/)
+      # underscore = words.shift if words.first.empty?
+      # return (underscore ? '_' : '') + words[0] + words[1..-1].map {|word| word == word.upcase ? word : word.capitalize }.join
       end
       
       def camelize?(string)

data/lib/red/nodes/definition_nodes.rb

@@ -95,12 +95,16 @@ module Red
           splat_arg       = argument_sexps.pop.to_s[1..-1] if argument_sexps.last && argument_sexps.last.to_s.include?('*')
           argument_sexps += [block_arg_sexp.last] if block_arg_sexp
           args_array      = argument_sexps.map {|argument| argument.red! }
-          splatten_args   = "for(var bg=m$blockGivenBool(arguments[arguments.length-1]),l=bg?arguments.length-1:arguments.length,i=#{block_arg_sexp ? argument_sexps.size - 1 : argument_sexps.size},#{splat_arg}=[];i<l;++i){#{splat_arg}.push(arguments[i]);};var #{block_arg_sexp.last rescue :_block}=(bg?c$Proc.m$new(arguments[arguments.length-1]):nil)" if splat_arg
-          block_arg       = "var #{block_arg_sexp.last rescue :_block}=(m$blockGivenBool(arguments[arguments.length-1])?c$Proc.m$new(arguments[arguments.length-1]):nil)" if block_arg_sexp && !splat_arg
+          maximum_args    = args_array.length - (block_arg_sexp ? 1 : 0)
+          minimum_args    = maximum_args - (defaults_sexp ? defaults_sexp.flatten.select {|x| x == :lasgn}.length : 0)
+          splatten_args   = "for(var l=arguments.length,i=#{argument_sexps.size},#{splat_arg}=[];i<l;++i){#{splat_arg}.push(arguments[i]);}" if splat_arg && !block_arg_sexp
+          splat_block     = "for(var l=arguments.length,bg=m$block_given_bool(arguments[l-1]),l=bg?l-1:l,i=#{argument_sexps.size - 1},#{splat_arg}=[];i<l;++i){#{splat_arg}.push(arguments[i]);};var #{block_arg_sexp.last rescue :_block}=(bg?c$Proc.m$new(arguments[arguments.length-1]):nil)" if splat_arg && block_arg_sexp
+          block_arg       = "var z=arguments[arguments.length-1],bg=m$block_given_bool(z),#{block_arg_sexp.last rescue :_block}=bg?c$Proc.m$new(z):nil" if block_arg_sexp && !splat_arg
+          args_checker    = "$a(%s,%s,arguments,%s)" % [minimum_args, (splat_arg ? -1 : maximum_args), (splat_block || block_arg ? "bg?1:0" : "arguments[arguments.length-1]&&arguments[arguments.length-1].__block__?1:0")] if Red.debug && ![:new, :initialize].include?(function_name_sexp)
           defaults        = defaults_sexp.red!(:as_argument_default => true) if defaults_sexp
           arguments       = args_array.join(",")
           scope           = scope_sexp.red!(:force_return => function != 'initialize')
-          contents        = [splatten_args, block_arg, defaults, scope].compact.join(";")
+          contents        = [(splatten_args || splat_block || block_arg), args_checker, defaults, scope].compact.join(";")
           if options[:as_class_eval]
             string = "_.m$%s=function(%s){%s;}"
           else
@@ -130,12 +134,16 @@ module Red
           splat_arg       = argument_sexps.pop.to_s[1..-1] if argument_sexps.last && argument_sexps.last.to_s.include?('*')
           argument_sexps += [block_arg_sexp.last] if block_arg_sexp
           args_array      = argument_sexps.map {|argument| argument.red! }
-          splatten_args   = "for(var bg=m$blockGivenBool(arguments[arguments.length-1]),l=bg?arguments.length-1:arguments.length,i=#{block_arg_sexp ? argument_sexps.size - 1 : argument_sexps.size},#{splat_arg}=[];i<l;++i){#{splat_arg}.push(arguments[i]);};var #{block_arg_sexp.last rescue :_block}=(bg?c$Proc.m$new(arguments[arguments.length-1]):nil)" if splat_arg
-          block_arg       = "var #{block_arg_sexp.last rescue :_block}=(m$blockGivenBool(arguments[arguments.length-1])?c$Proc.m$new(arguments[arguments.length-1]):nil)" if block_arg_sexp && !splat_arg
+          maximum_args    = args_array.length - (block_arg_sexp ? 1 : 0)
+          minimum_args    = maximum_args - (defaults_sexp ? defaults_sexp.flatten.select {|x| x == :lasgn}.length : 0)
+          splatten_args   = "for(var l=arguments.length,i=#{argument_sexps.size},#{splat_arg}=[];i<l;++i){#{splat_arg}.push(arguments[i]);}" if splat_arg && !block_arg_sexp
+          splat_block     = "for(var l=arguments.length,bg=m$block_given_bool(arguments[l-1]),l=bg?l-1:l,i=#{argument_sexps.size - 1},#{splat_arg}=[];i<l;++i){#{splat_arg}.push(arguments[i]);};var #{block_arg_sexp.last rescue :_block}=(bg?c$Proc.m$new(arguments[arguments.length-1]):nil)" if splat_arg && block_arg_sexp
+          block_arg       = "var z=arguments[arguments.length-1],bg=m$block_given_bool(z),#{block_arg_sexp.last rescue :_block}=bg?c$Proc.m$new(z):nil" if block_arg_sexp && !splat_arg
+          args_checker    = "$a(%s,%s,arguments,%s)" % [minimum_args, (splat_arg ? -1 : maximum_args), (splat_block || block_arg ? "bg?1:0" : 0)]#{}"arguments[arguments.length-1]&&arguments[arguments.length-1].__block__?1:0")]
           defaults        = defaults_sexp.red!(:as_argument_default => true) if defaults_sexp
           arguments       = args_array.join(",")
           scope           = scope_sexp.red!(:force_return => function != 'initialize')
-          contents        = [splatten_args, block_arg, defaults, scope].compact.join(";")
+          contents        = [(splatten_args || splat_block || block_arg), args_checker, defaults, scope].compact.join(";")
           self << "%s=function(%s){%s;}" % [singleton, arguments, contents]
           @@red_block_arg = nil
           @@red_function  = nil

data/lib/red/nodes/literal_nodes.rb

@@ -28,7 +28,7 @@ module Red
         # as_argument: duplicates :force_return and adds "function() {
         #   <multiline block>; }()" wrapper to the entire block.
         options = expression_sexps.pop
-        if options[:as_argument] || options[:as_assignment] || options[:force_return] && expression_sexps.last.is_a?(::Array) && !expression_sexps.last.is_sexp?(:rescue, :ensure, :begin) && (expression_sexps.last.first == :iter ? true : !expression_sexps.last.flatten.include?(:return))
+        if options[:as_argument] || options[:as_assignment] || options.delete(:force_return) && expression_sexps.last.is_a?(::Array) && !expression_sexps.last.is_sexp?(:rescue, :ensure, :begin) && (expression_sexps.last.first == :iter ? true : !expression_sexps.last.flatten.include?(:return))
           returner = "return %s" % [expression_sexps.pop.red!(:as_argument => true)]
         end
         string = options[:as_argument] || options[:as_assignment] ? "function(){%s;}.m$(this)()" : "%s"

data/lib/red/nodes/logic_nodes.rb

@@ -46,11 +46,14 @@ module Red
         def initialize(expression_a_sexp, expression_b_sexp, options)
           a = expression_a_sexp.red!(:as_argument => true)
           b = expression_b_sexp.red!(:as_argument => true)
-          d = @@red_boolean.succ!.dup
-          e = @@red_boolean.succ!.dup
-          f = @@red_boolean.succ!.dup
-          string = "($.%s=$T(%s)?($.%s=$T($.%s=%s)?$.%s:$.%s):$.%s)" % [d, '%s', f, e, '%s', e, f, d]
-          self << string % [a,b]
+          self << self.class.string % [a, b]
+        end
+        
+        def self.string # :nodoc:
+          a = @@red_boolean.succ!.dup
+          b = @@red_boolean.succ!.dup
+          c = @@red_boolean.succ!.dup
+          "(($.%s=$T(%s))?(($.%s=$T($.%s=%s))?$.%s:$.%s):$.%s)" % [a, '%s', c, b, '%s', b, c, a]
         end
       end
       
@@ -59,9 +62,12 @@ module Red
         def initialize(expression_a_sexp, expression_b_sexp, options)
           a = expression_a_sexp.red!(:as_argument => true)
           b = expression_b_sexp.red!(:as_argument => true)
-          c = @@red_boolean.succ!.dup
-          string = "($T($.%s=%s)?$.%s:%s)" % [c, '%s', c, '%s']
-          self << string % [a,b]
+          self << self.class.string % [a, b]
+        end
+        
+        def self.string
+          a = @@red_boolean.succ!.dup
+          "($T($.%s=%s)?$.%s:%s)" % [a, '%s', a, '%s']
         end
       end
     end

data/lib/red/version.rb

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

data/lib/red.rb

@@ -193,6 +193,7 @@ module Red # :nodoc:
     block_given?
     call
     class
+    each
     extend_object
     extended
     hash
@@ -206,12 +207,14 @@ module Red # :nodoc:
     new
     raise
     sprintf
+    superclass
     to_proc
     to_s
     to_str
   }.map {|m| m.to_sym }
   
-  def self.init
+  def self.init(file = '')
+    @@red_filepath    = File.dirname(File.expand_path(file))
     @@namespace_stack = []
     @@red_constants   = NATIVE_CONSTANTS
     @@red_methods     = INTERNAL_METHODS
@@ -219,10 +222,15 @@ module Red # :nodoc:
     @@red_singleton   = nil
     @@red_block_arg   = nil
     @@red_import      = false
-    @@red_boolean     = 'a'
+    @@red_boolean     = '`'
+    @@red_required    = []
     return true
   end
   
+  def self.debug
+    false
+  end
+  
   def red!(options = {}, reset = false)
     case self
     when Array