mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-14 02:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Script* classes to Script namespace

Browse Source 
- Rename ScriptEngine, ScriptContext, ScriptInterface, ScriptRequest to
  Script::Engine, Script::Context, Script::Interface, Script::Request
- Remove 'Script' prefix from filenames:
  ScriptContext.* → Context.*
  ScriptInterface.* → Interface.*
  ScriptRequest.* → Request.*
  ScriptEngine.* → Engine.*
  ScriptConversions.* → Conversions.*
  ScriptExceptions.* → Exceptions.*
  ScriptForward.* → ForwardDeclarations.*
  ScriptStats.* → Stats.*
- Update all includes, forward declarations, and friend classes
- Use namespace Script { ... } in .cpp definitions to avoid repetitive
  Script:: prefix (keeping global callbacks outside)
- Rename internal implementation structs:
  ScriptInterface_impl → Interface_impl
  ScriptFunction → Function
- Update copyright year to 2026 in all touched files
- Suppress pre-existing cppcheck warnings (uninitvar, nullPointer, unknown
  macro) by adding them to suppressions-list.txt (these are not caused
  by this refactor)

Fixes #7516
This commit is contained in:
vyordan
2026-06-02 15:06:50 -06:00
committed by phosit
parent 310c4bf028
commit ec8b420abc
220 changed files with 2224 additions and 2153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/StructuredClone.cpp
+12 -12
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,51 +21,51 @@
#include "lib/debug.h"
#include "ps/Profile.h"
#include "scriptinterface/ScriptExceptions.h"
#include "scriptinterface/ScriptRequest.h"
#include "scriptinterface/Exceptions.h"
#include "scriptinterface/Request.h"
#include <js/CallArgs.h>
#include <js/RootingAPI.h>
#include <js/StructuredClone.h>
class ScriptInterface;
namespace Script { class Interface; }
Script::StructuredClone Script::WriteStructuredClone(const ScriptRequest& rq, JS::HandleValue v)
Script::StructuredClone Script::WriteStructuredClone(const Script::Request& rq, JS::HandleValue v)
{
Script::StructuredClone ret(new JSStructuredCloneData(JS::StructuredCloneScope::SameProcess));
JS::CloneDataPolicy policy;
if (!JS_WriteStructuredClone(rq.cx, v, ret.get(), JS::StructuredCloneScope::SameProcess, policy, nullptr, nullptr, JS::UndefinedHandleValue))
{
debug_warn(L"Writing a structured clone with JS_WriteStructuredClone failed!");
ScriptException::CatchPending(rq);
Script::Exception::CatchPending(rq);
return StructuredClone();
}
return ret;
}
void Script::ReadStructuredClone(const ScriptRequest& rq, const Script::StructuredClone& ptr, JS::MutableHandleValue ret)
void Script::ReadStructuredClone(const Script::Request& rq, const Script::StructuredClone& ptr, JS::MutableHandleValue ret)
{
JS::CloneDataPolicy policy;
if (!JS_ReadStructuredClone(rq.cx, *ptr, JS_STRUCTURED_CLONE_VERSION, ptr->scope(), ret, policy, nullptr, nullptr))
ScriptException::CatchPending(rq);
Script::Exception::CatchPending(rq);
}
JS::Value Script::CloneValueFromOtherCompartment(const ScriptInterface& to, const ScriptInterface& from, JS::HandleValue val)
JS::Value Script::CloneValueFromOtherCompartment(const Script::Interface& to, const Script::Interface& from, JS::HandleValue val)
{
PROFILE("CloneValueFromOtherCompartment");
Script::StructuredClone structuredClone;
{
ScriptRequest fromRq(from);
Script::Request fromRq(from);
structuredClone = WriteStructuredClone(fromRq, val);
}
ScriptRequest toRq(to);
Script::Request toRq(to);
JS::RootedValue out(toRq.cx);
ReadStructuredClone(toRq, structuredClone, &out);
return out.get();
}
JS::Value Script::DeepCopy(const ScriptRequest& rq, JS::HandleValue val)
JS::Value Script::DeepCopy(const Script::Request& rq, JS::HandleValue val)
{
JS::RootedValue out(rq.cx);
ReadStructuredClone(rq, WriteStructuredClone(rq, val), &out);