red 4.0.5 → 4.0.6

data/lib/red/nodes/call_nodes.rb

@@ -61,11 +61,15 @@ module Red
           args_array += [options[:block_string]] if options[:block_string]
           arguments   = args_array.join(",")
           self << "%s.m$%s(%s)" % [receiver, function, arguments]
-          @@red_methods |= [function_sexp] unless @@red_import
+          unless @@red_import
+            @@red_methods |= [function_sexp]
+            @@red_methods |= ([arguments_array_sexp.last[1].last.to_sym] rescue []) if function_sexp == :send && arguments_array_sexp.last.is_sexp?(:array)
+          end
         end
       end
       
       class ImplicitReceiver < Method # :nodoc:
+        # [:vcall]
         # [:fcall, :foo, (:array, {expression}, {expression}, ...)]
         def initialize(function_sexp, *arguments_array_sexp)
           options     = arguments_array_sexp.pop
@@ -84,7 +88,8 @@ module Red
           when :block_given?
             self << "m$blockGivenBool(%s._block)" % @@red_block_arg
           else
-            self << "(this.m$%s||m$%s).call(this,%s)" % [function, function, arguments]
+            arguments = ','+arguments unless arguments.empty?
+            self << "(this.m$%s||m$%s).call(this%s)" % [function, function, arguments]
             @@red_methods |= [function_sexp] unless @@red_import
           end
         end

data/lib/red/nodes/control_nodes.rb

@@ -55,7 +55,7 @@ module Red
         block                 = (block_sexp.is_sexp?(:block) ? block_sexp : [:block, block_sexp]).red!(:force_return => options[:force_return])
         rescue_body           = "else{%s;}" % rescue_body_sexp.red!(:force_return => options[:force_return]) if rescue_body_sexp
         
-        self << "%sif(Red.LoopError.isA(_e,%s)){_eRescued=true;%s;}%s" % [exception_variable, exception_types_array, block, rescue_body]
+        self << "%sif($e(_e,%s)){_eRescued=true;%s;}%s" % [exception_variable, exception_types_array, block, rescue_body]
       end
     end
     
@@ -81,7 +81,7 @@ module Red
         options = arguments_array_sexp.pop
         arguments = arguments_array_sexp.map {|arg| arg.red!(:as_argument => true) }.join(",")
         keyword = self.class.to_s.split('::').last.downcase
-        self << "$%s(%s)" % [keyword, arguments]
+        self << "Red.LoopError._%s(%s)" % [keyword, arguments]
       end
       
       class Break < Keyword # :nodoc:

data/lib/red/nodes/definition_nodes.rb

@@ -33,7 +33,7 @@ module Red
         
         scope = scope_sexp.red!(:as_class_eval => true)
         
-        self << "\n\nRed.class('%s',%s,function(){ var _=%s.prototype;\n  %s;\n})" % [namespaced_class.gsub("c$",""), superclass, namespaced_class, scope]
+        self << "\n\nRed._class('%s',%s,function(){ var _=%s.prototype;\n  %s;\n})" % [namespaced_class.gsub("c$",""), superclass, namespaced_class, scope]
         
         old_namespace_stack.nil? ? @@namespace_stack.pop : @@namespace_stack = old_namespace_stack
       end
@@ -61,7 +61,7 @@ module Red
         
         scope = scope_sexp.red!(:as_class_eval => true)
         
-        self << "\n\nRed.module('%s',function(){ var _=%s.prototype;\n  %s;\n})" % [namespaced_module.gsub("c$",""), namespaced_module, scope]
+        self << "\n\nRed._module('%s',function(){ var _=%s.prototype;\n  %s;\n})" % [namespaced_module.gsub("c$",""), namespaced_module, scope]
         
         @@namespace_stack.pop
       end
@@ -150,7 +150,7 @@ module Red
         (options = contents_sexp) && (contents_sexp = [:block]) if contents_sexp.is_a?(::Hash)
         variables  = []
         contents_sexp.flatten.each_with_index do |x,i|
-          variables.push(contents_sexp.flatten[i + 1]) if [:lasgn,:vcall].include?(x)
+          variables.push(contents_sexp.flatten[i + 1]) if x == :lasgn
         end
         variables -= (contents_sexp.delete(contents_sexp.assoc(:args)) || [])[1..-1] || [] # don't want to undefine the arguments in a method definition
         declare    = "var %s" % variables.map {|x| "%s=$u" % x.red! }.uniq.join(",") unless variables.empty?

