fix(zscript): don't only show singular deprecation warnings

ZQuestClassic · Apr 3, 2024 · 88898e2 · 88898e2
1 parent 331bbd4
commit 88898e2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/src/parser/ASTVisitors.cpp b/src/parser/ASTVisitors.cpp
@@ -97,19 +97,15 @@ void RecursiveVisitor::deprecWarn(Function* func, AST* host, std::string const&
 		case 0: //No warn
 			break;
 		case 2: //Error
-			//Only show once, if func is deprecated. Show error even if warn shown before.
 			if(func->shouldShowDepr(true))
 			{
 				handleError(CompileError::DeprecatedError(host, s1, s2), &func->getInfo());
-				func->ShownDepr(true);
 			}
 			break;
 		default: //Warn
-			//Only show once, if func is deprecated
 			if(func->shouldShowDepr(false))
 			{
 				handleError(CompileError::DeprecatedWarn(host, s1, s2), &func->getInfo());
-				func->ShownDepr(false);
 			}
 			break;
 	}

diff --git a/src/parser/ZScript.cpp b/src/parser/ZScript.cpp
@@ -570,7 +570,7 @@ Function::Function(DataType const* returnType, string const& name,
 	: returnType(returnType), name(name), hasPrefixType(false), isFromTypeTemplate(false),
 	  extra_vargs(0), paramTypes(paramTypes), paramNames(paramNames), opt_vals(), id(id),
 	  node(NULL), internalScope(NULL), thisVar(NULL), internal_flags(internal_flags), prototype(prototype),
-	  defaultReturn(defaultReturn), label(std::nullopt), flags(flags), shown_depr(false),
+	  defaultReturn(defaultReturn), label(std::nullopt), flags(flags),
 	  aliased_func(nullptr), paramDatum()
 {
 	assert(returnType);
@@ -646,16 +646,7 @@ bool Function::isTracing() const
 //Return true the first time it is called, if func is deprecated
 bool Function::shouldShowDepr(bool err) const
 {
-	if(!getFlag(FUNCFLAG_DEPRECATED)) return false;
-	if(err) return shown_depr < 2;
-	return !shown_depr;
-}
-void Function::ShownDepr(bool err)
-{
-	if(err)
-		shown_depr = 2;
-	else if(shown_depr < 2)
-		shown_depr = 1;
+	return getFlag(FUNCFLAG_DEPRECATED);
 }
 
 void Function::alias(Function* func, bool force)

diff --git a/src/parser/ZScript.h b/src/parser/ZScript.h
@@ -544,7 +544,6 @@ namespace ZScript
 		optional<int32_t> defaultReturn;
 
 		bool shouldShowDepr(bool err) const;
-		void ShownDepr(bool err);
 
 		void alias(Function* func, bool force = false);
 		bool is_aliased() const {return bool(aliased_func);}
@@ -601,7 +600,6 @@ namespace ZScript
 		mutable std::optional<int32_t> altlabel;
 		int32_t flags, internal_flags;
 		FunctionScope* internalScope;
-		byte shown_depr;
 		string info;
 
 		// Code implementing this function.