master: [snapshot]

opal · May 2, 2018 · 5a73190 · 5a73190
1 parent f11374d
commit 5a73190
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/lib/opal/compiler.rb b/lib/opal/compiler.rb
@@ -172,7 +172,11 @@ def initialize(source, options = {})
     def compile
       parse
 
-      @fragments = process(@sexp).flatten
+      begin
+        @fragments = process(@sexp).flatten
+      rescue => error
+        raise ::Opal.error_with_opal_backtrace(error, file)
+      end
 
       @result = @fragments.map(&:code).join('')
     end
@@ -186,7 +190,7 @@ def parse
       begin
         sexp, comments, tokens = @parser.tokenize(@buffer)
       rescue ::Opal::Error, ::Parser::SyntaxError => error
-        raise ::Opal::SyntaxError.with_opal_backtrace(error, file)
+        raise ::Opal.error_with_opal_backtrace(error, file, ::Opal::SyntaxError)
       end
 
       @sexp = s(:top, sexp || s(:nil))

diff --git a/lib/opal/errors.rb b/lib/opal/errors.rb
@@ -29,15 +29,15 @@ class RewritingError < ParsingError
 
   class SyntaxError < ::SyntaxError
     attr_accessor :location
+  end
 
-    # Not redefining #backtrace because of https://bugs.ruby-lang.org/issues/14693
-    def self.with_opal_backtrace(error, path)
-      new_error = new(error.message)
-      backtrace = error.backtrace.to_a
-      backtrace.unshift OpalBacktraceLocation.new(error, path).to_s
-      new_error.set_backtrace backtrace
-      new_error
-    end
+  # Not redefining #backtrace because of https://bugs.ruby-lang.org/issues/14693
+  def self.error_with_opal_backtrace(error, path, error_class = nil)
+    new_error = error_class ? error_class.new(error.message) : error.dup
+    backtrace = error.backtrace.to_a
+    backtrace.unshift OpalBacktraceLocation.new(error, path).to_s
+    new_error.set_backtrace backtrace
+    new_error
   end
 
   # Loosely compatible with Thread::Backtrace::Location