Traktor: Cleanup in script editor module.

code/Script/Editor/Lexer.h

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -13,6 +13,9 @@
 namespace traktor::script
 {
 
+/*! Script outline parser lexer.
+ * \ingroup Script
+ */
 class Lexer : public Object
 {
 	T_RTTI_CLASS;

code/Script/Editor/ScriptEditorPage.h

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -30,17 +30,19 @@ namespace traktor
 
 class Preprocessor;
 
-	namespace editor
-	{
+}
+
+namespace traktor::editor
+{
 
 class IDocument;
 class IEditor;
 class IEditorPageSite;
 
-	}
+}
 
-	namespace ui
-	{
+namespace traktor::ui
+{
 
 class IBitmap;
 class GridRow;
@@ -53,10 +55,10 @@ class Tab;
 class ToolBar;
 class ToolBarButtonClickEvent;
 
-	}
+}
 
-	namespace script
-	{
+namespace traktor::script
+{
 
 class IScriptCompiler;
 class IScriptContext;
@@ -73,7 +75,7 @@ class T_DLLCLASS ScriptEditorPage
 	T_RTTI_CLASS;
 
 public:
-	ScriptEditorPage(editor::IEditor* editor, editor::IEditorPageSite* site, editor::IDocument* document);
+	explicit ScriptEditorPage(editor::IEditor* editor, editor::IEditorPageSite* site, editor::IDocument* document);
 
 	virtual bool create(ui::Container* parent) override final;
 
@@ -153,6 +155,4 @@ class T_DLLCLASS ScriptEditorPage
 	void eventTimer(ui::TimerEvent* event);
 };
 
-	}
 }
-

code/Script/Editor/ScriptEditorPageFactory.cpp

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,10 +12,8 @@
 #include "Script/Editor/ScriptEditorPageFactory.h"
 #include "Ui/Command.h"
 
-namespace traktor
+namespace traktor::script
 {
-	namespace script
-	{
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.script.ScriptEditorPageFactory", 0, ScriptEditorPageFactory, editor::IEditorPageFactory)
 
@@ -47,5 +45,4 @@ Ref< ISerializable > ScriptEditorPageFactory::cloneAsset(const ISerializable* as
 	return DeepClone(asset).create();
 }
 
-	}
 }

code/Script/Editor/ScriptEditorPageFactory.h

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,10 +18,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::script
 {
-	namespace script
-	{
 
 class T_DLLCLASS ScriptEditorPageFactory : public editor::IEditorPageFactory
 {
@@ -39,6 +37,4 @@ class T_DLLCLASS ScriptEditorPageFactory : public editor::IEditorPageFactory
 	virtual Ref< ISerializable > cloneAsset(const ISerializable* asset) const override final;
 };
 
-	}
 }
-

code/Script/Editor/ScriptEditorPlugin.h

@@ -1,29 +1,26 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#ifndef traktor_script_ScriptEditorPlugin_H
-#define traktor_script_ScriptEditorPlugin_H
+#pragma once
 
 #include "Core/Ref.h"
 #include "Editor/IEditorPlugin.h"
 #include "Script/Editor/IScriptDebuggerSessions.h"
 
-namespace traktor
+namespace traktor::editor
 {
-	namespace editor
-	{
 
 class IEditor;
 
-	}
+}
 
-	namespace script
-	{
+namespace traktor::script
+{
 
 class IScriptManager;
 class ScriptDebuggerSessions;
@@ -38,7 +35,7 @@ class ScriptEditorPlugin
 	T_RTTI_CLASS;
 
 public:
-	ScriptEditorPlugin(editor::IEditor* editor);
+	explicit ScriptEditorPlugin(editor::IEditor* editor);
 
 	virtual bool create(ui::Widget* parent, editor::IEditorPageSite* site) override final;
 
@@ -73,8 +70,4 @@ class ScriptEditorPlugin
 	Ref< script::ScriptDebuggerSessions > m_debuggerSessions;
 };
 
-	}
 }
-
-#endif	// traktor_script_ScriptEditorPlugin_H
-