data/lib/red/nodes/logic_nodes.rb

@@ -40,22 +40,29 @@ module Red
     end
     
     class Conjunction < LogicNode # :nodoc:
-      # [:and, {expression}, {expression}]
-      # [:or,  {expression}, {expression}]
-      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)
-        string = self.class::STRING
-        self << string % [a,b]
-      end
-      
       class And < Conjunction # :nodoc:
+        # [:and, {expression}, {expression}]
         # FIX: nil && obj produces false instead of nil
-        STRING = "(_a=$T(%s)?(_c=$T(_b=%s)?_b:_c):_a)"
+        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]
+        end
       end
       
       class Or < Conjunction # :nodoc:
-        STRING = "($T(_a=%s)?_a:%s)"
+        # [:or,  {expression}, {expression}]
+        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]
+        end
       end
     end
     

data/lib/red/version.rb

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

data/lib/red.rb

@@ -99,7 +99,7 @@ module Red # :nodoc:
     :true         => LogicNode::Boolean::True,
     :undef        => DefinitionNode::Undef,
     :until        => ControlNode::Loop::Until,
-    :vcall        => VariableNode::OtherVariable,
+    :vcall        => CallNode::Method::ImplicitReceiver,
     :when         => LogicNode::Case::When,
     :while        => ControlNode::Loop::While,
     :xstr         => LiteralNode::Uninterpreted,
@@ -219,11 +219,11 @@ module Red # :nodoc:
     @@red_singleton   = nil
     @@red_block_arg   = nil
     @@red_import      = false
+    @@red_boolean     = 'a'
     return true
   end
   
   def red!(options = {}, reset = false)
-    Red.init if reset
     case self
     when Array
       raise(BuildError::UnknownNode, "Don't know how to handle sexp type :#{self.first}") unless ARRAY_NODES[self.first]

data/lib/source/ruby.rb

@@ -6,7 +6,7 @@
     Red.donateMethodsToSingleton(superclass,newClass,true);
     Red.donateMethodsToClass(superclass.prototype,newClass.prototype,true);
     if(newClass==c$Module){delete(newClass.prototype.m$initialize);};
-    if(newClass!==Number&&newClass!==Array){newClass.prototype.toString==superclass.prototype.toString;};
+    if(newClass!==Number&&newClass!==Array){newClass.prototype.toString=superclass.prototype.toString;};
   },
   
   donateMethodsToSingleton: function(donor,recipient,overwrite) {
@@ -52,6 +52,7 @@
     newClass.__id__ = Red.id++;
     newClass.__modules__ = {};
     newClass.__children__ = {};
+    newClass.__class__ = c$Class;
     newClass.prototype.__class__=newClass;
     Red.donateMethodsToSingleton(c$Class.prototype,newClass,true)
   },
@@ -68,7 +69,7 @@
     return context[0]['c$'+context[1]];
   },
   
