Make RException return as error

cmd/irb/main.go

@@ -31,13 +31,6 @@ func main() {
 		}
 
 		ret, err := mrb.LoadString(line)
-
-		// NOTE: ret may be error
-		errRet, ok := ret.(error)
-		if ok {
-			err = errRet
-		}
-
 		if err != nil {
 			fmt.Println(err)
 		} else {

godogs_test.go

@@ -22,11 +22,21 @@ const SuiteSuccessCode = 0
 type RubyFeature struct {
 	mrb *mruby.State
 	ret mruby.Value
+	exc mruby.RException
 }
 
-func (feat *RubyFeature) iExecuteRubyCode(code *godog.DocString) (err error) {
-	feat.ret, err = feat.mrb.LoadString(code.Content)
-	return
+func (feat *RubyFeature) iExecuteRubyCode(code *godog.DocString) error {
+	ret, err := feat.mrb.LoadString(code.Content)
+	if err != nil {
+		exc, ok := err.(mruby.RException)
+		if !ok {
+			return err
+		}
+		feat.exc = exc
+	}
+	feat.ret = ret
+
+	return nil
 }
 
 func (feat *RubyFeature) thereShouldReturnInteger(expected int) error {
@@ -179,7 +189,7 @@ func (feat *RubyFeature) thereShouldReturnAHash(doc *godog.DocString) error {
 }
 
 func (feat *RubyFeature) theExceptionMessageShouldBe(expected string) error {
-	exc, ok := feat.ret.(mruby.RException)
+	exc, ok := feat.exc.(mruby.RException)
 
 	if !ok {
 		return fmt.Errorf("expected exception, got %T", feat.ret)

vm.go

@@ -41,14 +41,7 @@ func (mrb *State) VmRun(proc RProc, self Value) (Value, error) {
 func (mrb *State) VmExec(proc RProc, code *insn.Sequence) (ret Value, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			ret = nil
-
-			switch v := r.(type) {
-			case RException:
-				ret = v
-			case error:
-				err = v
-			}
+			err = r.(error)
 		}
 	}()