جاري العمل على إعادة هيكلة ملفات اللغة

جاري العمل على إعادة هيكلة ملفات اللغة تم التشغيل على windows فقط
alifcommunity · Aug 8, 2024 · 2793cca · 2793cca
1 parent 85c6873
commit 2793cca
Show file tree

Hide file tree

Showing 80 changed files with 231 additions and 208 deletions.
diff --git a/documents/تنظيم المساهمة في لغة ألف.md b/documents/تنظيم المساهمة في لغة ألف.md
@@ -26,7 +26,7 @@
 جميع الاحرف كبيرة  
 تكون الكلمة معبرة عن معنى الاسم  
 تفصل الكلمات المتعددة بشحطة سفلية "\_"
-يسمح بوجود عدد 2 شحطة سفلية "\_" كحد أقصى
+يسمح بوجود عدد 3 شحطة سفلية "\_" كحد أقصى
 
 
 
@@ -40,7 +40,7 @@ enum EnumType_ {Enum_Number_Type, Enum_Type}
 
 اسم تعريف العدد النصي او الenum يجب أن يبدأ ب حرف كبير لكل كلمة مع وجود شحطة سفلية "\_" في نهاية الاسم
 الارقام الاسمية تبدأ بحرف كبير لكل كلمة مع وجود شحطة سفلية بينها
-يسمح بوجود عدد 2 فواصل بين الارقام النوعية كحد أقصى
+يسمح بوجود عدد 3 فواصل بين الارقام النوعية كحد أقصى
 
 
 
@@ -55,7 +55,7 @@ int argsv_ = 7;
 int _alifMem_ = 5;
 ```
 
-في حال كان المتغير يتألف من كلمة واحدة او حرف فقط يجب إنهاءه بـ شحطة سفلية "\_"  
+في حال كان المتغير يتألف من كلمة واحدة أقل من ثلاث أحرف يجب إنهاءها بـ شحطة سفلية "\_" وفي حال كانت اكثر من ثلاث أحرف يصبح الأمر إختياري  
 في حال كان يتألف من اكثر من كلمة يجب ان تبدأ الكلمة الثانية وما بعدها بحرف كبير 
 في حال تكون الاسم من كلمة وحروف من كلمات اخرى، فيعامل معاملة اسم واحد وينتهي بشحطة
 المتغير العام يبدأ وينتهي بشحطة سفلية
@@ -71,11 +71,13 @@ int _alifMem_ = 5;
 void* func_name() {}
 void* funcName_exampleNameFunc() {}
 void* func_() {}
+void* _func_name() {}
 ```
 
-اسم الدالة يبدأ بحرف صغير وبعد كل فاصلة كذلك، ثم تبدأ الكلمات التالية بحرف كبير 
+اسم الدالة يبدأ بحرف صغير وبعد كل شحطة سفلية كذلك، ثم تبدأ الكلمات التالية بحرف كبير 
 الاسم المفرد يجب أن ينتهي بشحطة سفلية
 يسمح بشحطة سفلية واحدة كحد أقصى
+في حال تكرر اسم الدالة بسبب إستخدامها في واجهة برمجة التطبيق API يمكن أن يبدأ الاسم بشحطة سفلية دلالة على أنه مكرر
 
 
 
@@ -156,16 +158,16 @@ public:
     {
       std::wstring var2_{};  
     }V;
-
-    ClassName(int _var3) :
-        var_(_var3) {}
 };