code/Script/Editor/ScriptOutlineLua.cpp

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,12 +19,10 @@ void *ParseAlloc(void *(*mallocProc)(size_t));
 void ParseFree(void *p, void (*freeProc)(void*));
 void Parse(void *yyp, int yymajor, traktor::script::LuaGrammarToken* yyminor, const traktor::script::ScriptOutlineLua* outline);
 
-namespace traktor
+namespace traktor::script
 {
-	namespace script
+	namespace
 	{
-		namespace
-		{
 
 const std::map< wchar_t, int32_t >& getSingles()
 {
@@ -94,53 +92,52 @@ const std::map< std::wstring, int32_t >& getTuples()
 	return tuples;
 }
 
-		}
+	}
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.script.ScriptOutlineLua", 0, ScriptOutlineLua, IScriptOutline)
 
 Ref< IScriptOutline::Node > ScriptOutlineLua::parse(const std::wstring& text) const
 {
-	Lexer lx(text.c_str(), text.length());
+	Lexer lx(text.c_str(), (uint32_t)text.length());
 
 	void* parser = ParseAlloc(malloc);
 	if (!parser)
-		return 0;
+		return nullptr;
 
-	const std::map< wchar_t, int32_t >& single = getSingles();
-	const std::map< std::wstring, int32_t >& tuples = getTuples();
+	const auto& single = getSingles();
+	const auto& tuples = getTuples();
 
 	int32_t type;
 	while ((type = lx.next()) != Lexer::LtEndOfFile)
 	{
 		if (type == Lexer::LtWord)
 		{
-			std::wstring word = lx.getWord();
-
-			std::map< std::wstring, int32_t >::const_iterator it = tuples.find(word);
+			const std::wstring word = lx.getWord();
+			const auto it = tuples.find(word);
 			if (it != tuples.end())
 				Parse(parser, it->second, 0, this);
 			else
 				Parse(parser, TOKEN_NAME, new LuaGrammarToken(word, lx.getLine()), this);
 		}
 		else if (type == Lexer::LtString)
 		{
-			std::wstring str = lx.getString();
+			const std::wstring str = lx.getString();
 			Parse(parser, TOKEN_STRING, new LuaGrammarToken(str, lx.getLine()), this);
 		}
 		else if (type == Lexer::LtNumber)
 		{
-			double number = lx.getNumber();
+			const double number = lx.getNumber();
 			Parse(parser, TOKEN_NUMBER, new LuaGrammarToken(L"", lx.getLine()), this);
 		}
 		else
 		{
-			std::map< wchar_t, int32_t >::const_iterator it = single.find(type);
+			const auto it = single.find(type);
 			if (it != single.end())
 				Parse(parser, it->second, new LuaGrammarToken(L"", lx.getLine()), this);
 		}
 	}
 
-	Parse(parser, 0, 0, this);
+	Parse(parser, 0, nullptr, this);
 	ParseFree(parser, free);
 
 	return m_result;
@@ -155,5 +152,4 @@ void ScriptOutlineLua::syntaxError() const
 {
 }
 
-	}
 }

code/Script/Editor/ScriptOutlineLua.h

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,10 +10,8 @@
 
 #include "Script/Editor/IScriptOutline.h"
 
-namespace traktor
+namespace traktor::script
 {
-	namespace script
-	{
 
 /*! LUA script outline parser.
  * \ingroup Script
@@ -33,6 +31,4 @@ class ScriptOutlineLua : public IScriptOutline
 	mutable Ref< Node > m_result;
 };
 
-	}
 }
-

code/Script/Editor/ScriptPipeline.cpp

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -31,12 +31,10 @@
 #include "Script/Editor/Script.h"
 #include "Script/Editor/ScriptPipeline.h"
 
-namespace traktor
+namespace traktor::script
 {
-	namespace script
+	namespace
 	{
-		namespace
-		{
 
 struct ErrorCallback : public IErrorCallback
 {
@@ -111,7 +109,7 @@ bool flattenDependencies(editor::IPipelineBuilder* pipelineBuilder, const std::w
 	return true;
 }
 
-		}
+	}
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.script.ScriptPipeline", 21, ScriptPipeline, editor::DefaultPipeline)
 
@@ -287,5 +285,4 @@ bool ScriptPipeline::buildOutput(
 	);
 }
 
-	}
 }