@@ -25,6 +25,10 @@ pub enum LexicalErrorType {
     TabsAfterSpaces,
     DefaultArgumentError,
     PositionalArgumentError,
+    IterableArgumentUnpackingError,
+    StarredExpressionError,
+    DoubleStarredExpressionError,
+    GeneratorExpressionError,
     DuplicateKeywordArgumentError,
     UnrecognizedToken { tok: char },
     FStringError(FStringErrorType),
@@ -58,6 +62,21 @@ impl fmt::Display for LexicalErrorType {
             LexicalErrorType::PositionalArgumentError => {
                 write!(f, "positional argument follows keyword argument")
             }
+            LexicalErrorType::IterableArgumentUnpackingError => {
+                write!(
+                    f,
+                    "iterable argument unpacking follows keyword argument unpacking"
+                )
+            }
+            LexicalErrorType::StarredExpressionError => {
+                write!(f, "cannot use starred expression here")
+            }
+            LexicalErrorType::DoubleStarredExpressionError => {
+                write!(f, "cannot use double starred expression here")
+            }
+            LexicalErrorType::GeneratorExpressionError => {
+                write!(f, "Generator expression must be parenthesized")
+            }
             LexicalErrorType::UnrecognizedToken { tok } => {
                 write!(f, "Got unexpected token {}", tok)
             }
 
@@ -1005,7 +1005,7 @@ Atom: ast::Expr = {
                 match elt.node {
                     ast::ExprKind::Starred { .. } => {
                         Err(LexicalError{
-                            error : LexicalErrorType::OtherError("cannot use starred expression here".to_string()),
+                            error : LexicalErrorType::StarredExpressionError,
                             location,
                         }.into())
                     },
@@ -1033,7 +1033,7 @@ Atom: ast::Expr = {
     },
     "(" <location:@L> "**" <e:Expression> ")" =>? {
         Err(LexicalError{
-            error : LexicalErrorType::OtherError("cannot use double starred expression here".to_string()),
+            error : LexicalErrorType::DoubleStarredExpressionError,
             location,
         }.into())
     },