1 files changed, 8 insertions, 1 deletions
diff --git a/src/parse/parseerror.cpp b/src/parse/parseerror.cpp
index 0d58bd52..bd9d5a7c 100644
--- a/src/parse/parseerror.cpp
+++ b/src/parse/parseerror.cpp
@@ -78,7 +78,14 @@ ParseError::Unexpected::Unexpected(const TokenStream& lex, Token tok, ::std::vec
     if(pos.filename == "")
         pos = lex.getPosition();
     ::std::cout << pos << ": Unexpected " << tok << ", expected ";
-    ::std::cout << exp << ")" << ::std::endl;
+    bool f = true;
+    for(auto v: exp) {
+        if(!f)
+            ::std::cout << " or ";
+        f = false;
+        ::std::cout << Token::typestr(v);
+    }
+    ::std::cout << ::std::endl;
 }
 ParseError::Unexpected::~Unexpected() throw()
 {