-
 ```
 
 
 
 
 
-### دفع طلب الدمج:
+## دفع طلب الدمج:
+
+### 1. الرفع المباشر الى مستودع ألف:
 
+يجب أن يتم كتابة شرح مفصل عن التغييرات التي حصلت
+لا يسمح بدمج الطلب إلا من قبل مطور مخول بذلك
diff --git a/documents/تنظيم الملفات.md b/documents/تنظيم الملفات.md
@@ -1,7 +1,5 @@
-المسار source\Objects\Main : يحتوي ملفات XXX.cpp التي لا تمتلك ملفات AlifCore_XXX.h
-المسار source\Objects\Core : يحتوي ملفات XXX.cpp التي تمتلك ملفات AliCore_XXX.h
-المسار source\Objects\Alif : يحتوي الملف الرئيسي alif.cpp
 
-المسار source\Include\Main : يحتوي الملفات AlifCore_XXX.h
-المسار source\Include\Core : يحتوي الملفات XXX.h
-المسار source\Include\Alif : يحتوي الملف الرئيسي alif.h
+المسار source\\Alif : يحتوي ملفات alif.cpp و alif.h
+المسار source\\Objects : يحتوي ملفات XXX.cpp
+المسار source\\Include\\Core : يحتوي الملفات AlifCore_XXX.h
+المسار source\\Include\\Main : يحتوي الملفات XXX.h
diff --git a/linuxBuild/Makefile b/linuxBuild/Makefile
@@ -1,15 +1,14 @@
 CPP = c++
 CPPFLAGS = -Wall -std=c++20
 
-SOURCE_DIR = ../source/Objects
-INCLUDE_DIR = ../source/Include
+SOURCE_DIR = ../source
 BUILD_DIR = build
 
-SOURCE_FILES = $(wildcard $(SOURCE_DIR)/Alif/*.cpp) $(wildcard $(SOURCE_DIR)/Core/*.cpp) $(wildcard $(SOURCE_DIR)/Main/*.cpp)
+SOURCE_FILES = $(wildcard $(SOURCE_DIR)/Alif/*.cpp) $(wildcard $(SOURCE_DIR)/Objects/*.cpp)
 
-INCLUDES = -I$(INCLUDE_DIR)/Alif -I$(INCLUDE_DIR)/Core -I$(INCLUDE_DIR)/Main
+INCLUDES = -I$(SOURCE_DIR)/Alif -I$(SOURCE_DIR)/Include/Core -I$(SOURCE_DIR)/Include/Main
 
-OBJECTS = $(SOURCE_FILES:$(SOURCE_DIR)/%/%.cpp=$(BUILD_DIR)/%.o)
+OBJECTS = $(SOURCE_FILES:$(SOURCE_DIR)/Objects/%.cpp=$(BUILD_DIR)/%.o) $(SOURCE_FILES:$(SOURCE_DIR)/Alif/%.cpp=$(BUILD_DIR)/%.o)
 
 TARGET = $(BUILD_DIR)/alif
 

diff --git a/source/resources/AlifLogo.ico → resources/AlifLogo.ico b/source/resources/AlifLogo.ico → resources/AlifLogo.ico
diff --git a/...es/AlifLogo/AlifLogo_1024x1024_transp.png → ...es/AlifLogo/AlifLogo_1024x1024_transp.png b/...es/AlifLogo/AlifLogo_1024x1024_transp.png → ...es/AlifLogo/AlifLogo_1024x1024_transp.png
diff --git a/...es/AlifLogo/AlifLogo_2048x2048_transp.png → ...es/AlifLogo/AlifLogo_2048x2048_transp.png b/...es/AlifLogo/AlifLogo_2048x2048_transp.png → ...es/AlifLogo/AlifLogo_2048x2048_transp.png
diff --git a/...e/resources/AlifLogo/AlifLogo_512x512.png → resources/AlifLogo/AlifLogo_512x512.png b/...e/resources/AlifLogo/AlifLogo_512x512.png → resources/AlifLogo/AlifLogo_512x512.png
diff --git a/source/resources/Alif5.rc → resources/win/Alif5.rc b/source/resources/Alif5.rc → resources/win/Alif5.rc
diff --git a/source/resources/resource.h → resources/win/resource.h b/source/resources/resource.h → resources/win/resource.h
diff --git a/source/Objects/Alif/alif.cpp → source/Alif/alif.cpp b/source/Objects/Alif/alif.cpp → source/Alif/alif.cpp
diff --git a/source/Include/Alif/alif.h → source/Alif/alif.h b/source/Include/Alif/alif.h → source/Alif/alif.h
diff --git a/source/Objects/Main/ASDL.cpp → source/Objects/ASDL.cpp b/source/Objects/Main/ASDL.cpp → source/Objects/ASDL.cpp
diff --git a/source/Objects/Main/ASTOptimize.cpp → source/Objects/ASTOptimize.cpp b/source/Objects/Main/ASTOptimize.cpp → source/Objects/ASTOptimize.cpp
diff --git a/source/Objects/Main/Abstract.cpp → source/Objects/Abstract.cpp b/source/Objects/Main/Abstract.cpp → source/Objects/Abstract.cpp
diff --git a/source/Objects/Main/ActionHelpers.cpp → source/Objects/ActionHelpers.cpp b/source/Objects/Main/ActionHelpers.cpp → source/Objects/ActionHelpers.cpp
diff --git a/source/Objects/Main/AlifAST.cpp → source/Objects/AlifAST.cpp b/source/Objects/Main/AlifAST.cpp → source/Objects/AlifAST.cpp
diff --git a/source/Objects/Main/AlifAssemble.cpp → source/Objects/AlifAssemble.cpp b/source/Objects/Main/AlifAssemble.cpp → source/Objects/AlifAssemble.cpp
diff --git a/source/Objects/Main/AlifCompiler.cpp → source/Objects/AlifCompiler.cpp b/source/Objects/Main/AlifCompiler.cpp → source/Objects/AlifCompiler.cpp
diff --git a/source/Objects/Main/AlifCppType.cpp → source/Objects/AlifCppType.cpp b/source/Objects/Main/AlifCppType.cpp → source/Objects/AlifCppType.cpp
diff --git a/source/Objects/Core/AlifCycle.cpp → source/Objects/AlifCycle.cpp b/source/Objects/Core/AlifCycle.cpp → source/Objects/AlifCycle.cpp
diff --git a/source/Objects/Main/AlifEval.cpp → source/Objects/AlifEval.cpp b/source/Objects/Main/AlifEval.cpp → source/Objects/AlifEval.cpp
diff --git a/source/Objects/Main/AlifFlowGraph.cpp → source/Objects/AlifFlowGraph.cpp b/source/Objects/Main/AlifFlowGraph.cpp → source/Objects/AlifFlowGraph.cpp
diff --git a/source/Objects/Main/AlifLexer.cpp → source/Objects/AlifLexer.cpp b/source/Objects/Main/AlifLexer.cpp → source/Objects/AlifLexer.cpp
diff --git a/source/Objects/Core/AlifObject.cpp → source/Objects/AlifObject.cpp b/source/Objects/Core/AlifObject.cpp → source/Objects/AlifObject.cpp
diff --git a/source/Objects/Main/AlifParser.cpp → source/Objects/AlifParser.cpp b/source/Objects/Main/AlifParser.cpp → source/Objects/AlifParser.cpp
diff --git a/source/Objects/Main/AlifParserEngine.cpp → source/Objects/AlifParserEngine.cpp b/source/Objects/Main/AlifParserEngine.cpp → source/Objects/AlifParserEngine.cpp
diff --git a/...e/Objects/Main/AlifParserEngineErrors.cpp → source/Objects/AlifParserEngineErrors.cpp b/...e/Objects/Main/AlifParserEngineErrors.cpp → source/Objects/AlifParserEngineErrors.cpp
diff --git a/source/Objects/Core/AlifRun.cpp → source/Objects/AlifRun.cpp b/source/Objects/Core/AlifRun.cpp → source/Objects/AlifRun.cpp
diff --git a/source/Objects/Main/AlifState.cpp → source/Objects/AlifState.cpp b/source/Objects/Main/AlifState.cpp → source/Objects/AlifState.cpp
diff --git a/source/Objects/Main/AlifSymTable.cpp → source/Objects/AlifSymTable.cpp b/source/Objects/Main/AlifSymTable.cpp → source/Objects/AlifSymTable.cpp
diff --git a/source/Objects/Main/AlifTime.cpp → source/Objects/AlifTime.cpp b/source/Objects/Main/AlifTime.cpp → source/Objects/AlifTime.cpp
diff --git a/source/Objects/Main/AlifToken.cpp → source/Objects/AlifToken.cpp b/source/Objects/Main/AlifToken.cpp → source/Objects/AlifToken.cpp
diff --git a/source/Objects/Main/AlifTokenState.cpp → source/Objects/AlifTokenState.cpp b/source/Objects/Main/AlifTokenState.cpp → source/Objects/AlifTokenState.cpp
diff --git a/source/Objects/Main/BoolObject.cpp → source/Objects/BoolObject.cpp b/source/Objects/Main/BoolObject.cpp → source/Objects/BoolObject.cpp
diff --git a/source/Objects/Main/BuiltinsModule.cpp → source/Objects/BuiltinsModule.cpp b/source/Objects/Main/BuiltinsModule.cpp → source/Objects/BuiltinsModule.cpp
diff --git a/source/Objects/Main/BytesMethods.cpp → source/Objects/BytesMethods.cpp b/source/Objects/Main/BytesMethods.cpp → source/Objects/BytesMethods.cpp
diff --git a/source/Objects/Main/BytesObject.cpp → source/Objects/BytesObject.cpp b/source/Objects/Main/BytesObject.cpp → source/Objects/BytesObject.cpp
diff --git a/source/Objects/Main/Call.cpp → source/Objects/Call.cpp b/source/Objects/Main/Call.cpp → source/Objects/Call.cpp
diff --git a/source/Objects/Main/Capsule.cpp → source/Objects/Capsule.cpp b/source/Objects/Main/Capsule.cpp → source/Objects/Capsule.cpp
diff --git a/source/Objects/Main/ClassObject.cpp → source/Objects/ClassObject.cpp b/source/Objects/Main/ClassObject.cpp → source/Objects/ClassObject.cpp
diff --git a/source/Objects/Main/CodeObject.cpp → source/Objects/CodeObject.cpp b/source/Objects/Main/CodeObject.cpp → source/Objects/CodeObject.cpp
diff --git a/source/Objects/Main/ConfigMinimal.cpp → source/Objects/ConfigMinimal.cpp b/source/Objects/Main/ConfigMinimal.cpp → source/Objects/ConfigMinimal.cpp
diff --git a/source/Objects/Main/DescrObject.cpp → source/Objects/DescrObject.cpp b/source/Objects/Main/DescrObject.cpp → source/Objects/DescrObject.cpp
diff --git a/source/Objects/Main/DictObject.cpp → source/Objects/DictObject.cpp b/source/Objects/Main/DictObject.cpp → source/Objects/DictObject.cpp
diff --git a/source/Objects/Core/FileManip.cpp → source/Objects/FileManip.cpp b/source/Objects/Core/FileManip.cpp → source/Objects/FileManip.cpp
diff --git a/source/Objects/Main/FileObject.cpp → source/Objects/FileObject.cpp b/source/Objects/Main/FileObject.cpp → source/Objects/FileObject.cpp
diff --git a/source/Objects/Main/FileTokenizer.cpp → source/Objects/FileTokenizer.cpp b/source/Objects/Main/FileTokenizer.cpp → source/Objects/FileTokenizer.cpp
diff --git a/source/Objects/Main/FloatObject.cpp → source/Objects/FloatObject.cpp b/source/Objects/Main/FloatObject.cpp → source/Objects/FloatObject.cpp
diff --git a/source/Objects/Main/FrameObject.cpp → source/Objects/FrameObject.cpp b/source/Objects/Main/FrameObject.cpp → source/Objects/FrameObject.cpp
diff --git a/source/Objects/Main/FunctionObject.cpp → source/Objects/FunctionObject.cpp b/source/Objects/Main/FunctionObject.cpp → source/Objects/FunctionObject.cpp
diff --git a/source/Objects/Main/GC.cpp → source/Objects/GC.cpp b/source/Objects/Main/GC.cpp → source/Objects/GC.cpp
diff --git a/source/Objects/Main/GenericAliasObject.cpp → source/Objects/GenericAliasObject.cpp b/source/Objects/Main/GenericAliasObject.cpp → source/Objects/GenericAliasObject.cpp
diff --git a/source/Objects/Main/GetArgs.cpp → source/Objects/GetArgs.cpp b/source/Objects/Main/GetArgs.cpp → source/Objects/GetArgs.cpp
diff --git a/source/Objects/Core/GetConsoleLine.cpp → source/Objects/GetConsoleLine.cpp b/source/Objects/Core/GetConsoleLine.cpp → source/Objects/GetConsoleLine.cpp
diff --git a/source/Objects/Main/GetVersion.cpp → source/Objects/GetVersion.cpp b/source/Objects/Main/GetVersion.cpp → source/Objects/GetVersion.cpp
diff --git a/source/Objects/Main/Import.cpp → source/Objects/Import.cpp b/source/Objects/Main/Import.cpp → source/Objects/Import.cpp
diff --git a/source/Objects/Core/InitConfig.cpp → source/Objects/InitConfig.cpp b/source/Objects/Core/InitConfig.cpp → source/Objects/InitConfig.cpp
@@ -102,7 +102,9 @@ static AlifIntT alif_setFileMode(const AlifConfig* _config) {
 	bool modeErr = _setmode(fileno(stderr), O_BINARY);
 
 	if (!modeIn or !modeOut or !modeErr) {
-		std::cout << "لم يستطع تهيئة الطرفية لقراءة الأحرف العربية في نظام ويندوز" << std::endl;
+		std::cout <<
+			"can't init _setmode in windows for reading Arabic characters" // يجب أن تكون باللغة الاجنبية في حال لم يستطع تهيئة طباعة الاحرف العربية
+			<< std::endl;
 		return -1;
 	}
 #endif
@@ -155,7 +157,9 @@ AlifIntT alif_setStdioLocale(const AlifConfig* _config) {
 
 	const char* locale = alif_setLocale(LC_CTYPE);
 	if (locale == nullptr) {
-		std::cout << "لم يستطع تهيئة الموقع" << std::endl;
+		std::cout <<
+			"can't init locale for reading Arabic characters" // يجب أن تكون باللغة الاجنبية في حال لم يستطع تهيئة طباعة الاحرف العربية
+			<< std::endl;
 		return -1;
 	}
 

diff --git a/source/Objects/Main/InstructionSeq.cpp → source/Objects/InstructionSeq.cpp b/source/Objects/Main/InstructionSeq.cpp → source/Objects/InstructionSeq.cpp
diff --git a/source/Objects/Main/Instrumentation.cpp → source/Objects/Instrumentation.cpp b/source/Objects/Main/Instrumentation.cpp → source/Objects/Instrumentation.cpp
diff --git a/source/Objects/Main/IntegerObject.cpp → source/Objects/IntegerObject.cpp b/source/Objects/Main/IntegerObject.cpp → source/Objects/IntegerObject.cpp
diff --git a/source/Objects/Main/IterObject.cpp → source/Objects/IterObject.cpp b/source/Objects/Main/IterObject.cpp → source/Objects/IterObject.cpp
diff --git a/source/Objects/Main/ListObject.cpp → source/Objects/ListObject.cpp b/source/Objects/Main/ListObject.cpp → source/Objects/ListObject.cpp
diff --git a/source/Objects/Core/Memory.cpp → source/Objects/Memory.cpp b/source/Objects/Core/Memory.cpp → source/Objects/Memory.cpp
diff --git a/source/Objects/Main/MethodObject.cpp → source/Objects/MethodObject.cpp b/source/Objects/Main/MethodObject.cpp → source/Objects/MethodObject.cpp
diff --git a/source/Objects/Main/ModuleObject.cpp → source/Objects/ModuleObject.cpp b/source/Objects/Main/ModuleObject.cpp → source/Objects/ModuleObject.cpp
diff --git a/source/Objects/Main/SetObject.cpp → source/Objects/SetObject.cpp b/source/Objects/Main/SetObject.cpp → source/Objects/SetObject.cpp
diff --git a/source/Objects/Main/SliceObject.cpp → source/Objects/SliceObject.cpp b/source/Objects/Main/SliceObject.cpp → source/Objects/SliceObject.cpp
diff --git a/source/Objects/Main/Specialize.cpp → source/Objects/Specialize.cpp b/source/Objects/Main/Specialize.cpp → source/Objects/Specialize.cpp
diff --git a/source/Objects/Main/StringParser.cpp → source/Objects/StringParser.cpp b/source/Objects/Main/StringParser.cpp → source/Objects/StringParser.cpp
diff --git a/source/Objects/Main/SysModule.cpp → source/Objects/SysModule.cpp b/source/Objects/Main/SysModule.cpp → source/Objects/SysModule.cpp
diff --git a/source/Objects/Main/Thread.cpp → source/Objects/Thread.cpp b/source/Objects/Main/Thread.cpp → source/Objects/Thread.cpp
diff --git a/source/Objects/Main/TupleObject.cpp → source/Objects/TupleObject.cpp b/source/Objects/Main/TupleObject.cpp → source/Objects/TupleObject.cpp
diff --git a/source/Objects/Main/TypeObject.cpp → source/Objects/TypeObject.cpp b/source/Objects/Main/TypeObject.cpp → source/Objects/TypeObject.cpp
diff --git a/source/Objects/Core/UStrObject.cpp → source/Objects/UStrObject.cpp b/source/Objects/Core/UStrObject.cpp → source/Objects/UStrObject.cpp
diff --git a/winBuild/Alif.vcxproj b/winBuild/Alif.vcxproj
@@ -95,8 +95,8 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <AdditionalIncludeDirectories>..\source\Include\Main;..\source\Include\Alif;..\source\Include\Core</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>..\source\Alif;..\source\Include\Main;..\source\Include\Core;C:\Users\PC-1\Documents\GitHub\Alif\source\Alif</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
@@ -112,8 +112,8 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\source\Include\Main;..\source\Include\Alif;..\source\Include\Core</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>..\source\Alif;..\source\Include\Main;..\source\Include\Core;C:\Users\PC-1\Documents\GitHub\Alif\source\Alif</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
@@ -129,8 +129,8 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\source\Include\Main;..\source\Include\Alif;..\source\Include\Core</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>..\source\Alif;..\source\Include\Main;..\source\Include\Core;C:\Users\PC-1\Documents\GitHub\Alif\source\Alif</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
@@ -146,8 +146,8 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\source\Include\Main;..\source\Include\Alif;..\source\Include\Core</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>..\source\Alif;..\source\Include\Main;..\source\Include\Core;C:\Users\PC-1\Documents\GitHub\Alif\source\Alif</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
@@ -158,11 +158,14 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\source\Include\Alif\alif.h" />
-    <ClInclude Include="..\source\resources\resource.h" />
+    <ClInclude Include="..\resources\win\resource.h" />
+    <ClInclude Include="..\source\Alif\alif.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\source\resources\Alif5.rc" />
+    <ResourceCompile Include="..\resources\win\Alif5.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\source\Alif\alif.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="AlifCore.vcxproj">
@@ -172,9 +175,6 @@
       <Project>{8604db0e-c2a6-49f6-be9b-755878fda8f8}</Project>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\source\Objects\Alif\alif.cpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/winBuild/Alif.vcxproj.filters b/winBuild/Alif.vcxproj.filters
@@ -15,20 +15,20 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\source\resources\resource.h">
-      <Filter>Resource Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Alif\alif.h">
+    <ClInclude Include="..\source\Alif\alif.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\resources\win\resource.h">
+      <Filter>Resource Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\source\resources\Alif5.rc">
+    <ResourceCompile Include="..\resources\win\Alif5.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\source\Objects\Alif\alif.cpp">
+    <ClCompile Include="..\source\Alif\alif.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/winBuild/AlifCore.vcxproj b/winBuild/AlifCore.vcxproj
@@ -72,16 +72,6 @@
     <ClInclude Include="..\source\Include\Core\AlifCore_TypeObject.h" />
     <ClInclude Include="..\source\Include\Core\AlifCore_UString.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\source\Objects\Core\AlifCycle.cpp" />
-    <ClCompile Include="..\source\Objects\Core\AlifObject.cpp" />
-    <ClCompile Include="..\source\Objects\Core\AlifRun.cpp" />
-    <ClCompile Include="..\source\Objects\Core\FileManip.cpp" />
-    <ClCompile Include="..\source\Objects\Core\GetConsoleLine.cpp" />
-    <ClCompile Include="..\source\Objects\Core\InitConfig.cpp" />
-    <ClCompile Include="..\source\Objects\Core\Memory.cpp" />
-    <ClCompile Include="..\source\Objects\Core\UStrObject.cpp" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -158,14 +148,19 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalIncludeDirectories>..\source\Include\Main;..\source\Include\Core;..\source\Include\Alif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <Lib>
+      <OutputFile>
+      </OutputFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -175,7 +170,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
       <AdditionalIncludeDirectories>..\source\Include\Main;..\source\Include\Core;..\source\Include\Alif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -185,21 +180,31 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <Lib>
+      <OutputFile>
+      </OutputFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
       <AdditionalIncludeDirectories>..\source\Include\Main;..\source\Include\Core;..\source\Include\Alif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <Lib>
+      <OutputFile>
+      </OutputFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -209,7 +214,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
       <AdditionalIncludeDirectories>..\source\Include\Main;..\source\Include\Core;..\source\Include\Alif;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -219,6 +224,11 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <Lib>
+      <OutputFile>
+      </OutputFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/winBuild/AlifCore.vcxproj.filters b/winBuild/AlifCore.vcxproj.filters
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
     <Filter Include="Header Core Files">
       <UniqueIdentifier>{22590bc6-b02a-485c-b081-0a8c0d8dcd71}</UniqueIdentifier>
     </Filter>
@@ -171,30 +163,4 @@
       <Filter>Header Core Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\source\Objects\Core\AlifCycle.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\Objects\Core\FileManip.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\Objects\Core\GetConsoleLine.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\Objects\Core\InitConfig.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\Objects\Core\Memory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\Objects\Core\UStrObject.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\Objects\Core\AlifObject.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\Objects\Core\AlifRun.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
 </Project>