core: bring back panicking behvaiour from pre-1.8.0 (#200)

Author: markus-wa

net_messages.go

@@ -12,7 +12,7 @@ const entitySentinel = 9999
 
 func (p *Parser) handlePacketEntities(pe *msg.CSVCMsg_PacketEntities) {
 	defer func() {
-		p.setError(recoverFromPanic(recover()))
+		p.setError(recoverFromUnexpectedEOF(recover()))
 	}()
 
 	r := bit.NewSmallBitReader(bytes.NewReader(pe.EntityData))

parser_test.go

@@ -66,16 +66,15 @@ func TestParser_Progress_NoHeader(t *testing.T) {
 	assert.Zero(t, (&Parser{header: &common.DemoHeader{}}).Progress())
 }
 
-func TestRecoverFromPanic(t *testing.T) {
-	assert.Nil(t, recoverFromPanic(nil))
-	assert.Equal(t, ErrUnexpectedEndOfDemo, recoverFromPanic(io.ErrUnexpectedEOF))
-	assert.Equal(t, ErrUnexpectedEndOfDemo, recoverFromPanic(io.EOF))
-
-	err := errors.New("test")
-	assert.Equal(t, err, recoverFromPanic(err))
-
-	assert.Equal(t, "test", recoverFromPanic("test").Error())
-	assert.Equal(t, "unexpected error: 1", recoverFromPanic(1).Error())
+func TestRecoverFromUnexpectedEOF(t *testing.T) {
+	assert.Nil(t, recoverFromUnexpectedEOF(nil))
+	assert.Equal(t, ErrUnexpectedEndOfDemo, recoverFromUnexpectedEOF(io.ErrUnexpectedEOF))
+	assert.Equal(t, ErrUnexpectedEndOfDemo, recoverFromUnexpectedEOF(io.EOF))
+
+	assert.Panics(t, func() {
+		r := recoverFromUnexpectedEOF(errors.New("test"))
+		assert.Failf(t, "expected panic, got recovery", "recovered value = '%v'", r)
+	})
 }
 
 type consumerCodePanicMock struct {
@@ -92,7 +91,7 @@ func (ucp consumerCodePanicMock) Value() interface{} {
 
 func TestRecoverFromPanic_ConsumerCodePanic(t *testing.T) {
 	assert.PanicsWithValue(t, 1, func() {
-		err := recoverFromPanic(consumerCodePanicMock{value: 1})
+		err := recoverFromUnexpectedEOF(consumerCodePanicMock{value: 1})
 		assert.Nil(t, err)
 	})
 }

parsing.go

@@ -98,7 +98,7 @@ func (p *Parser) ParseToEnd() (err error) {
 		}
 
 		if err == nil {
-			err = recoverFromPanic(recover())
+			err = recoverFromUnexpectedEOF(recover())
 		}
 	}()
 
@@ -126,7 +126,7 @@ func (p *Parser) ParseToEnd() (err error) {
 	}
 }
 
-func recoverFromPanic(r interface{}) error {
+func recoverFromUnexpectedEOF(r interface{}) error {
 	if r == nil {
 		return nil
 	}
@@ -138,12 +138,8 @@ func recoverFromPanic(r interface{}) error {
 	switch err := r.(type) {
 	case dispatch.ConsumerCodePanic:
 		panic(err.Value())
-	case error:
-		return err
-	case string:
-		return errors.New(err)
 	default:
-		return fmt.Errorf("unexpected error: %v", err)
+		panic(err)
 	}
 }
 
@@ -174,7 +170,7 @@ func (p *Parser) ParseNextFrame() (moreFrames bool, err error) {
 		}
 
 		if err == nil {
-			err = recoverFromPanic(recover())
+			err = recoverFromUnexpectedEOF(recover())
 		}
 	}()
 

stringtables.go

@@ -99,7 +99,7 @@ func (p *Parser) parseSingleStringTable(name string) {
 }
 
 func (p *Parser) handleUpdateStringTable(tab *msg.CSVCMsg_UpdateStringTable) {
-	// No need for recoverFromPanic here as we do that in processStringTable already
+	// No need for recoverFromUnexpectedEOF here as we do that in processStringTable already
 
 	cTab := p.stringTables[tab.TableId]
 	switch cTab.Name {
@@ -117,7 +117,7 @@ func (p *Parser) handleUpdateStringTable(tab *msg.CSVCMsg_UpdateStringTable) {
 }
 
 func (p *Parser) handleCreateStringTable(tab *msg.CSVCMsg_CreateStringTable) {
-	// No need for recoverFromPanic here as we do that in processStringTable already
+	// No need for recoverFromUnexpectedEOF here as we do that in processStringTable already
 
 	p.processStringTable(tab)
 
@@ -128,7 +128,7 @@ func (p *Parser) handleCreateStringTable(tab *msg.CSVCMsg_CreateStringTable) {
 
 func (p *Parser) processStringTable(tab *msg.CSVCMsg_CreateStringTable) {
 	defer func() {
-		p.setError(recoverFromPanic(recover()))
+		p.setError(recoverFromUnexpectedEOF(recover()))
 	}()
 
 	if tab.Name == stNameModelPreCache {