Parser: Improve UnexpectedAttribute error message

Author: SirLynix

include/NZSL/Lang/ErrorList.hpp

@@ -48,7 +48,7 @@ NZSL_SHADERLANG_PARSER_ERROR(ModuleFeatureMultipleUnique, "module feature {} has
 NZSL_SHADERLANG_PARSER_ERROR(ReservedKeyword, "reserved keyword")
 NZSL_SHADERLANG_PARSER_ERROR(UnknownAttribute, "unknown attribute \"{}\"", std::string)
 NZSL_SHADERLANG_PARSER_ERROR(UnknownType, "unknown type")
-NZSL_SHADERLANG_PARSER_ERROR(UnexpectedAttribute, "unexpected attribute {}", Ast::AttributeType)
+NZSL_SHADERLANG_PARSER_ERROR(UnexpectedAttribute, "unexpected attribute {} on {}", Ast::AttributeType, std::string)
 NZSL_SHADERLANG_PARSER_ERROR(UnexpectedEndOfFile, "unexpected end of file")
 NZSL_SHADERLANG_PARSER_ERROR(UnexpectedToken, "unexpected token {}", TokenType)
 

src/NZSL/Parser.cpp

@@ -377,7 +377,7 @@ namespace nzsl
 				}
 
 				default:
-					throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type };
+					throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type, "module statement" };
 			}
 		}
 
@@ -615,7 +615,7 @@ namespace nzsl
 							break;
 
 						default:
-							throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type };
+							throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type, "const declaration" };
 					}
 				}
 
@@ -712,7 +712,7 @@ namespace nzsl
 					break;
 
 				default:
-					throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type };
+					throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type, "external block" };
 			}
 		}
 
@@ -761,7 +761,7 @@ namespace nzsl
 							break;
 
 						default:
-							throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type };
+							throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type, "external variable" };
 					}
 				}
 			}
@@ -824,7 +824,7 @@ namespace nzsl
 						break;
 
 					default:
-						throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type };
+						throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type, "for loop" };
 				}
 			}
 
@@ -848,7 +848,7 @@ namespace nzsl
 						break;
 
 					default:
-						throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type };
+						throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type, "foreach loop" };
 				}
 			}
 
@@ -952,7 +952,7 @@ namespace nzsl
 				}
 
 				default:
-					throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type };
+					throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type, "function declaration" };
 			}
 		}
 
@@ -1070,7 +1070,7 @@ namespace nzsl
 		{
 			case TokenType::Alias:
 				if (!attributes.empty())
-					throw ParserUnexpectedAttributeError{ attributes.front().sourceLocation, attributes.front().type };
+					throw ParserUnexpectedAttributeError{ attributes.front().sourceLocation, attributes.front().type, "alias declaration" };
 
 				return ParseAliasDeclaration();
 
@@ -1086,9 +1086,12 @@ namespace nzsl
 			case TokenType::External:
 				return ParseExternalBlock(std::move(attributes));
 
+			case TokenType::FunctionDeclaration:
+				return ParseFunctionDeclaration(std::move(attributes));
+
 			case TokenType::Import:
 				if (!attributes.empty())
-					throw ParserUnexpectedAttributeError{ attributes.front().sourceLocation, attributes.front().type };
+					throw ParserUnexpectedAttributeError{ attributes.front().sourceLocation, attributes.front().type, "import statement"};
 
 				return ParseImportStatement();
 
@@ -1103,14 +1106,11 @@ namespace nzsl
 			case TokenType::Option:
 			{
 				if (!attributes.empty())
-					throw ParserUnexpectedAttributeError{ attributes.front().sourceLocation, attributes.front().type };
+					throw ParserUnexpectedAttributeError{ attributes.front().sourceLocation, attributes.front().type, "option declaration" };
 
 				return ParseOptionDeclaration();
 			}
 
-			case TokenType::FunctionDeclaration:
-				return ParseFunctionDeclaration(std::move(attributes));
-
 			case TokenType::Struct:
 				return ParseStructDeclaration(std::move(attributes));
 
@@ -1278,7 +1278,7 @@ namespace nzsl
 					break;
 
 				default:
-					throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type };
+					throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type, "struct declaration" };
 			}
 		}
 
@@ -1334,7 +1334,7 @@ namespace nzsl
 							break;
 
 						default:
-							throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type };
+							throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type, "struct member" };
 					}
 				}
 			}
@@ -1406,7 +1406,7 @@ namespace nzsl
 					break;
 
 				default:
-					throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type };
+					throw ParserUnexpectedAttributeError{ attribute.sourceLocation, attribute.type, "while loop" };
 			}
 		}
 

tests/src/Tests/ErrorsTests.cpp

@@ -70,7 +70,7 @@ module;
 
 [cond(false)]
 alias vec3f32 = vec3[f32];
-)"), "(5,2 -> 12): PUnexpectedAttribute error: unexpected attribute cond");
+)"), "(5,2 -> 12): PUnexpectedAttribute error: unexpected attribute cond on alias declaration");
 
 		// import statements don't support cond attribute
 		CHECK_THROWS_WITH(nzsl::Parse(R"(
@@ -79,7 +79,7 @@ module;
 
 [cond(true)]
 import Stuff;
-)"), "(5,2 -> 11): PUnexpectedAttribute error: unexpected attribute cond");
+)"), "(5,2 -> 11): PUnexpectedAttribute error: unexpected attribute cond on import statement");
 
 		// option statements don't support attributes
 		CHECK_THROWS_WITH(nzsl::Parse(R"(
@@ -88,7 +88,7 @@ module;
 
 [cond(false)]
 option enable: bool;
-)"), "(5,2 -> 12): PUnexpectedAttribute error: unexpected attribute cond");
+)"), "(5,2 -> 12): PUnexpectedAttribute error: unexpected attribute cond on option declaration");
 	}
 
 	SECTION("Checking compiler errors")