Superficial changes to script-opt related code

* Rename overly generic ACCESSORS macro with ZEEK_ prefix
* A few places where whitespace was noticeably wrong/distracting
* Minor/obvious reference/move semantics improvements suggested by linter
* Remove unused detail::Scope::Remove(), no need for deprecation

src/Expr.h

@@ -179,19 +179,18 @@ public:
 	void MarkParen()		{ paren = true; }
 	bool IsParen() const		{ return paren; }
 
-#undef ACCESSORS
+#define ZEEK_EXPR_ACCESSOR_DECLS(ctype) \
-#define ACCESSORS(ctype) \
 	const ctype* As ## ctype () const; \
 	ctype* As ## ctype (); \
 	IntrusivePtr<ctype> As ## ctype ## Ptr ();
 
-	ACCESSORS(ListExpr)
+	ZEEK_EXPR_ACCESSOR_DECLS(ListExpr)
-	ACCESSORS(NameExpr)
+	ZEEK_EXPR_ACCESSOR_DECLS(NameExpr)
-	ACCESSORS(ConstExpr)
+	ZEEK_EXPR_ACCESSOR_DECLS(ConstExpr)
-	ACCESSORS(CallExpr)
+	ZEEK_EXPR_ACCESSOR_DECLS(CallExpr)
-	ACCESSORS(AssignExpr)
+	ZEEK_EXPR_ACCESSOR_DECLS(AssignExpr)
-	ACCESSORS(IndexExpr)
+	ZEEK_EXPR_ACCESSOR_DECLS(IndexExpr)
-	ACCESSORS(EventExpr)
+	ZEEK_EXPR_ACCESSOR_DECLS(EventExpr)
 
 	void Describe(ODesc* d) const override final;
 

src/Frame.h

@@ -325,7 +325,8 @@ private:
 	/** Associates ID's offsets with values. */
 	std::unique_ptr<Element[]> frame;
 
-	/** The offset we're currently using for references into the frame.
+	/**
+	 * The offset we're currently using for references into the frame.
 	 * This is how we support inlined functions without having to
 	 * alter the offsets associated with their local variables.
 	 */

src/Func.h

@@ -64,16 +64,10 @@ public:
 	~Func() override;
 
 	zeek::detail::ScriptFunc* AsScriptFunc()
-                {
+		{ return GetKind() == SCRIPT_FUNC ? (detail::ScriptFunc*) this : nullptr; }
-		return GetKind() == SCRIPT_FUNC ?
-				(zeek::detail::ScriptFunc*) this : nullptr;
-		}
 
 	const zeek::detail::ScriptFunc* AsScriptFunc() const
-                {
+		{ return GetKind() == SCRIPT_FUNC ? (detail::ScriptFunc*) this : nullptr; }
-		return GetKind() == SCRIPT_FUNC ?
-				(zeek::detail::ScriptFunc*) this : nullptr;
-		}
 
 	virtual bool IsPure() const = 0;
 	FunctionFlavor Flavor() const	{ return GetType()->Flavor(); }

src/Scope.cc

@@ -47,20 +47,6 @@ const IDPtr& Scope::Find(std::string_view name) const
 	return ID::nil;
 	}
 
-IDPtr Scope::Remove(std::string_view name)
-	{
-	auto entry = local.find(name);
-
-	if ( entry != local.end() )
-		{
-		auto id = std::move(entry->second);
-		local.erase(entry);
-		return id;
-		}
-
-	return nullptr;
-	}
-
 IDPtr Scope::GenerateTemporary(const char* name)
 	{
 	return make_intrusive<ID>(name, SCOPE_FUNCTION, false);

src/Scope.h

@@ -50,9 +50,6 @@ public:
 		ordered_vars.push_back(std::forward<I>(id));
 		}
 
-	IDPtr Remove(std::string_view name);
-	[[deprecated("Remove in v4.1 as an unused API call.")]]
-
 	[[deprecated("Remove in v4.1.  Use GetID().")]]
 	ID* ScopeID() const		{ return scope_id.get(); }
 

src/script_opt/Inline.cc

@@ -171,7 +171,7 @@ ExprPtr Inliner::CheckForInlining(IntrusivePtr<CallExpr> c)
 	if ( ! func->IsGlobal() )
 		return std::move(c);
 
-	auto func_v = func->GetVal();
+	const auto& func_v = func->GetVal();
 	if ( ! func_v )
 		return std::move(c);
 

src/script_opt/ProfileFunc.cc

@@ -20,7 +20,7 @@ TraversalCode ProfileFunc::PreStmt(const Stmt* s)
 
 	if ( tag == STMT_INIT )
 		{
-		for ( auto id : s->AsInitStmt()->Inits() )
+		for ( const auto& id : s->AsInitStmt()->Inits() )
 			inits.insert(id.get());
 
 		// Don't recurse into these, as we don't want to consider

src/script_opt/ScriptOpt.h

@@ -34,9 +34,9 @@ class FuncInfo {
 public:
 	FuncInfo(ScriptFuncPtr _func, ScopePtr _scope, StmtPtr _body)
 		{
-		func = _func;
+		func = std::move(_func);
-		scope = _scope;
+		scope = std::move(_scope);
-		body = _body;
+		body = std::move(_body);
 		}
 
 	~FuncInfo();