-  module: function(longName,block){
+  _module: function(longName,block){
     var newModule,context=Red.interpretNamespace(longName),namespace=context[0],name=context[1];
     if(namespace['c$'+name]) {
       newModule = namespace['c$'+name];
@@ -80,7 +81,7 @@
     if(typeof(block)=='function') { block.call(newModule); };
   },
   
-  class: function(longName,superclass,block){
+  _class: function(longName,superclass,block){
     var newClass,context=Red.interpretNamespace(longName),namespace=context[0],name=context[1];
     if(namespace['c$'+name]) {
       if(name!=='Object' && superclass!==namespace['c$'+name].__superclass__){m$raise(c$TypeError,$q('superclass mismatch for class '+longName));};
@@ -107,18 +108,17 @@
     };
     if(typeof(block)=='function') { block.call(newClass); };
     Red.updateChildren(newClass);
-    if((typeof(c$TrueClass)!='undefined'&&newClass==c$TrueClass)||(typeof(c$FalseClass)!='undefined'&&newClass==c$FalseClass)) { Red.donateMethodsToClass(newClass.prototype,Boolean.prototype); };
+    if((typeof(c$TrueClass)!='undefined'&&newClass==c$TrueClass)||(typeof(c$FalseClass)!='undefined'&&newClass==c$FalseClass)) { Red.donateMethodsToClass(newClass.prototype,Boolean.prototype,true); };
   },
   
   LoopError: {
-    break:function(value){var e=new(Error);e.__keyword__='break';e._value=value==null?nil:value;throw(e);},
-    next:function(value){var e=new(Error);e.__keyword__='next';e._value=value==null?nil:value;throw(e);},
-    redo:function(){var e=new(Error);e.__keyword__='redo';throw(e);},
-    isA:function(e,ary){for(var i=0,l=ary.length;i<l;++i){if(e.m$isABool(ary[i])){return true;};};return false;}
+    _break:function(value){var e=new(Error);e.__keyword__='break';e._value=value==null?nil:value;throw(e);},
+    _next:function(value){var e=new(Error);e.__keyword__='next';e._value=value==null?nil:value;throw(e);},
+    _redo:function(){var e=new(Error);e.__keyword__='redo';throw(e);},
   }
 };
 
-var $u=undefined,nil=null;
+var $u=undefined,nil=null,$={};
 
 c$Class  = function(){this.__id__=Red.id++};c$Class.__name__='Class';c$Class.__children__={};
 c$Module = function(){this.__id__=Red.id++};c$Module.__name__='Module';c$Module.__children__={};c$Class.__superclass__=c$Module;
@@ -132,6 +132,7 @@ window.__children__={'Object':true};
 window.m$include=function(){for(var i=0,modules=arguments,l=modules.length;i<l;++i){var mp=modules[i].prototype;for(var x in mp){if(x.slice(0,2)=='m$'){var f=function(){return arguments.callee._source[arguments.callee._name].apply(window,arguments) };f._source=mp;f._name=x;window[x]=f;};};modules[i].m$included(window);modules[i].__includers__['window']=true;};if(modules[0]!=c$Kernel){Red.donateMethodsToClass(window,c$Object.prototype);Red.updateChildren(c$Object);};return window;};
 window.m$blockGivenBool=function(){typeof(arguments[0])=='function'}
 
+function $e(e,ary){if(e.m$isABool){for(var i=0,l=ary.length;i<l;++i){if(e.m$isABool(ary[i])){return true;};};};return false;};
 function $Q(){for(var i=1,s=arguments[0],l=arguments.length;i<l;++i){s+=$q(arguments[i]).m$toS()._value;};return $q(s);};
 function $q(obj){if(typeof obj!=='string'){return obj;};return c$String.m$new(obj);};
 function $r(value,options){return c$Regexp.m$new(value,options);};
@@ -223,7 +224,9 @@ class Object
   #   k.__send__(:hello, "gentle", "readers")  #=> "Hello gentle readers"
   # 
   def __send__(method,*args)
-    `this[method].apply(this,args)`
+    `method=this['m$'+sym._value.replace('=','Eql')]`
+    `if(!method){m$raise(c$NoMethodError,$q('undefined method "'+sym._value+'" for '+this));}`
+    `method.apply(this,args)`
   end
   
   # call-seq:
@@ -527,10 +530,10 @@ class Object
   # FIX: Incomplete
   def is_a?(klass)
     `if(this.m$class()==klass||c$Object==klass){return true;}`  # true if instance_of? or if klass is Object
-    `if(this.m$class()._modules[klass]){return true;}`            # true if klass is included in obj's class
+    `if(this.m$class().__modules__[klass]){return true;}`            # true if klass is included in obj's class
     `if(this.m$class()==c$Object){return false;}`               # false if module check fails and obj is Object
     `var bubble=this.m$class(),result=false`
-    `while(bubble!=c$Object){if(klass==bubble||bubble._modules[klass]!=null){result=true;};if(result){break;};bubble=bubble.__superclass__;}`
+    `while(bubble!=c$Object){if(klass==bubble||bubble.__modules__[klass]!=null){result=true;};if(result){break;};bubble=bubble.__superclass__;}`
     return `result`
   end
   
@@ -560,10 +563,10 @@ class Object
   # FIX: Incomplete
   def kind_of?(klass)
     `if(this.m$class()==klass||c$Object==klass){return true;}`  # true if instance_of? or if klass is Object
-    `if(this.m$class()._modules[klass]){return true;}`            # true if klass is included in obj's class
+    `if(this.m$class().__modules__[klass]){return true;}`            # true if klass is included in obj's class
     `if(this.m$class()==c$Object){return false;}`               # false if module check fails and obj is Object
     `var bubble=this.m$class(),result=false`
-    `while(bubble!=c$Object){if(klass==bubble||bubble._modules[klass]!=null){result=true;};if(result){break;};bubble=bubble.__superclass__;}`
+    `while(bubble!=c$Object){if(klass==bubble||bubble.__modules__[klass]!=null){result=true;};if(result){break;};bubble=bubble.__superclass__;}`
     return `result`
   end
   
@@ -668,7 +671,7 @@ class Object
   # Returns +true+ if _obj_ responds to the given method.
   # 
   def respond_to?(method)
-    `typeof this[method]=='function'`
+    `typeof(this['m$'+method._value])=='function'`
   end
   
   # call-seq:
@@ -688,8 +691,10 @@ class Object
   #   k = Klass.new
   #   k.send(:hello, "gentle", "readers")  #=> "Hello gentle readers"
   # 
-  def send(method,*args)
-    `this['m$'+method._value.replace('=','Eql')].apply(this,args)`
+  def send(sym,*args)
+    `method=this['m$'+sym._value.replace('=','Eql')]`
+    `if(!method){m$raise(c$NoMethodError,$q('undefined method "'+sym._value+'" for '+this));}`
+    `method.apply(this,args)`
   end
   
   # FIX: Incomplete
@@ -786,7 +791,8 @@ class Module
   def <=>(other_module)
   end
   
-  def ===(object)
+  def ===(obj)
+    `obj.m$isABool(this)`
   end
   
   def >(other_module)
@@ -1071,7 +1077,7 @@ class Class < Module
   # 
   # FIX: Incomplete
   def self.new(class_name, superclass = Object)
-    `Red.class(className._value,superclass,function(){})`
+    `Red._class(className._value,superclass,function(){})`
     return `window['c$'+className._value]`
   end
   
@@ -2948,12 +2954,16 @@ class Exception
     `this._message==null?$q(this.m$class().__name__.replace(/\\./g,'::')):$q(this._message)`
   end
 end
-
+`
+c$Exception.prototype.toString=function(){var class_name=this.m$class().__name__.replace(/\\./g,'::'),str=class_name+': '+(this._message||class_name);console.log(str+(this._stack!=null?'\\n        from '+this.m$backtrace().join('\\n        from '):''));return '#<'+str+'>';}
+`
 class StandardError < Exception     ; end
 class ArgumentError < StandardError ; end
 class IndexError < StandardError    ; end
 class RangeError < StandardError    ; end
 class RuntimeError < StandardError  ; end
+class NameError < StandardError     ; end
+class NoMethodError < NameError     ; end
 class TypeError < StandardError     ; end
 
 # The global value +false+ is the only instance of class +FalseClass+ and
@@ -5605,7 +5615,7 @@ class String
   #   'abcdef'.include?(?c)     #=> true
   # 
   def include?(obj)
-    `new(RegExp)(typeof(obj)=='number'?String.fromCharCode(obj):obj._value).test(this._value)`
+    `new(RegExp)(typeof(obj)=='number'?String.fromCharCode(obj):obj._value.replace(/([-.*+?^${}()|[\\]\\/\\\\])/g, '\\\\$1')).test(this._value)`
   end
   
   # FIX: Incomplete
@@ -6762,10 +6772,8 @@ class TrueClass
   
   undef initialize
 end
-
 `
 
-c$Exception.prototype.toString=function(){var class_name=this.m$class().__name__.replace(/\\./g,'::'),str=class_name+': '+(this._message||class_name);console.log(str+(this._stack!=null?'\\n        from '+this.m$backtrace().join('\\n        from '):''));return '#<'+str+'>';}
 c$NilClass.prototype.toString=function(){return 'nil';};
 c$Range.prototype.toString=function(){return ''+this._start+(this._exclusive?'...':'..')+this._end;};
 c$Regexp.prototype.toString=function(){return '/'+this._source+'/'+(/s/.test(this._options)?'m':'')+(/i/.test(this._options)?'i':'')+(/x/.test(this._options)?'x':'');};
@@ -6774,4 +6782,3 @@ c$Symbol.prototype.toString=function(){var v=this._value,str=/\\s/.test(v)?'"'+v
 c$Time.prototype.toString=function(){return ''+this._value;};
 
 `
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: red
 version: !ruby/object:Gem::Version 
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors: 
 - Jesse Sielaff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-16 00:00:00 -04:00
+date: 2008-10-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency