From 9d01ba2c8ab7b467adfff548f844c6b81d4312a0 Mon Sep 17 00:00:00 2001 From: IlyaShurupov Date: Sat, 23 Mar 2024 12:09:51 +0300 Subject: [PATCH] Apply cpp naming to files --- Objects/applications/GUI.cpp | 2 +- Objects/applications/GUI.h | 6 ++-- .../compiler/{constants.cpp => Constants.cpp} | 6 ++-- .../{expression.cpp => Expressions.cpp} | 2 +- .../compiler/{function.cpp => Functions.cpp} | 8 ++--- .../{instruction.cpp => Instructions.cpp} | 2 +- .../{statement.cpp => Statements.cpp} | 2 +- .../private/core/{object.cpp => Object.cpp} | 12 ++++---- .../core/{objectsave.cpp => ObjectSave.cpp} | 4 +-- .../core/{module.cpp => ObjectsModule.cpp} | 30 +++++++++---------- .../{scriptsection.cpp => ScriptSection.cpp} | 2 +- .../core/{typegroups.cpp => TypeGroups.cpp} | 4 +-- .../core/{typemethods.cpp => TypeMethods.cpp} | 10 +++---- .../{callstack.cpp => CallStack.cpp} | 6 ++-- .../{interpreter.cpp => Interpreter.cpp} | 4 +-- .../{operandsstack.cpp => OperandsStack.cpp} | 2 +- .../{opcodes.cpp => OperationCodes.cpp} | 2 +- .../{scopestack.cpp => ScopeStack.cpp} | 2 +- .../private/parser/{parser.cpp => Parser.cpp} | 2 +- Objects/private/parser/Private.hpp | 4 +-- .../{boolobject.cpp => BoolObject.cpp} | 2 +- .../{classobject.cpp => ClassObject.cpp} | 6 ++-- .../{colorobject.cpp => ColorObject.cpp} | 2 +- .../{dictobject.cpp => DictObject.cpp} | 4 +-- .../{enumobject.cpp => EnumObject.cpp} | 2 +- .../{floatobject.cpp => FloatObject.cpp} | 2 +- .../{intobject.cpp => IntObject.cpp} | 2 +- ...preterobject.cpp => InterpreterObject.cpp} | 6 ++-- .../{linkobject.cpp => LinkObject.cpp} | 2 +- .../{listobject.cpp => ListObject.cpp} | 4 +-- .../{methodobject.cpp => MethodObject.cpp} | 6 ++-- .../{nullobject.cpp => NullObject.cpp} | 2 +- .../{stringobject.cpp => Stringobject.cpp} | 2 +- .../{typeobject.cpp => TypeObject.cpp} | 4 +-- .../compiler/{constants.h => Constants.hpp} | 4 +-- .../{expression.h => Expressions.hpp} | 2 +- .../compiler/{function.h => Functions.hpp} | 6 ++-- .../{instruction.h => Instructions.hpp} | 4 +-- .../compiler/{statement.h => Statements.hpp} | 2 +- Objects/public/core/{object.h => Object.hpp} | 4 +-- .../{scriptsection.h => ScriptSection.hpp} | 2 +- .../core/{typegroups.h => TypeGroups.hpp} | 0 .../core/{typemethods.h => TypeMethods.hpp} | 0 .../interpreter/{bytecode.h => ByteCode.hpp} | 6 ++-- .../{callstack.h => CallStack.hpp} | 4 +-- .../{interpreter.h => Interpreter.hpp} | 6 ++-- .../{operandsstack.h => OperandsStack.hpp} | 4 +-- .../{opcodes.h => OperatoinCodes.hpp} | 0 .../{scopestack.h => ScopeStack.hpp} | 2 +- .../interpreter/{script.h => Script.hpp} | 2 +- .../public/parser/{parser.h => Parser.hpp} | 4 +-- .../{boolobject.h => BoolObject.hpp} | 2 +- .../{classobject.h => ClassObject.hpp} | 2 +- .../{colorobject.h => ColorObject.hpp} | 2 +- .../{dictobject.h => DictObject.hpp} | 2 +- .../{enumobject.h => EnumObject.hpp} | 2 +- .../{floatobject.h => FloatObject.hpp} | 2 +- .../primitives/{intobject.h => IntObject.hpp} | 2 +- ...erpreterobject.h => InterpreterObject.hpp} | 4 +-- .../{linkobject.h => LinkObject.hpp} | 2 +- .../{listobject.h => ListObject.hpp} | 2 +- .../{methodobject.h => MethodObject.hpp} | 4 +-- .../{nullobject.h => NullObject.hpp} | 2 +- .../public/primitives/PrimitiveObjects.hpp | 16 ++++++++++ .../{stringobject.h => StringObject.hpp} | 2 +- .../{typeobject.h => TypeObject.hpp} | 2 +- Objects/public/primitives/primitives.h | 16 ---------- Objects/tests/TestCompiler.cpp | 14 ++++----- Objects/tests/TestCore.cpp | 4 +-- Objects/tests/TestInterpreter.cpp | 12 ++++---- Objects/tests/TestParser.cpp | 2 +- Objects/tests/TestPrimitives.cpp | 12 ++++---- Objects/tests/main.cpp | 2 +- 73 files changed, 160 insertions(+), 160 deletions(-) rename Objects/private/compiler/{constants.cpp => Constants.cpp} (96%) rename Objects/private/compiler/{expression.cpp => Expressions.cpp} (98%) rename Objects/private/compiler/{function.cpp => Functions.cpp} (99%) rename Objects/private/compiler/{instruction.cpp => Instructions.cpp} (96%) rename Objects/private/compiler/{statement.cpp => Statements.cpp} (98%) rename Objects/private/core/{object.cpp => Object.cpp} (96%) rename Objects/private/core/{objectsave.cpp => ObjectSave.cpp} (99%) rename Objects/private/core/{module.cpp => ObjectsModule.cpp} (77%) rename Objects/private/core/{scriptsection.cpp => ScriptSection.cpp} (99%) rename Objects/private/core/{typegroups.cpp => TypeGroups.cpp} (96%) rename Objects/private/core/{typemethods.cpp => TypeMethods.cpp} (93%) rename Objects/private/interpreter/{callstack.cpp => CallStack.cpp} (87%) rename Objects/private/interpreter/{interpreter.cpp => Interpreter.cpp} (99%) rename Objects/private/interpreter/{operandsstack.cpp => OperandsStack.cpp} (91%) rename Objects/private/interpreter/{opcodes.cpp => OperationCodes.cpp} (99%) rename Objects/private/interpreter/{scopestack.cpp => ScopeStack.cpp} (98%) rename Objects/private/parser/{parser.cpp => Parser.cpp} (97%) rename Objects/private/primitives/{boolobject.cpp => BoolObject.cpp} (98%) rename Objects/private/primitives/{classobject.cpp => ClassObject.cpp} (95%) rename Objects/private/primitives/{colorobject.cpp => ColorObject.cpp} (98%) rename Objects/private/primitives/{dictobject.cpp => DictObject.cpp} (98%) rename Objects/private/primitives/{enumobject.cpp => EnumObject.cpp} (99%) rename Objects/private/primitives/{floatobject.cpp => FloatObject.cpp} (98%) rename Objects/private/primitives/{intobject.cpp => IntObject.cpp} (98%) rename Objects/private/primitives/{interpreterobject.cpp => InterpreterObject.cpp} (93%) rename Objects/private/primitives/{linkobject.cpp => LinkObject.cpp} (98%) rename Objects/private/primitives/{listobject.cpp => ListObject.cpp} (97%) rename Objects/private/primitives/{methodobject.cpp => MethodObject.cpp} (95%) rename Objects/private/primitives/{nullobject.cpp => NullObject.cpp} (96%) rename Objects/private/primitives/{stringobject.cpp => Stringobject.cpp} (98%) rename Objects/private/primitives/{typeobject.cpp => TypeObject.cpp} (95%) rename Objects/public/compiler/{constants.h => Constants.hpp} (89%) rename Objects/public/compiler/{expression.h => Expressions.hpp} (94%) rename Objects/public/compiler/{function.h => Functions.hpp} (87%) rename Objects/public/compiler/{instruction.h => Instructions.hpp} (88%) rename Objects/public/compiler/{statement.h => Statements.hpp} (94%) rename Objects/public/core/{object.h => Object.hpp} (95%) rename Objects/public/core/{scriptsection.h => ScriptSection.hpp} (92%) rename Objects/public/core/{typegroups.h => TypeGroups.hpp} (100%) rename Objects/public/core/{typemethods.h => TypeMethods.hpp} (100%) rename Objects/public/interpreter/{bytecode.h => ByteCode.hpp} (73%) rename Objects/public/interpreter/{callstack.h => CallStack.hpp} (83%) rename Objects/public/interpreter/{interpreter.h => Interpreter.hpp} (87%) rename Objects/public/interpreter/{operandsstack.h => OperandsStack.hpp} (86%) rename Objects/public/interpreter/{opcodes.h => OperatoinCodes.hpp} (100%) rename Objects/public/interpreter/{scopestack.h => ScopeStack.hpp} (91%) rename Objects/public/interpreter/{script.h => Script.hpp} (72%) rename Objects/public/parser/{parser.h => Parser.hpp} (76%) rename Objects/public/primitives/{boolobject.h => BoolObject.hpp} (92%) rename Objects/public/primitives/{classobject.h => ClassObject.hpp} (93%) rename Objects/public/primitives/{colorobject.h => ColorObject.hpp} (90%) rename Objects/public/primitives/{dictobject.h => DictObject.hpp} (94%) rename Objects/public/primitives/{enumobject.h => EnumObject.hpp} (93%) rename Objects/public/primitives/{floatobject.h => FloatObject.hpp} (92%) rename Objects/public/primitives/{intobject.h => IntObject.hpp} (92%) rename Objects/public/primitives/{interpreterobject.h => InterpreterObject.hpp} (82%) rename Objects/public/primitives/{linkobject.h => LinkObject.hpp} (92%) rename Objects/public/primitives/{listobject.h => ListObject.hpp} (93%) rename Objects/public/primitives/{methodobject.h => MethodObject.hpp} (85%) rename Objects/public/primitives/{nullobject.h => NullObject.hpp} (91%) create mode 100644 Objects/public/primitives/PrimitiveObjects.hpp rename Objects/public/primitives/{stringobject.h => StringObject.hpp} (92%) rename Objects/public/primitives/{typeobject.h => TypeObject.hpp} (82%) delete mode 100644 Objects/public/primitives/primitives.h diff --git a/Objects/applications/GUI.cpp b/Objects/applications/GUI.cpp index f46a58a..2909a46 100644 --- a/Objects/applications/GUI.cpp +++ b/Objects/applications/GUI.cpp @@ -3,7 +3,7 @@ #include "Rect.hpp" -#include "interpreter/interpreter.h" +#include "interpreter/Interpreter.hpp" #include "imgui.h" #include "imgui_internal.h" diff --git a/Objects/applications/GUI.h b/Objects/applications/GUI.h index bf62efd..1e64f55 100644 --- a/Objects/applications/GUI.h +++ b/Objects/applications/GUI.h @@ -1,10 +1,10 @@ #pragma once -#include "primitives/primitives.h" -#include "primitives//interpreterobject.h" +#include "primitives/PrimitiveObjects.hpp" +#include "primitives//InterpreterObject.hpp" -#include "compiler/function.h" +#include "compiler/Functions.hpp" #include diff --git a/Objects/private/compiler/constants.cpp b/Objects/private/compiler/Constants.cpp similarity index 96% rename from Objects/private/compiler/constants.cpp rename to Objects/private/compiler/Constants.cpp index 9854144..aa8dd48 100644 --- a/Objects/private/compiler/constants.cpp +++ b/Objects/private/compiler/Constants.cpp @@ -1,6 +1,6 @@ -#include "compiler/constants.h" -#include "primitives/methodobject.h" -#include "primitives/primitives.h" +#include "compiler/Constants.hpp" +#include "primitives/MethodObject.hpp" +#include "primitives/PrimitiveObjects.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/compiler/expression.cpp b/Objects/private/compiler/Expressions.cpp similarity index 98% rename from Objects/private/compiler/expression.cpp rename to Objects/private/compiler/Expressions.cpp index a7f65cf..9beacf2 100644 --- a/Objects/private/compiler/expression.cpp +++ b/Objects/private/compiler/Expressions.cpp @@ -1,4 +1,4 @@ -#include "compiler/expression.h" +#include "compiler/Expressions.hpp" using namespace obj; using namespace BCgen; diff --git a/Objects/private/compiler/function.cpp b/Objects/private/compiler/Functions.cpp similarity index 99% rename from Objects/private/compiler/function.cpp rename to Objects/private/compiler/Functions.cpp index 8a84524..65e1ebe 100644 --- a/Objects/private/compiler/function.cpp +++ b/Objects/private/compiler/Functions.cpp @@ -1,10 +1,10 @@ -#include "compiler/function.h" +#include "compiler/Functions.hpp" -#include "primitives/methodobject.h" -#include "primitives/primitives.h" +#include "primitives/MethodObject.hpp" +#include "primitives/PrimitiveObjects.hpp" -#include "parser/parser.h" +#include "parser/Parser.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/compiler/instruction.cpp b/Objects/private/compiler/Instructions.cpp similarity index 96% rename from Objects/private/compiler/instruction.cpp rename to Objects/private/compiler/Instructions.cpp index ae9bc59..a055683 100644 --- a/Objects/private/compiler/instruction.cpp +++ b/Objects/private/compiler/Instructions.cpp @@ -1,5 +1,5 @@ -#include "compiler/instruction.h" +#include "compiler/Instructions.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/compiler/statement.cpp b/Objects/private/compiler/Statements.cpp similarity index 98% rename from Objects/private/compiler/statement.cpp rename to Objects/private/compiler/Statements.cpp index d4cb988..0f437f7 100644 --- a/Objects/private/compiler/statement.cpp +++ b/Objects/private/compiler/Statements.cpp @@ -1,4 +1,4 @@ -#include "compiler/statement.h" +#include "compiler/Statements.hpp" using namespace obj; using namespace BCgen; diff --git a/Objects/private/core/object.cpp b/Objects/private/core/Object.cpp similarity index 96% rename from Objects/private/core/object.cpp rename to Objects/private/core/Object.cpp index b86b8ad..e5653ba 100644 --- a/Objects/private/core/object.cpp +++ b/Objects/private/core/Object.cpp @@ -1,13 +1,13 @@ -#include "core/object.h" +#include "core/Object.hpp" -#include "primitives/classobject.h" -#include "primitives/methodobject.h" -#include "primitives/nullobject.h" +#include "primitives/ClassObject.hpp" +#include "primitives/MethodObject.hpp" +#include "primitives/NullObject.hpp" -#include "compiler/function.h" -#include "interpreter/interpreter.h" +#include "compiler/Functions.hpp" +#include "interpreter/Interpreter.hpp" namespace obj { diff --git a/Objects/private/core/objectsave.cpp b/Objects/private/core/ObjectSave.cpp similarity index 99% rename from Objects/private/core/objectsave.cpp rename to Objects/private/core/ObjectSave.cpp index ca0656f..dafc71a 100644 --- a/Objects/private/core/objectsave.cpp +++ b/Objects/private/core/ObjectSave.cpp @@ -1,8 +1,8 @@ -#include "core/object.h" +#include "core/Object.hpp" -#include "primitives/nullobject.h" +#include "primitives/NullObject.hpp" #include diff --git a/Objects/private/core/module.cpp b/Objects/private/core/ObjectsModule.cpp similarity index 77% rename from Objects/private/core/module.cpp rename to Objects/private/core/ObjectsModule.cpp index 42d0861..c7dc5df 100644 --- a/Objects/private/core/module.cpp +++ b/Objects/private/core/ObjectsModule.cpp @@ -1,20 +1,20 @@ -#include "compiler/function.h" +#include "compiler/Functions.hpp" -#include "primitives/boolobject.h" -#include "primitives/classobject.h" -#include "primitives/colorobject.h" -#include "primitives/dictobject.h" -#include "primitives/enumobject.h" -#include "primitives/floatobject.h" -#include "primitives/interpreterobject.h" -#include "primitives/intobject.h" -#include "primitives/linkobject.h" -#include "primitives/listobject.h" -#include "primitives/methodobject.h" -#include "primitives/nullobject.h" -#include "primitives/stringobject.h" -#include "primitives/typeobject.h" +#include "primitives/BoolObject.hpp" +#include "primitives/ClassObject.hpp" +#include "primitives/ColorObject.hpp" +#include "primitives/DictObject.hpp" +#include "primitives/EnumObject.hpp" +#include "primitives/FloatObject.hpp" +#include "primitives/InterpreterObject.hpp" +#include "primitives/IntObject.hpp" +#include "primitives/LinkObject.hpp" +#include "primitives/ListObject.hpp" +#include "primitives/MethodObject.hpp" +#include "primitives/NullObject.hpp" +#include "primitives/StringObject.hpp" +#include "primitives/TypeObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/core/scriptsection.cpp b/Objects/private/core/ScriptSection.cpp similarity index 99% rename from Objects/private/core/scriptsection.cpp rename to Objects/private/core/ScriptSection.cpp index c6ee37c..b1ef355 100644 --- a/Objects/private/core/scriptsection.cpp +++ b/Objects/private/core/ScriptSection.cpp @@ -1,5 +1,5 @@ -#include "core/scriptsection.h" +#include "core/ScriptSection.hpp" using namespace obj; diff --git a/Objects/private/core/typegroups.cpp b/Objects/private/core/TypeGroups.cpp similarity index 96% rename from Objects/private/core/typegroups.cpp rename to Objects/private/core/TypeGroups.cpp index 99d2146..9663f46 100644 --- a/Objects/private/core/typegroups.cpp +++ b/Objects/private/core/TypeGroups.cpp @@ -1,7 +1,7 @@ -#include "core/typegroups.h" +#include "core/TypeGroups.hpp" -#include "core/object.h" +#include "core/Object.hpp" using namespace obj; diff --git a/Objects/private/core/typemethods.cpp b/Objects/private/core/TypeMethods.cpp similarity index 93% rename from Objects/private/core/typemethods.cpp rename to Objects/private/core/TypeMethods.cpp index d081e11..7662692 100644 --- a/Objects/private/core/typemethods.cpp +++ b/Objects/private/core/TypeMethods.cpp @@ -1,11 +1,11 @@ -#include "core/typemethods.h" +#include "core/TypeMethods.hpp" -#include "primitives/floatobject.h" -#include "primitives/nullobject.h" -#include "primitives/typeobject.h" +#include "primitives/FloatObject.hpp" +#include "primitives/NullObject.hpp" +#include "primitives/TypeObject.hpp" -#include "interpreter/interpreter.h" +#include "interpreter/Interpreter.hpp" using namespace obj; diff --git a/Objects/private/interpreter/callstack.cpp b/Objects/private/interpreter/CallStack.cpp similarity index 87% rename from Objects/private/interpreter/callstack.cpp rename to Objects/private/interpreter/CallStack.cpp index bb9817d..3a4c567 100644 --- a/Objects/private/interpreter/callstack.cpp +++ b/Objects/private/interpreter/CallStack.cpp @@ -1,8 +1,8 @@ -#include "interpreter/callstack.h" +#include "interpreter/CallStack.hpp" -#include "interpreter/bytecode.h" -#include "primitives/methodobject.h" +#include "interpreter/ByteCode.hpp" +#include "primitives/MethodObject.hpp" using namespace obj; diff --git a/Objects/private/interpreter/interpreter.cpp b/Objects/private/interpreter/Interpreter.cpp similarity index 99% rename from Objects/private/interpreter/interpreter.cpp rename to Objects/private/interpreter/Interpreter.cpp index ca9b2ab..bb4e645 100644 --- a/Objects/private/interpreter/interpreter.cpp +++ b/Objects/private/interpreter/Interpreter.cpp @@ -1,7 +1,7 @@ -#include "interpreter/interpreter.h" +#include "interpreter/Interpreter.hpp" -#include "primitives/primitives.h" +#include "primitives/PrimitiveObjects.hpp" #include "Timing.hpp" diff --git a/Objects/private/interpreter/operandsstack.cpp b/Objects/private/interpreter/OperandsStack.cpp similarity index 91% rename from Objects/private/interpreter/operandsstack.cpp rename to Objects/private/interpreter/OperandsStack.cpp index eccd5a3..d37fb20 100644 --- a/Objects/private/interpreter/operandsstack.cpp +++ b/Objects/private/interpreter/OperandsStack.cpp @@ -1,5 +1,5 @@ -#include "interpreter/operandsstack.h" +#include "interpreter/OperandsStack.hpp" using namespace obj; diff --git a/Objects/private/interpreter/opcodes.cpp b/Objects/private/interpreter/OperationCodes.cpp similarity index 99% rename from Objects/private/interpreter/opcodes.cpp rename to Objects/private/interpreter/OperationCodes.cpp index 9dfb194..ebce645 100644 --- a/Objects/private/interpreter/opcodes.cpp +++ b/Objects/private/interpreter/OperationCodes.cpp @@ -1,7 +1,7 @@ #include "Utils.hpp" -#include "interpreter/opcodes.h" +#include "interpreter/OperatoinCodes.hpp" namespace obj { OpcodeInfos gOpcodeInfos; diff --git a/Objects/private/interpreter/scopestack.cpp b/Objects/private/interpreter/ScopeStack.cpp similarity index 98% rename from Objects/private/interpreter/scopestack.cpp rename to Objects/private/interpreter/ScopeStack.cpp index d6a12ad..3f9d9ed 100644 --- a/Objects/private/interpreter/scopestack.cpp +++ b/Objects/private/interpreter/ScopeStack.cpp @@ -1,5 +1,5 @@ -#include "interpreter/scopestack.h" +#include "interpreter/ScopeStack.hpp" using namespace obj; diff --git a/Objects/private/parser/parser.cpp b/Objects/private/parser/Parser.cpp similarity index 97% rename from Objects/private/parser/parser.cpp rename to Objects/private/parser/Parser.cpp index 6e83bac..b5afd12 100644 --- a/Objects/private/parser/parser.cpp +++ b/Objects/private/parser/Parser.cpp @@ -1,5 +1,5 @@ -#include +#include "parser/Parser.hpp" #include "Private.hpp" diff --git a/Objects/private/parser/Private.hpp b/Objects/private/parser/Private.hpp index 8299aae..966a614 100644 --- a/Objects/private/parser/Private.hpp +++ b/Objects/private/parser/Private.hpp @@ -4,8 +4,8 @@ #include #include -#include "compiler/statement.h" -#include "compiler/expression.h" +#include "compiler/Statements.hpp" +#include "compiler/Expressions.hpp" #include "Tree.hpp" diff --git a/Objects/private/primitives/boolobject.cpp b/Objects/private/primitives/BoolObject.cpp similarity index 98% rename from Objects/private/primitives/boolobject.cpp rename to Objects/private/primitives/BoolObject.cpp index 3d04dbe..e627423 100644 --- a/Objects/private/primitives/boolobject.cpp +++ b/Objects/private/primitives/BoolObject.cpp @@ -1,6 +1,6 @@ -#include "primitives/boolobject.h" +#include "primitives/BoolObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/primitives/classobject.cpp b/Objects/private/primitives/ClassObject.cpp similarity index 95% rename from Objects/private/primitives/classobject.cpp rename to Objects/private/primitives/ClassObject.cpp index 425a4ba..100991d 100644 --- a/Objects/private/primitives/classobject.cpp +++ b/Objects/private/primitives/ClassObject.cpp @@ -1,7 +1,7 @@ -#include "primitives/classobject.h" -#include "primitives/dictobject.h" -#include "primitives/nullobject.h" +#include "primitives/ClassObject.hpp" +#include "primitives/DictObject.hpp" +#include "primitives/NullObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/primitives/colorobject.cpp b/Objects/private/primitives/ColorObject.cpp similarity index 98% rename from Objects/private/primitives/colorobject.cpp rename to Objects/private/primitives/ColorObject.cpp index c29a95c..e9ece07 100644 --- a/Objects/private/primitives/colorobject.cpp +++ b/Objects/private/primitives/ColorObject.cpp @@ -1,5 +1,5 @@ -#include "primitives/colorobject.h" +#include "primitives/ColorObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/primitives/dictobject.cpp b/Objects/private/primitives/DictObject.cpp similarity index 98% rename from Objects/private/primitives/dictobject.cpp rename to Objects/private/primitives/DictObject.cpp index c3028e5..22cf7b6 100644 --- a/Objects/private/primitives/dictobject.cpp +++ b/Objects/private/primitives/DictObject.cpp @@ -1,6 +1,6 @@ -#include "primitives/dictobject.h" -#include "primitives/stringobject.h" +#include "primitives/DictObject.hpp" +#include "primitives/StringObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/primitives/enumobject.cpp b/Objects/private/primitives/EnumObject.cpp similarity index 99% rename from Objects/private/primitives/enumobject.cpp rename to Objects/private/primitives/EnumObject.cpp index 9669bc1..e4dde7c 100644 --- a/Objects/private/primitives/enumobject.cpp +++ b/Objects/private/primitives/EnumObject.cpp @@ -1,5 +1,5 @@ -#include "primitives/enumobject.h" +#include "primitives/EnumObject.hpp" #include #include diff --git a/Objects/private/primitives/floatobject.cpp b/Objects/private/primitives/FloatObject.cpp similarity index 98% rename from Objects/private/primitives/floatobject.cpp rename to Objects/private/primitives/FloatObject.cpp index 15e8f0a..74d040c 100644 --- a/Objects/private/primitives/floatobject.cpp +++ b/Objects/private/primitives/FloatObject.cpp @@ -1,4 +1,4 @@ -#include "primitives/floatobject.h" +#include "primitives/FloatObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/primitives/intobject.cpp b/Objects/private/primitives/IntObject.cpp similarity index 98% rename from Objects/private/primitives/intobject.cpp rename to Objects/private/primitives/IntObject.cpp index c4e7c4b..40217b0 100644 --- a/Objects/private/primitives/intobject.cpp +++ b/Objects/private/primitives/IntObject.cpp @@ -1,5 +1,5 @@ -#include "primitives/intobject.h" +#include "primitives/IntObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/primitives/interpreterobject.cpp b/Objects/private/primitives/InterpreterObject.cpp similarity index 93% rename from Objects/private/primitives/interpreterobject.cpp rename to Objects/private/primitives/InterpreterObject.cpp index 85e1771..015e3b4 100644 --- a/Objects/private/primitives/interpreterobject.cpp +++ b/Objects/private/primitives/InterpreterObject.cpp @@ -1,7 +1,7 @@ -#include "primitives/interpreterobject.h" -#include "primitives/linkobject.h" -#include "primitives/methodobject.h" +#include "primitives/InterpreterObject.hpp" +#include "primitives/LinkObject.hpp" +#include "primitives/MethodObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/primitives/linkobject.cpp b/Objects/private/primitives/LinkObject.cpp similarity index 98% rename from Objects/private/primitives/linkobject.cpp rename to Objects/private/primitives/LinkObject.cpp index e329350..d01dc90 100644 --- a/Objects/private/primitives/linkobject.cpp +++ b/Objects/private/primitives/LinkObject.cpp @@ -1,5 +1,5 @@ -#include "primitives/linkobject.h" +#include "primitives/LinkObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/primitives/listobject.cpp b/Objects/private/primitives/ListObject.cpp similarity index 97% rename from Objects/private/primitives/listobject.cpp rename to Objects/private/primitives/ListObject.cpp index 9cba40b..2ca192e 100644 --- a/Objects/private/primitives/listobject.cpp +++ b/Objects/private/primitives/ListObject.cpp @@ -1,6 +1,6 @@ -#include "primitives/intobject.h" -#include "primitives/listobject.h" +#include "primitives/IntObject.hpp" +#include "primitives/ListObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/primitives/methodobject.cpp b/Objects/private/primitives/MethodObject.cpp similarity index 95% rename from Objects/private/primitives/methodobject.cpp rename to Objects/private/primitives/MethodObject.cpp index 975a4d7..7cce12e 100644 --- a/Objects/private/primitives/methodobject.cpp +++ b/Objects/private/primitives/MethodObject.cpp @@ -1,7 +1,7 @@ -#include "compiler/function.h" -#include "core/scriptsection.h" -#include "primitives/methodobject.h" +#include "compiler/Functions.hpp" +#include "core/ScriptSection.hpp" +#include "primitives/MethodObject.hpp" using namespace obj; diff --git a/Objects/private/primitives/nullobject.cpp b/Objects/private/primitives/NullObject.cpp similarity index 96% rename from Objects/private/primitives/nullobject.cpp rename to Objects/private/primitives/NullObject.cpp index 2cc4bde..7864ce8 100644 --- a/Objects/private/primitives/nullobject.cpp +++ b/Objects/private/primitives/NullObject.cpp @@ -1,6 +1,6 @@ -#include "primitives/nullobject.h" +#include "primitives/NullObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/primitives/stringobject.cpp b/Objects/private/primitives/Stringobject.cpp similarity index 98% rename from Objects/private/primitives/stringobject.cpp rename to Objects/private/primitives/Stringobject.cpp index 7922df0..09878fe 100644 --- a/Objects/private/primitives/stringobject.cpp +++ b/Objects/private/primitives/Stringobject.cpp @@ -1,6 +1,6 @@ -#include "primitives/stringobject.h" +#include "primitives/StringObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/private/primitives/typeobject.cpp b/Objects/private/primitives/TypeObject.cpp similarity index 95% rename from Objects/private/primitives/typeobject.cpp rename to Objects/private/primitives/TypeObject.cpp index 4ffda33..5544983 100644 --- a/Objects/private/primitives/typeobject.cpp +++ b/Objects/private/primitives/TypeObject.cpp @@ -1,6 +1,6 @@ -#include "primitives/typeobject.h" -#include "primitives/nullobject.h" +#include "primitives/TypeObject.hpp" +#include "primitives/NullObject.hpp" using namespace obj; using namespace tp; diff --git a/Objects/public/compiler/constants.h b/Objects/public/compiler/Constants.hpp similarity index 89% rename from Objects/public/compiler/constants.h rename to Objects/public/compiler/Constants.hpp index f6509df..143a393 100644 --- a/Objects/public/compiler/constants.h +++ b/Objects/public/compiler/Constants.hpp @@ -1,8 +1,8 @@ #pragma once -#include "interpreter/bytecode.h" -#include "core/object.h" +#include "interpreter/ByteCode.hpp" +#include "core/Object.hpp" namespace obj { namespace BCgen { diff --git a/Objects/public/compiler/expression.h b/Objects/public/compiler/Expressions.hpp similarity index 94% rename from Objects/public/compiler/expression.h rename to Objects/public/compiler/Expressions.hpp index 5de8b9c..bed6c67 100644 --- a/Objects/public/compiler/expression.h +++ b/Objects/public/compiler/Expressions.hpp @@ -4,7 +4,7 @@ #include #include "Buffer.hpp" -#include "interpreter/opcodes.h" +#include "interpreter/OperatoinCodes.hpp" namespace obj::BCgen { diff --git a/Objects/public/compiler/function.h b/Objects/public/compiler/Functions.hpp similarity index 87% rename from Objects/public/compiler/function.h rename to Objects/public/compiler/Functions.hpp index e40b3ec..56ec7c6 100644 --- a/Objects/public/compiler/function.h +++ b/Objects/public/compiler/Functions.hpp @@ -5,9 +5,9 @@ #include "List.hpp" #include "Map.hpp" -#include "instruction.h" -#include "statement.h" -#include "constants.h" +#include "Instructions.hpp" +#include "Statements.hpp" +#include "Constants.hpp" namespace obj { struct MethodObject; diff --git a/Objects/public/compiler/instruction.h b/Objects/public/compiler/Instructions.hpp similarity index 88% rename from Objects/public/compiler/instruction.h rename to Objects/public/compiler/Instructions.hpp index 4419d10..83346a2 100644 --- a/Objects/public/compiler/instruction.h +++ b/Objects/public/compiler/Instructions.hpp @@ -1,9 +1,9 @@ #pragma once -#include "interpreter/opcodes.h" +#include "interpreter/OperatoinCodes.hpp" -#include "core/object.h" +#include "core/Object.hpp" #include "List.hpp" diff --git a/Objects/public/compiler/statement.h b/Objects/public/compiler/Statements.hpp similarity index 94% rename from Objects/public/compiler/statement.h rename to Objects/public/compiler/Statements.hpp index 3e98c37..2a4703c 100644 --- a/Objects/public/compiler/statement.h +++ b/Objects/public/compiler/Statements.hpp @@ -1,7 +1,7 @@ #pragma once -#include "expression.h" +#include "Expressions.hpp" namespace obj::BCgen { struct Statement { diff --git a/Objects/public/core/object.h b/Objects/public/core/Object.hpp similarity index 95% rename from Objects/public/core/object.h rename to Objects/public/core/Object.hpp index 2cc0799..accd6d9 100644 --- a/Objects/public/core/object.h +++ b/Objects/public/core/Object.hpp @@ -7,8 +7,8 @@ #include "Buffer.hpp" #include "LocalConnection.hpp" -#include "core/typegroups.h" -#include "core/typemethods.h" +#include "core/TypeGroups.hpp" +#include "core/TypeMethods.hpp" #include "Archiver.hpp" #include "SizeCounter.hpp" diff --git a/Objects/public/core/scriptsection.h b/Objects/public/core/ScriptSection.hpp similarity index 92% rename from Objects/public/core/scriptsection.h rename to Objects/public/core/ScriptSection.hpp index 724b15b..d4fcf03 100644 --- a/Objects/public/core/scriptsection.h +++ b/Objects/public/core/ScriptSection.hpp @@ -1,6 +1,6 @@ #pragma once -#include "primitives/methodobject.h" +#include "primitives/MethodObject.hpp" namespace obj { diff --git a/Objects/public/core/typegroups.h b/Objects/public/core/TypeGroups.hpp similarity index 100% rename from Objects/public/core/typegroups.h rename to Objects/public/core/TypeGroups.hpp diff --git a/Objects/public/core/typemethods.h b/Objects/public/core/TypeMethods.hpp similarity index 100% rename from Objects/public/core/typemethods.h rename to Objects/public/core/TypeMethods.hpp diff --git a/Objects/public/interpreter/bytecode.h b/Objects/public/interpreter/ByteCode.hpp similarity index 73% rename from Objects/public/interpreter/bytecode.h rename to Objects/public/interpreter/ByteCode.hpp index db08b95..e20dcd5 100644 --- a/Objects/public/interpreter/bytecode.h +++ b/Objects/public/interpreter/ByteCode.hpp @@ -1,10 +1,10 @@ #pragma once -#include "opcodes.h" +#include "OperatoinCodes.hpp" -#include "primitives/intobject.h" -#include "primitives/stringobject.h" +#include "primitives/IntObject.hpp" +#include "primitives/StringObject.hpp" #include "Buffer.hpp" #include diff --git a/Objects/public/interpreter/callstack.h b/Objects/public/interpreter/CallStack.hpp similarity index 83% rename from Objects/public/interpreter/callstack.h rename to Objects/public/interpreter/CallStack.hpp index 4324c88..bad8aeb 100644 --- a/Objects/public/interpreter/callstack.h +++ b/Objects/public/interpreter/CallStack.hpp @@ -1,7 +1,7 @@ #pragma once -#include "core/object.h" -#include "primitives/classobject.h" +#include "core/Object.hpp" +#include "primitives/ClassObject.hpp" #include "Map.hpp" diff --git a/Objects/public/interpreter/interpreter.h b/Objects/public/interpreter/Interpreter.hpp similarity index 87% rename from Objects/public/interpreter/interpreter.h rename to Objects/public/interpreter/Interpreter.hpp index 38a3e11..cbdae4c 100644 --- a/Objects/public/interpreter/interpreter.h +++ b/Objects/public/interpreter/Interpreter.hpp @@ -1,8 +1,8 @@ #pragma once -#include "operandsstack.h" -#include "scopestack.h" -#include "callstack.h" +#include "OperandsStack.hpp" +#include "ScopeStack.hpp" +#include "CallStack.hpp" namespace obj { struct Interpreter { diff --git a/Objects/public/interpreter/operandsstack.h b/Objects/public/interpreter/OperandsStack.hpp similarity index 86% rename from Objects/public/interpreter/operandsstack.h rename to Objects/public/interpreter/OperandsStack.hpp index 7300f21..3722d15 100644 --- a/Objects/public/interpreter/operandsstack.h +++ b/Objects/public/interpreter/OperandsStack.hpp @@ -1,7 +1,7 @@ #pragma once -#include "bytecode.h" -#include "core/object.h" +#include "ByteCode.hpp" +#include "core/Object.hpp" namespace obj { diff --git a/Objects/public/interpreter/opcodes.h b/Objects/public/interpreter/OperatoinCodes.hpp similarity index 100% rename from Objects/public/interpreter/opcodes.h rename to Objects/public/interpreter/OperatoinCodes.hpp diff --git a/Objects/public/interpreter/scopestack.h b/Objects/public/interpreter/ScopeStack.hpp similarity index 91% rename from Objects/public/interpreter/scopestack.h rename to Objects/public/interpreter/ScopeStack.hpp index 0b4edc7..342e3c2 100644 --- a/Objects/public/interpreter/scopestack.h +++ b/Objects/public/interpreter/ScopeStack.hpp @@ -1,6 +1,6 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" #include "Map.hpp" namespace obj { diff --git a/Objects/public/interpreter/script.h b/Objects/public/interpreter/Script.hpp similarity index 72% rename from Objects/public/interpreter/script.h rename to Objects/public/interpreter/Script.hpp index e89474e..d7624e5 100644 --- a/Objects/public/interpreter/script.h +++ b/Objects/public/interpreter/Script.hpp @@ -1,6 +1,6 @@ #pragma once -#include "interpreter/bytecode.h" +#include "interpreter/ByteCode.hpp" namespace obj { struct Script { diff --git a/Objects/public/parser/parser.h b/Objects/public/parser/Parser.hpp similarity index 76% rename from Objects/public/parser/parser.h rename to Objects/public/parser/Parser.hpp index cccd86a..9337c23 100644 --- a/Objects/public/parser/parser.h +++ b/Objects/public/parser/Parser.hpp @@ -1,7 +1,7 @@ #pragma once -#include "compiler/statement.h" -#include "compiler/expression.h" +#include "compiler/Statements.hpp" +#include "compiler/Expressions.hpp" namespace obj { diff --git a/Objects/public/primitives/boolobject.h b/Objects/public/primitives/BoolObject.hpp similarity index 92% rename from Objects/public/primitives/boolobject.h rename to Objects/public/primitives/BoolObject.hpp index 9377a67..117b36c 100644 --- a/Objects/public/primitives/boolobject.h +++ b/Objects/public/primitives/BoolObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" namespace obj { diff --git a/Objects/public/primitives/classobject.h b/Objects/public/primitives/ClassObject.hpp similarity index 93% rename from Objects/public/primitives/classobject.h rename to Objects/public/primitives/ClassObject.hpp index 0d8d345..17cd917 100644 --- a/Objects/public/primitives/classobject.h +++ b/Objects/public/primitives/ClassObject.hpp @@ -1,6 +1,6 @@ #pragma once -#include "primitives/dictobject.h" +#include "primitives/DictObject.hpp" namespace obj { diff --git a/Objects/public/primitives/colorobject.h b/Objects/public/primitives/ColorObject.hpp similarity index 90% rename from Objects/public/primitives/colorobject.h rename to Objects/public/primitives/ColorObject.hpp index eb4346e..d24ec38 100644 --- a/Objects/public/primitives/colorobject.h +++ b/Objects/public/primitives/ColorObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" #include "Color.hpp" namespace obj { diff --git a/Objects/public/primitives/dictobject.h b/Objects/public/primitives/DictObject.hpp similarity index 94% rename from Objects/public/primitives/dictobject.h rename to Objects/public/primitives/DictObject.hpp index f2e0081..9846cf4 100644 --- a/Objects/public/primitives/dictobject.h +++ b/Objects/public/primitives/DictObject.hpp @@ -1,6 +1,6 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" namespace obj { diff --git a/Objects/public/primitives/enumobject.h b/Objects/public/primitives/EnumObject.hpp similarity index 93% rename from Objects/public/primitives/enumobject.h rename to Objects/public/primitives/EnumObject.hpp index 6f0ba99..6db388d 100644 --- a/Objects/public/primitives/enumobject.h +++ b/Objects/public/primitives/EnumObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" namespace obj { diff --git a/Objects/public/primitives/floatobject.h b/Objects/public/primitives/FloatObject.hpp similarity index 92% rename from Objects/public/primitives/floatobject.h rename to Objects/public/primitives/FloatObject.hpp index 60af359..d1e2063 100644 --- a/Objects/public/primitives/floatobject.h +++ b/Objects/public/primitives/FloatObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" namespace obj { diff --git a/Objects/public/primitives/intobject.h b/Objects/public/primitives/IntObject.hpp similarity index 92% rename from Objects/public/primitives/intobject.h rename to Objects/public/primitives/IntObject.hpp index f889f67..0c9d54c 100644 --- a/Objects/public/primitives/intobject.h +++ b/Objects/public/primitives/IntObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" namespace obj { diff --git a/Objects/public/primitives/interpreterobject.h b/Objects/public/primitives/InterpreterObject.hpp similarity index 82% rename from Objects/public/primitives/interpreterobject.h rename to Objects/public/primitives/InterpreterObject.hpp index df538f0..7312f22 100644 --- a/Objects/public/primitives/interpreterobject.h +++ b/Objects/public/primitives/InterpreterObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "interpreter/interpreter.h" -#include "primitives/classobject.h" +#include "interpreter/Interpreter.hpp" +#include "primitives/ClassObject.hpp" namespace obj { struct InterpreterObject : ClassObject { diff --git a/Objects/public/primitives/linkobject.h b/Objects/public/primitives/LinkObject.hpp similarity index 92% rename from Objects/public/primitives/linkobject.h rename to Objects/public/primitives/LinkObject.hpp index b614773..9d4340b 100644 --- a/Objects/public/primitives/linkobject.h +++ b/Objects/public/primitives/LinkObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" namespace obj { diff --git a/Objects/public/primitives/listobject.h b/Objects/public/primitives/ListObject.hpp similarity index 93% rename from Objects/public/primitives/listobject.h rename to Objects/public/primitives/ListObject.hpp index 5e750dd..dc6be96 100644 --- a/Objects/public/primitives/listobject.h +++ b/Objects/public/primitives/ListObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" namespace obj { diff --git a/Objects/public/primitives/methodobject.h b/Objects/public/primitives/MethodObject.hpp similarity index 85% rename from Objects/public/primitives/methodobject.h rename to Objects/public/primitives/MethodObject.hpp index 95dbc69..877cd66 100644 --- a/Objects/public/primitives/methodobject.h +++ b/Objects/public/primitives/MethodObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "primitives/stringobject.h" -#include "interpreter/script.h" +#include "primitives/StringObject.hpp" +#include "interpreter/Script.hpp" namespace obj { diff --git a/Objects/public/primitives/nullobject.h b/Objects/public/primitives/NullObject.hpp similarity index 91% rename from Objects/public/primitives/nullobject.h rename to Objects/public/primitives/NullObject.hpp index 0d71524..3df54bd 100644 --- a/Objects/public/primitives/nullobject.h +++ b/Objects/public/primitives/NullObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" namespace obj { diff --git a/Objects/public/primitives/PrimitiveObjects.hpp b/Objects/public/primitives/PrimitiveObjects.hpp new file mode 100644 index 0000000..2d9e2d0 --- /dev/null +++ b/Objects/public/primitives/PrimitiveObjects.hpp @@ -0,0 +1,16 @@ +#pragma once + +#include "primitives/BoolObject.hpp" +#include "primitives/ClassObject.hpp" +#include "primitives/ColorObject.hpp" +#include "primitives/DictObject.hpp" +#include "primitives/EnumObject.hpp" +#include "primitives/FloatObject.hpp" +#include "primitives/InterpreterObject.hpp" +#include "primitives/IntObject.hpp" +#include "primitives/LinkObject.hpp" +#include "primitives/ListObject.hpp" +#include "primitives/MethodObject.hpp" +#include "primitives/NullObject.hpp" +#include "primitives/StringObject.hpp" +#include "primitives/TypeObject.hpp" \ No newline at end of file diff --git a/Objects/public/primitives/stringobject.h b/Objects/public/primitives/StringObject.hpp similarity index 92% rename from Objects/public/primitives/stringobject.h rename to Objects/public/primitives/StringObject.hpp index c3d5be1..7401aca 100644 --- a/Objects/public/primitives/stringobject.h +++ b/Objects/public/primitives/StringObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" namespace obj { diff --git a/Objects/public/primitives/typeobject.h b/Objects/public/primitives/TypeObject.hpp similarity index 82% rename from Objects/public/primitives/typeobject.h rename to Objects/public/primitives/TypeObject.hpp index 53b1f5a..27ed5e4 100644 --- a/Objects/public/primitives/typeobject.h +++ b/Objects/public/primitives/TypeObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "core/object.h" +#include "core/Object.hpp" namespace obj { diff --git a/Objects/public/primitives/primitives.h b/Objects/public/primitives/primitives.h deleted file mode 100644 index 81802d2..0000000 --- a/Objects/public/primitives/primitives.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "primitives/boolobject.h" -#include "primitives/classobject.h" -#include "primitives/colorobject.h" -#include "primitives/dictobject.h" -#include "primitives/enumobject.h" -#include "primitives/floatobject.h" -#include "primitives/interpreterobject.h" -#include "primitives/intobject.h" -#include "primitives/linkobject.h" -#include "primitives/listobject.h" -#include "primitives/methodobject.h" -#include "primitives/nullobject.h" -#include "primitives/stringobject.h" -#include "primitives/typeobject.h" \ No newline at end of file diff --git a/Objects/tests/TestCompiler.cpp b/Objects/tests/TestCompiler.cpp index 24ed38b..2a29755 100644 --- a/Objects/tests/TestCompiler.cpp +++ b/Objects/tests/TestCompiler.cpp @@ -1,13 +1,13 @@ #include "ObjectTests.hpp" -#include "compiler/function.h" -#include "parser/parser.h" -#include "core/object.h" -#include "interpreter/interpreter.h" -#include "primitives/interpreterobject.h" -#include "primitives/linkobject.h" -#include "primitives/methodobject.h" +#include "compiler/Functions.hpp" +#include "parser/Parser.hpp" +#include "core/Object.hpp" +#include "interpreter/Interpreter.hpp" +#include "primitives/InterpreterObject.hpp" +#include "primitives/LinkObject.hpp" +#include "primitives/MethodObject.hpp" using namespace tp; using namespace obj; diff --git a/Objects/tests/TestCore.cpp b/Objects/tests/TestCore.cpp index f18a529..4133fad 100644 --- a/Objects/tests/TestCore.cpp +++ b/Objects/tests/TestCore.cpp @@ -1,9 +1,9 @@ #include "ObjectTests.hpp" -#include "core/object.h" +#include "core/Object.hpp" -#include "primitives/intobject.h" +#include "primitives/IntObject.hpp" using namespace tp; using namespace obj; diff --git a/Objects/tests/TestInterpreter.cpp b/Objects/tests/TestInterpreter.cpp index 51b818e..e841dfe 100644 --- a/Objects/tests/TestInterpreter.cpp +++ b/Objects/tests/TestInterpreter.cpp @@ -1,12 +1,12 @@ #include "ObjectTests.hpp" -#include "compiler/function.h" -#include "core/object.h" -#include "interpreter/interpreter.h" -#include "primitives/interpreterobject.h" -#include "primitives/linkobject.h" -#include "primitives/methodobject.h" +#include "compiler/Functions.hpp" +#include "core/Object.hpp" +#include "interpreter/Interpreter.hpp" +#include "primitives/InterpreterObject.hpp" +#include "primitives/LinkObject.hpp" +#include "primitives/MethodObject.hpp" using namespace tp; using namespace obj; diff --git a/Objects/tests/TestParser.cpp b/Objects/tests/TestParser.cpp index d7ac7b7..793b92c 100644 --- a/Objects/tests/TestParser.cpp +++ b/Objects/tests/TestParser.cpp @@ -1,7 +1,7 @@ #include "ObjectTests.hpp" -#include "parser/parser.h" +#include "parser/Parser.hpp" using namespace tp; using namespace obj; diff --git a/Objects/tests/TestPrimitives.cpp b/Objects/tests/TestPrimitives.cpp index 5ef09be..c7d3fb9 100644 --- a/Objects/tests/TestPrimitives.cpp +++ b/Objects/tests/TestPrimitives.cpp @@ -1,12 +1,12 @@ #include "ObjectTests.hpp" -#include "compiler/function.h" -#include "core/object.h" -#include "interpreter/interpreter.h" -#include "primitives/interpreterobject.h" -#include "primitives/linkobject.h" -#include "primitives/methodobject.h" +#include "compiler/Functions.hpp" +#include "core/Object.hpp" +#include "interpreter/Interpreter.hpp" +#include "primitives/InterpreterObject.hpp" +#include "primitives/LinkObject.hpp" +#include "primitives/MethodObject.hpp" using namespace tp; using namespace obj; diff --git a/Objects/tests/main.cpp b/Objects/tests/main.cpp index c837e5d..1a4e6e9 100644 --- a/Objects/tests/main.cpp +++ b/Objects/tests/main.cpp @@ -1,7 +1,7 @@ #include "ObjectTests.hpp" -#include "primitives/primitives.h" +#include "primitives/PrimitiveObjects.hpp" tp::ModuleManifest* objDeps[] = { &obj::gModuleObjects, nullptr }; tp::ModuleManifest objTestModule("ObjectsTests", nullptr, nullptr, objDeps);