enhance error messages

git-svn-id: http://svn.twig-project.org/trunk@160 93ef8e89-cb99-4229-a87c-7fa0fa45744b

diff --git a/lib/Twig/TokenStream.php b/lib/Twig/TokenStream.php
index b14165e..a696d3c 100644 (file)
--- a/lib/Twig/TokenStream.php
+++ b/lib/Twig/TokenStream.php
@@ -127,7 +127,11 @@ class Twig_TokenStream
     $token = $this->current;
     if (!$token->test($primary, $secondary))
     {
-      throw new Twig_SyntaxError(sprintf('Unexpected token %s (%s expected, value: %s)', Twig_Token::getTypeAsString($token->getType()), Twig_Token::getTypeAsString($primary), $token->getValue()), $this->current->getLine());
+      throw new Twig_SyntaxError(sprintf('Unexpected token "%s" of value "%s" ("%s" expected%s)',
+        Twig_Token::getTypeAsString($token->getType()), $token->getValue(),
+        Twig_Token::getTypeAsString($primary), $secondary ? sprintf(' with value "%s"', $secondary) : ''),
+        $this->current->getLine()
+      );
     }
     $this->next();