Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opal/opal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 553844617db2
Choose a base ref
...
head repository: opal/opal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f837c5afdf8f
Choose a head ref
  • 5 commits
  • 4 files changed
  • 1 contributor

Commits on Jan 3, 2014

  1. Make $stdout and $stderr proper IO objects 

    Now using IO::Writable that hooks on io.write
    @elia
    elia committed Jan 3, 2014
    Copy the full SHA
    0038ffd View commit details

  2. Have a proper implementation of Kernel#print

    @elia
    elia committed Jan 3, 2014
    Copy the full SHA
    23673b1 View commit details

  3. Better readability indentation kept (kinda)

    @elia
    elia committed Jan 3, 2014
    Copy the full SHA
    58f20f2 View commit details

  4. Add LoadError

    @elia
    elia committed Jan 3, 2014
    Copy the full SHA
    04e2d51 View commit details

  5. Fix the #silence_stdout spec helper

    @elia
    elia committed Jan 3, 2014
    Copy the full SHA
    f837c5a View commit details
Showing with 35 additions and 49 deletions.
  1. +3 −2 lib/mspec/opal/runner.rb
  2. +22 −22 opal/corelib/error.rb
  3. +7 −24 opal/corelib/io.rb
  4. +3 −1 opal/corelib/kernel.rb
5 changes: 3 additions & 2 deletions lib/mspec/opal/runner.rb
View file
Original file line number Diff line number Diff line change
@@ -176,8 +176,9 @@ def did_finish
module OutputSilencer
def silence_stdout
original_stdout = $stdout
new_stdout = Object.new
`#{new_stdout}.$puts = function(){}`
new_stdout = IO.new
new_stdout.extend IO::Writable
def new_stdout.write(string) end
begin
$stdout = new_stdout
yield
44 changes: 22 additions & 22 deletions opal/corelib/error.rb
View file
Original file line number Diff line number Diff line change
@@ -33,29 +33,29 @@ def inspect
end

# keep the indentation, it makes the exception hierarchy clear
class StandardError < Exception; end
class SystemCallError < StandardError; end
class NameError < StandardError; end
class NoMethodError < NameError; end
class RuntimeError < StandardError; end
class LocalJumpError < StandardError; end
class TypeError < StandardError; end
class ArgumentError < StandardError; end
class IndexError < StandardError; end
class StopIteration < IndexError; end
class KeyError < IndexError; end
class RangeError < StandardError; end
class FloatDomainError < RangeError; end
class IOError < StandardError; end

class ScriptError < Exception; end
class SyntaxError < ScriptError; end
class NotImplementedError < ScriptError; end

class SystemExit < Exception; end

class ScriptError < Exception; end
class SyntaxError < ScriptError; end
class LoadError < ScriptError; end
class NotImplementedError < ScriptError; end

class SystemExit < Exception; end

class StandardError < Exception; end
class NameError < StandardError; end
class NoMethodError < NameError; end
class RuntimeError < StandardError; end
class LocalJumpError < StandardError; end
class TypeError < StandardError; end
class ArgumentError < StandardError; end
class IndexError < StandardError; end
class StopIteration < IndexError; end
class KeyError < IndexError; end
class RangeError < StandardError; end
class FloatDomainError < RangeError; end
class IOError < StandardError; end
class SystemCallError < StandardError; end
module Errno
class EINVAL < SystemCallError
class EINVAL < SystemCallError
def self.new
super('Invalid argument')
end
31 changes: 7 additions & 24 deletions opal/corelib/io.rb
View file
Original file line number Diff line number Diff line change
@@ -42,32 +42,15 @@ def readpartial(integer, outbuf = nil)
STDIN = $stdin = IO.new
STDOUT = $stdout = IO.new

def $stdout.puts(*strs)
%x{
for (var i = 0; i < strs.length; i++) {
if (strs[i] instanceof Array) {
#{puts(*`strs[i]`)};
}
else {
console.log(#{`strs[i]`.to_s});
}
}
}

def $stdout.write(string)
`console.log(#{string.to_s});`
nil
end

def $stderr.puts(*strs)
%x{
for (var i = 0; i < strs.length; i++) {
if (strs[i] instanceof Array) {
#{puts(*`strs[i]`)};
}
else {
console.warn(#{`strs[i]`.to_s});
}
}
}

def $stderr.write(string)
`console.warn(#{string.to_s});`
nil
end

$stdout.extend(IO::Writable)
$stderr.extend(IO::Writable)
4 changes: 3 additions & 1 deletion opal/corelib/kernel.rb
View file
Original file line number Diff line number Diff line change
@@ -443,7 +443,9 @@ def p(*args)
args.length <= 1 ? args[0] : args
end

alias print puts
def print(*strs)
$stdout.print(*strs)
end

def warn(*strs)
$stderr.puts(*strs) unless $VERBOSE.nil? || strs.empty?