@@ -111,6 +111,7 @@ module Red arguments = args_array.join(",") scope = scope_sexp.red!(:force_return => function != 'initialize') 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 lib/red/nodes/definition_nodes.rb @@ -28,9 +28,11 @@ 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.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" lines = (expression_sexps.map {|line| line.red!(options)} + [returner]).compact.reject {|x| x == '' }.join(";#{options[:as_class_eval] ? "\n " : ''}") self << string % [lines] lib/red/nodes/literal_nodes.rb 71c751ac268e30322029bc40fd3b407544fe6b9d d5f007f043ce28a6d054915333e26af2efd8d5b2 Julius Eckert eckert.julius@gmail.com http://github.com/julius/red/commit/ab50ada35f72b7d7f69f8d7ef1560c327bd68985 ab50ada35f72b7d7f69f8d7ef1560c327bd68985 2009-09-11T09:43:57-07:00 2009-09-11T09:43:57-07:00 Merge branch 'master' of ssh://git@cb.nyc-life.com//var/git/red 90686d214e4691acb463dda702915a9b6a8896c2 Julius Eckert eckert.julius@gmail.com