From 8c296f182db130616107782cdce087c05fabc333 Mon Sep 17 00:00:00 2001 From: sam-astro <77079540+sam-astro@users.noreply.github.com> Date: Sat, 29 Jan 2022 18:10:56 -0500 Subject: [PATCH] Rename all to ZSharp --- README.md | 4 +- Slang.sln => Z-Sharp.sln | 4 +- .../ZSharp-Installer.vdproj | 42 ++++++++--------- .../installer-icon.ico | Bin .../CMakeFiles/FindSDL2_image.cmake | 0 .../CMakeFiles/FindSDL2_ttf.cmake | 0 {Slang => ZSharp}/CMakeLists.txt | 6 +-- {Slang => ZSharp}/CMakeSettings.json | 0 {Slang => ZSharp}/Main.cpp | 30 ++++++------ Slang/SLB.h => ZSharp/ZS.h | 28 +++++------ Slang/Slang.rc => ZSharp/ZSharp.rc | 0 Slang/Slang.vcxproj => ZSharp/ZSharp.vcxproj | 7 +-- .../ZSharp.vcxproj.filters | 4 +- {Slang => ZSharp}/anyops.h | 0 {Slang => ZSharp}/boost_x64_release.props | 0 {Slang => ZSharp}/builtin.h | 44 +++++++++--------- {Slang => ZSharp}/eval.cpp | 2 +- {Slang => ZSharp}/eval.h | 0 {Slang => ZSharp}/graphics.h | 0 {Slang => ZSharp}/icon.ico | Bin {Slang => ZSharp}/linux-build/CMakeCache.txt | 0 .../CMakeFiles/3.16.3/CMakeCCompiler.cmake | 0 .../CMakeFiles/3.16.3/CMakeCXXCompiler.cmake | 0 .../3.16.3/CMakeDetermineCompilerABI_C.bin | Bin .../3.16.3/CMakeDetermineCompilerABI_CXX.bin | Bin .../CMakeFiles/3.16.3/CMakeSystem.cmake | 0 .../3.16.3/CompilerIdC/CMakeCCompilerId.c | 0 .../CMakeFiles/3.16.3/CompilerIdC/a.out | Bin .../CompilerIdCXX/CMakeCXXCompilerId.cpp | 0 .../CMakeFiles/3.16.3/CompilerIdCXX/a.out | Bin .../CMakeDirectoryInformation.cmake | 0 .../linux-build/CMakeFiles/Makefile.cmake | 0 .../linux-build/CMakeFiles/Makefile2 | 0 .../CMakeFiles/Slang.dir/CXX.includecache | 0 .../CMakeFiles/Slang.dir/DependInfo.cmake | 0 .../CMakeFiles/Slang.dir/Main.cpp.o | Bin .../CMakeFiles/Slang.dir/build.make | 0 .../CMakeFiles/Slang.dir/cmake_clean.cmake | 0 .../CMakeFiles/Slang.dir/depend.internal | 0 .../CMakeFiles/Slang.dir/depend.make | 0 .../CMakeFiles/Slang.dir/eval.cpp.o | Bin .../CMakeFiles/Slang.dir/flags.make | 0 .../linux-build/CMakeFiles/Slang.dir/link.txt | 0 .../CMakeFiles/Slang.dir/progress.make | 0 .../CMakeFiles/Slang.dir/strops.cpp.o | Bin .../CMakeFiles/TargetDirectories.txt | 0 .../linux-build/CMakeFiles/cmake.check_cache | 0 .../linux-build/CMakeFiles/progress.marks | 0 {Slang => ZSharp}/linux-build/Makefile | 0 {Slang => ZSharp}/linux-build/Slang-Linux | Bin .../linux-build/cmake_install.cmake | 0 {Slang => ZSharp}/main.h | 0 {Slang => ZSharp}/resource.h | 2 +- {Slang => ZSharp}/strops.cpp | 0 {Slang => ZSharp}/strops.h | 0 .../{script.slg => script.zs} | 0 56 files changed, 87 insertions(+), 86 deletions(-) rename Slang.sln => Z-Sharp.sln (85%) rename Slang-Installer/Slang-Installer.vdproj => ZSharp-Installer/ZSharp-Installer.vdproj (96%) rename {Slang-Installer => ZSharp-Installer}/installer-icon.ico (100%) rename {Slang => ZSharp}/CMakeFiles/FindSDL2_image.cmake (100%) rename {Slang => ZSharp}/CMakeFiles/FindSDL2_ttf.cmake (100%) rename {Slang => ZSharp}/CMakeLists.txt (80%) rename {Slang => ZSharp}/CMakeSettings.json (100%) rename {Slang => ZSharp}/Main.cpp (96%) rename Slang/SLB.h => ZSharp/ZS.h (78%) rename Slang/Slang.rc => ZSharp/ZSharp.rc (100%) rename Slang/Slang.vcxproj => ZSharp/ZSharp.vcxproj (98%) rename Slang/Slang.vcxproj.filters => ZSharp/ZSharp.vcxproj.filters (95%) rename {Slang => ZSharp}/anyops.h (100%) rename {Slang => ZSharp}/boost_x64_release.props (100%) rename {Slang => ZSharp}/builtin.h (88%) rename {Slang => ZSharp}/eval.cpp (98%) rename {Slang => ZSharp}/eval.h (100%) rename {Slang => ZSharp}/graphics.h (100%) rename {Slang => ZSharp}/icon.ico (100%) rename {Slang => ZSharp}/linux-build/CMakeCache.txt (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/3.16.3/CMakeCCompiler.cmake (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/3.16.3/CMakeCXXCompiler.cmake (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/3.16.3/CMakeDetermineCompilerABI_C.bin (100%) mode change 100755 => 100644 rename {Slang => ZSharp}/linux-build/CMakeFiles/3.16.3/CMakeDetermineCompilerABI_CXX.bin (100%) mode change 100755 => 100644 rename {Slang => ZSharp}/linux-build/CMakeFiles/3.16.3/CMakeSystem.cmake (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/3.16.3/CompilerIdC/CMakeCCompilerId.c (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/3.16.3/CompilerIdC/a.out (100%) mode change 100755 => 100644 rename {Slang => ZSharp}/linux-build/CMakeFiles/3.16.3/CompilerIdCXX/CMakeCXXCompilerId.cpp (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/3.16.3/CompilerIdCXX/a.out (100%) mode change 100755 => 100644 rename {Slang => ZSharp}/linux-build/CMakeFiles/CMakeDirectoryInformation.cmake (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Makefile.cmake (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Makefile2 (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/CXX.includecache (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/DependInfo.cmake (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/Main.cpp.o (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/build.make (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/cmake_clean.cmake (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/depend.internal (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/depend.make (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/eval.cpp.o (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/flags.make (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/link.txt (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/progress.make (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/Slang.dir/strops.cpp.o (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/TargetDirectories.txt (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/cmake.check_cache (100%) rename {Slang => ZSharp}/linux-build/CMakeFiles/progress.marks (100%) rename {Slang => ZSharp}/linux-build/Makefile (100%) rename {Slang => ZSharp}/linux-build/Slang-Linux (100%) rename {Slang => ZSharp}/linux-build/cmake_install.cmake (100%) rename {Slang => ZSharp}/main.h (100%) rename {Slang => ZSharp}/resource.h (95%) rename {Slang => ZSharp}/strops.cpp (100%) rename {Slang => ZSharp}/strops.h (100%) rename examples/Pong-Example-Project/{script.slg => script.zs} (100%) diff --git a/README.md b/README.md index 949b9c3..bdc981d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# Z#, Z-Sharp -Z-Sharp is a custom programming language I made because I don't like c++ very much (Z-Sharp's interpreter is written in c++ though). It used to be called Slang, standing for "Stupid Lang", but another programmig langauge called Slang already exists :(. Z-Sharp scripts have the file extension .zs. The base syntax and formatting I would say is quite similar to C#, but differs as task complexity increases. It has support for graphics using SDL2, and by default is not enabled. Here is some example code. +# Slang, or StuLang +Slang, or StuLang, which stands for ***Stu****pid **Lang**uage* is a custom programming language I made because I don't like c++ very much (Slang's interpreter is written in c++ though). Slang scripts have the file extension .slg. The base syntax and formatting I would say is quite similar to C#, but differs as task complexity increases. It has support for graphics using SDL2, and by default is not enabled. Here is some example code. ```c# // Comments are indicated by two forward slashes // They can only be on their own line diff --git a/Slang.sln b/Z-Sharp.sln similarity index 85% rename from Slang.sln rename to Z-Sharp.sln index c44554c..5b781b2 100644 --- a/Slang.sln +++ b/Z-Sharp.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31612.314 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Slang", "Slang\Slang.vcxproj", "{D5F150F8-1F83-41EB-A195-1B5C3CA9322A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZSharp", "ZSharp\ZSharp.vcxproj", "{D5F150F8-1F83-41EB-A195-1B5C3CA9322A}" EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Slang-Installer", "Slang-Installer\Slang-Installer.vdproj", "{42EA0B7A-2068-4065-B9EB-041F32933A66}" +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "ZSharp Installer", "ZSharp-Installer\ZSharp-Installer.vdproj", "{42EA0B7A-2068-4065-B9EB-041F32933A66}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Slang-Installer/Slang-Installer.vdproj b/ZSharp-Installer/ZSharp-Installer.vdproj similarity index 96% rename from Slang-Installer/Slang-Installer.vdproj rename to ZSharp-Installer/ZSharp-Installer.vdproj index 684f821..a06655a 100644 --- a/Slang-Installer/Slang-Installer.vdproj +++ b/ZSharp-Installer/ZSharp-Installer.vdproj @@ -3,7 +3,7 @@ "VSVersion" = "3:800" "ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" "IsWebType" = "8:FALSE" -"ProjectName" = "8:Slang-Installer" +"ProjectName" = "8:ZSharp Installer" "LanguageId" = "3:1033" "CodePage" = "3:1252" "UILanguageId" = "3:1033" @@ -93,7 +93,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:..\\Releases\\Slang-Installer\\Slang-Installer.msi" + "OutputFilename" = "8:..\\Releases\\ZSharp-Installer\\ZSharp-Installer.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -125,7 +125,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:..\\Releases\\Slang-Installer-Win-x64\\Slang-Installer.msi" + "OutputFilename" = "8:..\\Releases\\ZSharp-Installer-Win-x64\\ZSharp-Installer.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -174,7 +174,7 @@ { "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1BBDEA811E8A494DB30AB0E778BEF5B3" { - "SourcePath" = "8:..\\Releases\\Slang-Win-x64\\Pong-Example-Project\\square.png" + "SourcePath" = "8:..\\Releases\\ZSharp-Win-x64\\Pong-Example-Project\\square.png" "TargetName" = "8:square.png" "Tag" = "8:" "Folder" = "8:_AB72F4F4665144CA990532BBC3679E36" @@ -194,7 +194,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29CB0EFE95A142F4A149E51FAE871DDE" { - "SourcePath" = "8:..\\Releases\\Slang-Win-x64\\libtiff-5.dll" + "SourcePath" = "8:..\\Releases\\ZSharp-Win-x64\\libtiff-5.dll" "TargetName" = "8:libtiff-5.dll" "Tag" = "8:" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" @@ -214,7 +214,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_38EBD2EEB8C34316A3249C9D9873B1C2" { - "SourcePath" = "8:..\\Releases\\Slang-Win-x64\\zlib1.dll" + "SourcePath" = "8:..\\Releases\\ZSharp-Win-x64\\zlib1.dll" "TargetName" = "8:zlib1.dll" "Tag" = "8:" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" @@ -234,7 +234,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4B23F888FF8342319507C8AAA3334953" { - "SourcePath" = "8:..\\Releases\\Slang-Win-x64\\libpng16-16.dll" + "SourcePath" = "8:..\\Releases\\ZSharp-Win-x64\\libpng16-16.dll" "TargetName" = "8:libpng16-16.dll" "Tag" = "8:" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" @@ -254,7 +254,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5F99C783A5A5405FAEED16B4899E66A3" { - "SourcePath" = "8:..\\Releases\\Slang-Win-x64\\Pong-Example-Project\\net.png" + "SourcePath" = "8:..\\Releases\\ZSharp-Win-x64\\Pong-Example-Project\\net.png" "TargetName" = "8:net.png" "Tag" = "8:" "Folder" = "8:_AB72F4F4665144CA990532BBC3679E36" @@ -294,7 +294,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8116B924B2DC45BB901E89A2EEB674E6" { - "SourcePath" = "8:..\\Releases\\Slang-Win-x64\\libjpeg-9.dll" + "SourcePath" = "8:..\\Releases\\ZSharp-Win-x64\\libjpeg-9.dll" "TargetName" = "8:libjpeg-9.dll" "Tag" = "8:" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" @@ -314,7 +314,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_84E97BEFD3C240DC822DAEF66BB20D79" { - "SourcePath" = "8:..\\Releases\\Slang-Win-x64\\Pong-Example-Project\\arial.ttf" + "SourcePath" = "8:..\\Releases\\ZSharp-Win-x64\\Pong-Example-Project\\arial.ttf" "TargetName" = "8:arial.ttf" "Tag" = "8:" "Folder" = "8:_AB72F4F4665144CA990532BBC3679E36" @@ -334,7 +334,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8D4524D8D2654AF28CD2B8483A2B2505" { - "SourcePath" = "8:..\\Releases\\Slang-Win-x64\\libwebp-7.dll" + "SourcePath" = "8:..\\Releases\\ZSharp-Win-x64\\libwebp-7.dll" "TargetName" = "8:libwebp-7.dll" "Tag" = "8:" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" @@ -354,7 +354,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F1964A3FC0114E58A81978C4C7107596" { - "SourcePath" = "8:..\\Releases\\Slang-Win-x64\\Pong-Example-Project\\script.slg" + "SourcePath" = "8:..\\Releases\\ZSharp-Win-x64\\Pong-Example-Project\\script.slg" "TargetName" = "8:script.slg" "Tag" = "8:" "Folder" = "8:_AB72F4F4665144CA990532BBC3679E36" @@ -374,7 +374,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FEA298B841784CB2933DCEB504513792" { - "SourcePath" = "8:..\\Releases\\Slang-Win-x64\\libfreetype-6.dll" + "SourcePath" = "8:..\\Releases\\ZSharp-Win-x64\\libfreetype-6.dll" "TargetName" = "8:libfreetype-6.dll" "Tag" = "8:" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" @@ -422,7 +422,7 @@ } "{3C67513D-01DD-4637-8A68-80971EB9504F}:_BCDF457FF4564F7BBFD6AEF054FE16C2" { - "DefaultLocation" = "8:[ProgramFiles64Folder]\\Slang" + "DefaultLocation" = "8:[ProgramFiles64Folder]\\ZSharp" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -458,24 +458,24 @@ "Product" { "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:Slang" - "ProductCode" = "8:{A5629CD2-46CB-4945-BBA2-BAC60F2DDFC4}" - "PackageCode" = "8:{DEE267E6-C968-4059-8F0F-4560CF270A35}" + "ProductName" = "8:ZSharp" + "ProductCode" = "8:{4E83312A-4C42-44BD-8604-E55F7D1B005B}" + "PackageCode" = "8:{A82E7BE4-0442-482B-A5CB-CC097C9915DF}" "UpgradeCode" = "8:{8ABDE53F-7FF9-455B-A777-B4C1C624FA13}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.2.2" + "ProductVersion" = "8:1.3.0" "Manufacturer" = "8:Sam-Astro" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" - "Title" = "8:Slang" + "Title" = "8:ZSharp" "Subject" = "8:" "ARPCONTACT" = "8:Sam-Astro" "Keywords" = "8:" - "ARPCOMMENTS" = "8:Installer for Slang interpreter" + "ARPCOMMENTS" = "8:Installer for ZSharp interpreter" "ARPURLINFOABOUT" = "8:" "ARPPRODUCTICON" = "8:_7C9D3FE3584D494F807EBD12C93E2FC5" "ARPIconIndex" = "3:0" @@ -981,7 +981,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2441313DD4DA406BBC1915DDEE0AC74C" { - "SourcePath" = "8:..\\Releases\\Slang-Win-x64\\Slang.exe" + "SourcePath" = "8:..\\Releases\\ZSharp-Win-x64\\ZSharp.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" diff --git a/Slang-Installer/installer-icon.ico b/ZSharp-Installer/installer-icon.ico similarity index 100% rename from Slang-Installer/installer-icon.ico rename to ZSharp-Installer/installer-icon.ico diff --git a/Slang/CMakeFiles/FindSDL2_image.cmake b/ZSharp/CMakeFiles/FindSDL2_image.cmake similarity index 100% rename from Slang/CMakeFiles/FindSDL2_image.cmake rename to ZSharp/CMakeFiles/FindSDL2_image.cmake diff --git a/Slang/CMakeFiles/FindSDL2_ttf.cmake b/ZSharp/CMakeFiles/FindSDL2_ttf.cmake similarity index 100% rename from Slang/CMakeFiles/FindSDL2_ttf.cmake rename to ZSharp/CMakeFiles/FindSDL2_ttf.cmake diff --git a/Slang/CMakeLists.txt b/ZSharp/CMakeLists.txt similarity index 80% rename from Slang/CMakeLists.txt rename to ZSharp/CMakeLists.txt index 32dc83f..ac4c9be 100644 --- a/Slang/CMakeLists.txt +++ b/ZSharp/CMakeLists.txt @@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -project(Slang) +project(ZSharp) SET(programName Slang) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeFiles/") -add_executable (Slang Main.cpp main.h anyops.h builtin.h strops.cpp strops.h eval.cpp eval.h graphics.h SLB.h) +add_executable (ZSharp Main.cpp main.h anyops.h builtin.h strops.cpp strops.h eval.cpp eval.h graphics.h ZS.h) find_package(SDL2 REQUIRED) find_package(SDL2_image REQUIRED) @@ -31,4 +31,4 @@ FIND_PACKAGE(Boost REQUIRED COMPONENTS system) include_directories(${Boost_INCLUDE_DIRS}) -target_link_libraries(Slang m ${Boost_LIBRARIES} ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_TTF_LIBRARIES}) +target_link_libraries(ZSharp m ${Boost_LIBRARIES} ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_TTF_LIBRARIES}) diff --git a/Slang/CMakeSettings.json b/ZSharp/CMakeSettings.json similarity index 100% rename from Slang/CMakeSettings.json rename to ZSharp/CMakeSettings.json diff --git a/Slang/Main.cpp b/ZSharp/Main.cpp similarity index 96% rename from Slang/Main.cpp rename to ZSharp/Main.cpp index 10b7002..4b74fd7 100644 --- a/Slang/Main.cpp +++ b/ZSharp/Main.cpp @@ -36,7 +36,7 @@ #include "main.h" #include "anyops.h" -#include "SLB.h" +#include "ZS.h" using namespace std; using namespace boost; @@ -74,7 +74,7 @@ boost::any GetVariableValue(const string& varName, const unordered_map& variableValues) { - if (variableValues.find(split(varName, '.')[0]) != variableValues.end() && split(varName, '.')[0] != "SLB") + if (variableValues.find(split(varName, '.')[0]) != variableValues.end() && split(varName, '.')[0] != "ZS") return true; else return false; @@ -114,7 +114,7 @@ bool IsFunction(const string& funcName) else return false; } -bool IsSLBFunction(const string& funcName) +bool IsZSFunction(const string& funcName) { if (funcName[0] == 'S' && funcName[1] == 'L' && funcName[2] == 'B' && funcName[3] == '.') return true; @@ -132,9 +132,9 @@ boost::any EvalExpression(const string& ex, unordered_map& v #endif bool isFunc = IsFunction(split(expression, '(')[0]); - bool isSLB = split(expression, '.')[0] == "SLB"; + bool isZS = split(expression, '.')[0] == "ZS"; // If no operations are applied, then return self - if ((countOutsideParenthesis(expression, '+') == 0 && countOutsideParenthesis(expression, '-') == 0 && countOutsideParenthesis(expression, '*') == 0 && countOutsideParenthesis(expression, '/') == 0 && countOutsideParenthesis(expression, '^') == 0) || split(expression, '.')[0] == "SLB") + if ((countOutsideParenthesis(expression, '+') == 0 && countOutsideParenthesis(expression, '-') == 0 && countOutsideParenthesis(expression, '*') == 0 && countOutsideParenthesis(expression, '/') == 0 && countOutsideParenthesis(expression, '^') == 0) || split(expression, '.')[0] == "ZS") { bool isFunc = IsFunction(split(expression, '(')[0]); if (isFunc && !inQuotes) @@ -150,7 +150,7 @@ boost::any EvalExpression(const string& ex, unordered_map& v } return ExecuteFunction(split(expression, '(')[0], VarValues(split(argContents, ','), variableValues)); } - else if (split(expression, '.')[0] == "SLB" && !inQuotes) + else if (split(expression, '.')[0] == "ZS" && !inQuotes) { string argContents = ""; int y = indexInStr(expression, '(') + 1; @@ -160,7 +160,7 @@ boost::any EvalExpression(const string& ex, unordered_map& v y++; } - return SLBFunction(split(expression, '(')[0], VarValues(split(argContents, ','), variableValues)); + return ZSFunction(split(expression, '(')[0], VarValues(split(argContents, ','), variableValues)); } else return GetVariableValue(expression, variableValues); @@ -199,7 +199,7 @@ boost::any EvalExpression(const string& ex, unordered_map& v string returnVal = AnyAsString(ExecuteFunction(name, VarValues(split(argContents, ','), variableValues))); newExpression += returnVal; } - else if (split(name, '.')[0] == "SLB" && !inQuotes) + else if (split(name, '.')[0] == "ZS" && !inQuotes) { string argContents = ""; int y = indexInStr(expression, '(') + 1; @@ -210,7 +210,7 @@ boost::any EvalExpression(const string& ex, unordered_map& v y++; } //cout << split(expression, '(')[0] << " " << argContents << endl; - string returnVal = AnyAsString(SLBFunction(split(name, '(')[0], VarValues(split(argContents, ','), variableValues))); + string returnVal = AnyAsString(ZSFunction(split(name, '(')[0], VarValues(split(argContents, ','), variableValues))); newExpression += returnVal; } else @@ -373,7 +373,7 @@ boost::any ProcessLine(const vector>& words, int lineNum, unorder if (words.at(lineNum).at(0)[0] == '/' && words.at(lineNum).at(0)[1] == '/') return nullType; - // If print statement (deprecated, now use SLB.System.Print() function) + // If print statement (deprecated, now use ZS.System.Print() function) else if (words.at(lineNum).at(0) == "print") { cout << StringRaw(AnyAsString(EvalExpression(unWrapVec(vector(words.at(lineNum).begin() + 1, words.at(lineNum).end())), variableValues))) << endl; @@ -384,7 +384,7 @@ boost::any ProcessLine(const vector>& words, int lineNum, unorder else if (words.at(lineNum).at(0) == "return") return EvalExpression(unWrapVec(vector(words.at(lineNum).begin() + 1, words.at(lineNum).end())), variableValues); - // Check if it is SLB Builtin function + // Check if it is ZS Builtin function else if (words.at(lineNum).at(0)[0] == 'S' && words.at(lineNum).at(0)[1] == 'L' && words.at(lineNum).at(0)[2] == 'B' && words.at(lineNum).at(0)[3] == '.') return EvalExpression(unWrapVec(words.at(lineNum)), variableValues); @@ -576,7 +576,7 @@ boost::any ExecuteFunction(const string& functionName, const vector& return nullType; } -int parseSlang(string script) +int parseZSharp(string script) { script = replace(script, " ", "\t"); #if DEVELOPER_MESSAGES @@ -668,7 +668,7 @@ int parseSlang(string script) int main(int argc, char* argv[]) { // Gathers builtin functions and variables - GetBuiltins(SLBContents); + GetBuiltins(ZSContents); functionValues = builtinFunctionValues; globalVariableValues = builtinVarVals; @@ -722,7 +722,7 @@ int main(int argc, char* argv[]) } else { - LogWarning("No script provided! Please drag and drop .SLG file over interpreter executable file, or provide it's path as a command-line argument."); + LogWarning("No script provided! Please drag and drop .ZS file over interpreter executable file, or provide it's path as a command-line argument."); cout << "Press Enter to Continue"; cin.ignore(); exit(1); @@ -733,7 +733,7 @@ int main(int argc, char* argv[]) #if DEVELOPER_MESSAGES InterpreterLog("Parsing..."); #endif - parseSlang(scriptTextContents); + parseZSharp(scriptTextContents); return 0; } diff --git a/Slang/SLB.h b/ZSharp/ZS.h similarity index 78% rename from Slang/SLB.h rename to ZSharp/ZS.h index 2d710be..f49473f 100644 --- a/Slang/SLB.h +++ b/ZSharp/ZS.h @@ -2,7 +2,7 @@ using namespace std; -std::string SLBContents = R"( +std::string ZSContents = R"( // Default variables, can be overwritten // if re-initialized or changed float PI = 3.14159265358979323846264338 @@ -11,21 +11,21 @@ float EulersNumber = 2.71828183 // Trigonometric function Sin func Sin(input) { - float out = SLB.Math.Sin(input) + float out = ZS.Math.Sin(input) return out } // Trigonometric function Cos func Cos(input) { - float out = SLB.Math.Cos(input) + float out = ZS.Math.Cos(input) return out } // Trigonometric function Tan func Tan(input) { - float out = SLB.Math.Tan(input) + float out = ZS.Math.Tan(input) return out } @@ -46,21 +46,21 @@ func Tanh(input) // Rounds input to nearest integer value func Round(input) { - float out = SLB.Math.Round(input) + float out = ZS.Math.Round(input) return out } // Linearly interpolates between a and b by t func Lerp(a, b, t) { - float out = SLB.Math.Lerp(a, b, t) + float out = ZS.Math.Lerp(a, b, t) return out } // Get absolute value of x func Abs(x) { - float out = SLB.Math.Abs(x) + float out = ZS.Math.Abs(x) return out } @@ -95,46 +95,46 @@ func Clamp(input, min, max) // Sets color of pixel to RGB value func SetPixel(x, y, r, g, b) { - string out = SLB.Graphics.SetPixel(x, y, r, g, b) + string out = ZS.Graphics.SetPixel(x, y, r, g, b) return out } // Prints input value to console func Print(in) { - SLB.System.Print(in) + ZS.System.Print(in) } // Prints input value to console with appended newline '\n' func Printl(in) { - SLB.System.PrintLine(in) + ZS.System.PrintLine(in) } // Creates new sprite class func NSprite(path, x, y, r) { - Sprite s = SLB.Graphics.Sprite(path, x, y, r) + Sprite s = ZS.Graphics.Sprite(path, x, y, r) return s } // Draws sprite to window func Draw(spr) { - SLB.Graphics.Draw(spr) + ZS.Graphics.Draw(spr) } // Creates new Vector2 class func NVec2(x, y) { - Vec2 v = SLB.System.Vec2(x, y) + Vec2 v = ZS.System.Vec2(x, y) return v } // Gets if key is down func GetKey(keyName) { - bool b = SLB.Input.GetKey(keyName) + bool b = ZS.Input.GetKey(keyName) return b } )" diff --git a/Slang/Slang.rc b/ZSharp/ZSharp.rc similarity index 100% rename from Slang/Slang.rc rename to ZSharp/ZSharp.rc diff --git a/Slang/Slang.vcxproj b/ZSharp/ZSharp.vcxproj similarity index 98% rename from Slang/Slang.vcxproj rename to ZSharp/ZSharp.vcxproj index 1ac6bbc..ba42998 100644 --- a/Slang/Slang.vcxproj +++ b/ZSharp/ZSharp.vcxproj @@ -22,8 +22,9 @@ 16.0 Win32Proj {d5f150f8-1f83-41eb-a195-1b5c3ca9322a} - Slang + ZSharp 10.0 + ZSharp @@ -166,14 +167,14 @@ - + - + diff --git a/Slang/Slang.vcxproj.filters b/ZSharp/ZSharp.vcxproj.filters similarity index 95% rename from Slang/Slang.vcxproj.filters rename to ZSharp/ZSharp.vcxproj.filters index 5ddfc17..4e875d1 100644 --- a/Slang/Slang.vcxproj.filters +++ b/ZSharp/ZSharp.vcxproj.filters @@ -41,7 +41,7 @@ Source Files - + Source Files @@ -54,7 +54,7 @@ - + Resource Files diff --git a/Slang/anyops.h b/ZSharp/anyops.h similarity index 100% rename from Slang/anyops.h rename to ZSharp/anyops.h diff --git a/Slang/boost_x64_release.props b/ZSharp/boost_x64_release.props similarity index 100% rename from Slang/boost_x64_release.props rename to ZSharp/boost_x64_release.props diff --git a/Slang/builtin.h b/ZSharp/builtin.h similarity index 88% rename from Slang/builtin.h rename to ZSharp/builtin.h index d9bc11d..a729c94 100644 --- a/Slang/builtin.h +++ b/ZSharp/builtin.h @@ -73,7 +73,7 @@ int InterpreterLog(const string& logText) bt = *localtime(&timer); #endif - cout << "\x1B[34m[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] \x1B[33mSlang: \x1B[32m" << logText << "\033[0m\t\t" << endl; + cout << "\x1B[34m[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] \x1B[33mZSharp: \x1B[32m" << logText << "\033[0m\t\t" << endl; return 1; } @@ -98,7 +98,7 @@ int LogCriticalError(const string& errorText) bt = *localtime(&timer); #endif - cerr << "\x1B[34m[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] \x1B[33mSlang: \x1B[31mERROR: " << errorText << "\033[0m\t\t" << endl; + cerr << "\x1B[34m[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] \x1B[33mZSharp: \x1B[31mERROR: " << errorText << "\033[0m\t\t" << endl; exit(EXIT_FAILURE); return 2; } @@ -255,62 +255,62 @@ int GetBuiltins(std::string s) } // Executes -boost::any SLBFunction(const string& name, const vector& args) +boost::any ZSFunction(const string& name, const vector& args) { - if (name == "SLB.Math.Sin") + if (name == "ZS.Math.Sin") return sin(AnyAsFloat(args.at(0))); - else if (name == "SLB.Math.Cos") + else if (name == "ZS.Math.Cos") return cos(AnyAsFloat(args.at(0))); - else if (name == "SLB.Math.Tan") + else if (name == "ZS.Math.Tan") return tan(AnyAsFloat(args.at(0))); - else if (name == "SLB.Math.Round") + else if (name == "ZS.Math.Round") return AnyAsInt(args.at(0)); - else if (name == "SLB.Math.Lerp") + else if (name == "ZS.Math.Lerp") return lerp(AnyAsFloat(args.at(0)), AnyAsFloat(args.at(1)), AnyAsFloat(args.at(2))); - else if (name == "SLB.Math.Abs") + else if (name == "ZS.Math.Abs") return abs(AnyAsFloat(args.at(0))); - else if (name == "SLB.Graphics.Init") + else if (name == "ZS.Graphics.Init") { #if DEVELOPER_MESSAGES == true InterpreterLog("Init graphics"); #endif initGraphics(StringRaw(AnyAsString(args.at(0))), AnyAsInt(args.at(1)), AnyAsInt(args.at(2))); } - else if (name == "SLB.Graphics.Sprite") + else if (name == "ZS.Graphics.Sprite") { Sprite s(StringRaw(AnyAsString(args.at(0))), any_cast(args.at(1)), any_cast(args.at(2)), AnyAsFloat(args.at(3))); return s; } - else if (name == "SLB.Graphics.Draw") + else if (name == "ZS.Graphics.Draw") any_cast(args.at(0)).Draw(); - else if (name == "SLB.Graphics.Load") + else if (name == "ZS.Graphics.Load") any_cast(args.at(0)).Load(); - else if (name == "SLB.Graphics.Text") + else if (name == "ZS.Graphics.Text") { Text t(StringRaw(AnyAsString(args.at(0))), StringRaw(AnyAsString(args.at(1))), any_cast(args.at(2)), AnyAsFloat(args.at(3)), AnyAsFloat(args.at(4)), (Uint8)AnyAsFloat(args.at(5)), (Uint8)AnyAsFloat(args.at(6)), (Uint8)AnyAsFloat(args.at(7))); return t; } - else if (name == "SLB.Graphics.DrawText") + else if (name == "ZS.Graphics.DrawText") any_cast(args.at(0)).Draw(); - else if (name == "SLB.Graphics.LoadText") + else if (name == "ZS.Graphics.LoadText") any_cast(args.at(0)).Load(); - else if (name == "SLB.Physics.AxisAlignedCollision") + else if (name == "ZS.Physics.AxisAlignedCollision") { return AxisAlignedCollision(any_cast(args.at(0)), any_cast(args.at(1))); } - else if (name == "SLB.Input.GetKey") + else if (name == "ZS.Input.GetKey") return KEYS[StringRaw(any_cast(args.at(0)))] == 1; - else if (name == "SLB.System.Print") + else if (name == "ZS.System.Print") cout << StringRaw(AnyAsString(args.at(0))); - else if (name == "SLB.System.PrintLine") + else if (name == "ZS.System.PrintLine") cout << StringRaw(AnyAsString(args.at(0))) << endl; - else if (name == "SLB.System.Vec2") + else if (name == "ZS.System.Vec2") { Vec2 v(AnyAsFloat(args.at(0)), AnyAsFloat(args.at(1))); return v; } else - LogWarning("SLB function \'" + name + "\' does not exist."); + LogWarning("ZS function \'" + name + "\' does not exist."); return nullType; } diff --git a/Slang/eval.cpp b/ZSharp/eval.cpp similarity index 98% rename from Slang/eval.cpp rename to ZSharp/eval.cpp index dbed254..7dc7c50 100644 --- a/Slang/eval.cpp +++ b/ZSharp/eval.cpp @@ -1,4 +1,4 @@ -// SLB program to evaluate a given expression +// ZS program to evaluate a given expression #include #include #include diff --git a/Slang/eval.h b/ZSharp/eval.h similarity index 100% rename from Slang/eval.h rename to ZSharp/eval.h diff --git a/Slang/graphics.h b/ZSharp/graphics.h similarity index 100% rename from Slang/graphics.h rename to ZSharp/graphics.h diff --git a/Slang/icon.ico b/ZSharp/icon.ico similarity index 100% rename from Slang/icon.ico rename to ZSharp/icon.ico diff --git a/Slang/linux-build/CMakeCache.txt b/ZSharp/linux-build/CMakeCache.txt similarity index 100% rename from Slang/linux-build/CMakeCache.txt rename to ZSharp/linux-build/CMakeCache.txt diff --git a/Slang/linux-build/CMakeFiles/3.16.3/CMakeCCompiler.cmake b/ZSharp/linux-build/CMakeFiles/3.16.3/CMakeCCompiler.cmake similarity index 100% rename from Slang/linux-build/CMakeFiles/3.16.3/CMakeCCompiler.cmake rename to ZSharp/linux-build/CMakeFiles/3.16.3/CMakeCCompiler.cmake diff --git a/Slang/linux-build/CMakeFiles/3.16.3/CMakeCXXCompiler.cmake b/ZSharp/linux-build/CMakeFiles/3.16.3/CMakeCXXCompiler.cmake similarity index 100% rename from Slang/linux-build/CMakeFiles/3.16.3/CMakeCXXCompiler.cmake rename to ZSharp/linux-build/CMakeFiles/3.16.3/CMakeCXXCompiler.cmake diff --git a/Slang/linux-build/CMakeFiles/3.16.3/CMakeDetermineCompilerABI_C.bin b/ZSharp/linux-build/CMakeFiles/3.16.3/CMakeDetermineCompilerABI_C.bin old mode 100755 new mode 100644 similarity index 100% rename from Slang/linux-build/CMakeFiles/3.16.3/CMakeDetermineCompilerABI_C.bin rename to ZSharp/linux-build/CMakeFiles/3.16.3/CMakeDetermineCompilerABI_C.bin diff --git a/Slang/linux-build/CMakeFiles/3.16.3/CMakeDetermineCompilerABI_CXX.bin b/ZSharp/linux-build/CMakeFiles/3.16.3/CMakeDetermineCompilerABI_CXX.bin old mode 100755 new mode 100644 similarity index 100% rename from Slang/linux-build/CMakeFiles/3.16.3/CMakeDetermineCompilerABI_CXX.bin rename to ZSharp/linux-build/CMakeFiles/3.16.3/CMakeDetermineCompilerABI_CXX.bin diff --git a/Slang/linux-build/CMakeFiles/3.16.3/CMakeSystem.cmake b/ZSharp/linux-build/CMakeFiles/3.16.3/CMakeSystem.cmake similarity index 100% rename from Slang/linux-build/CMakeFiles/3.16.3/CMakeSystem.cmake rename to ZSharp/linux-build/CMakeFiles/3.16.3/CMakeSystem.cmake diff --git a/Slang/linux-build/CMakeFiles/3.16.3/CompilerIdC/CMakeCCompilerId.c b/ZSharp/linux-build/CMakeFiles/3.16.3/CompilerIdC/CMakeCCompilerId.c similarity index 100% rename from Slang/linux-build/CMakeFiles/3.16.3/CompilerIdC/CMakeCCompilerId.c rename to ZSharp/linux-build/CMakeFiles/3.16.3/CompilerIdC/CMakeCCompilerId.c diff --git a/Slang/linux-build/CMakeFiles/3.16.3/CompilerIdC/a.out b/ZSharp/linux-build/CMakeFiles/3.16.3/CompilerIdC/a.out old mode 100755 new mode 100644 similarity index 100% rename from Slang/linux-build/CMakeFiles/3.16.3/CompilerIdC/a.out rename to ZSharp/linux-build/CMakeFiles/3.16.3/CompilerIdC/a.out diff --git a/Slang/linux-build/CMakeFiles/3.16.3/CompilerIdCXX/CMakeCXXCompilerId.cpp b/ZSharp/linux-build/CMakeFiles/3.16.3/CompilerIdCXX/CMakeCXXCompilerId.cpp similarity index 100% rename from Slang/linux-build/CMakeFiles/3.16.3/CompilerIdCXX/CMakeCXXCompilerId.cpp rename to ZSharp/linux-build/CMakeFiles/3.16.3/CompilerIdCXX/CMakeCXXCompilerId.cpp diff --git a/Slang/linux-build/CMakeFiles/3.16.3/CompilerIdCXX/a.out b/ZSharp/linux-build/CMakeFiles/3.16.3/CompilerIdCXX/a.out old mode 100755 new mode 100644 similarity index 100% rename from Slang/linux-build/CMakeFiles/3.16.3/CompilerIdCXX/a.out rename to ZSharp/linux-build/CMakeFiles/3.16.3/CompilerIdCXX/a.out diff --git a/Slang/linux-build/CMakeFiles/CMakeDirectoryInformation.cmake b/ZSharp/linux-build/CMakeFiles/CMakeDirectoryInformation.cmake similarity index 100% rename from Slang/linux-build/CMakeFiles/CMakeDirectoryInformation.cmake rename to ZSharp/linux-build/CMakeFiles/CMakeDirectoryInformation.cmake diff --git a/Slang/linux-build/CMakeFiles/Makefile.cmake b/ZSharp/linux-build/CMakeFiles/Makefile.cmake similarity index 100% rename from Slang/linux-build/CMakeFiles/Makefile.cmake rename to ZSharp/linux-build/CMakeFiles/Makefile.cmake diff --git a/Slang/linux-build/CMakeFiles/Makefile2 b/ZSharp/linux-build/CMakeFiles/Makefile2 similarity index 100% rename from Slang/linux-build/CMakeFiles/Makefile2 rename to ZSharp/linux-build/CMakeFiles/Makefile2 diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/CXX.includecache b/ZSharp/linux-build/CMakeFiles/Slang.dir/CXX.includecache similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/CXX.includecache rename to ZSharp/linux-build/CMakeFiles/Slang.dir/CXX.includecache diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/DependInfo.cmake b/ZSharp/linux-build/CMakeFiles/Slang.dir/DependInfo.cmake similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/DependInfo.cmake rename to ZSharp/linux-build/CMakeFiles/Slang.dir/DependInfo.cmake diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/Main.cpp.o b/ZSharp/linux-build/CMakeFiles/Slang.dir/Main.cpp.o similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/Main.cpp.o rename to ZSharp/linux-build/CMakeFiles/Slang.dir/Main.cpp.o diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/build.make b/ZSharp/linux-build/CMakeFiles/Slang.dir/build.make similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/build.make rename to ZSharp/linux-build/CMakeFiles/Slang.dir/build.make diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/cmake_clean.cmake b/ZSharp/linux-build/CMakeFiles/Slang.dir/cmake_clean.cmake similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/cmake_clean.cmake rename to ZSharp/linux-build/CMakeFiles/Slang.dir/cmake_clean.cmake diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/depend.internal b/ZSharp/linux-build/CMakeFiles/Slang.dir/depend.internal similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/depend.internal rename to ZSharp/linux-build/CMakeFiles/Slang.dir/depend.internal diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/depend.make b/ZSharp/linux-build/CMakeFiles/Slang.dir/depend.make similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/depend.make rename to ZSharp/linux-build/CMakeFiles/Slang.dir/depend.make diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/eval.cpp.o b/ZSharp/linux-build/CMakeFiles/Slang.dir/eval.cpp.o similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/eval.cpp.o rename to ZSharp/linux-build/CMakeFiles/Slang.dir/eval.cpp.o diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/flags.make b/ZSharp/linux-build/CMakeFiles/Slang.dir/flags.make similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/flags.make rename to ZSharp/linux-build/CMakeFiles/Slang.dir/flags.make diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/link.txt b/ZSharp/linux-build/CMakeFiles/Slang.dir/link.txt similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/link.txt rename to ZSharp/linux-build/CMakeFiles/Slang.dir/link.txt diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/progress.make b/ZSharp/linux-build/CMakeFiles/Slang.dir/progress.make similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/progress.make rename to ZSharp/linux-build/CMakeFiles/Slang.dir/progress.make diff --git a/Slang/linux-build/CMakeFiles/Slang.dir/strops.cpp.o b/ZSharp/linux-build/CMakeFiles/Slang.dir/strops.cpp.o similarity index 100% rename from Slang/linux-build/CMakeFiles/Slang.dir/strops.cpp.o rename to ZSharp/linux-build/CMakeFiles/Slang.dir/strops.cpp.o diff --git a/Slang/linux-build/CMakeFiles/TargetDirectories.txt b/ZSharp/linux-build/CMakeFiles/TargetDirectories.txt similarity index 100% rename from Slang/linux-build/CMakeFiles/TargetDirectories.txt rename to ZSharp/linux-build/CMakeFiles/TargetDirectories.txt diff --git a/Slang/linux-build/CMakeFiles/cmake.check_cache b/ZSharp/linux-build/CMakeFiles/cmake.check_cache similarity index 100% rename from Slang/linux-build/CMakeFiles/cmake.check_cache rename to ZSharp/linux-build/CMakeFiles/cmake.check_cache diff --git a/Slang/linux-build/CMakeFiles/progress.marks b/ZSharp/linux-build/CMakeFiles/progress.marks similarity index 100% rename from Slang/linux-build/CMakeFiles/progress.marks rename to ZSharp/linux-build/CMakeFiles/progress.marks diff --git a/Slang/linux-build/Makefile b/ZSharp/linux-build/Makefile similarity index 100% rename from Slang/linux-build/Makefile rename to ZSharp/linux-build/Makefile diff --git a/Slang/linux-build/Slang-Linux b/ZSharp/linux-build/Slang-Linux similarity index 100% rename from Slang/linux-build/Slang-Linux rename to ZSharp/linux-build/Slang-Linux diff --git a/Slang/linux-build/cmake_install.cmake b/ZSharp/linux-build/cmake_install.cmake similarity index 100% rename from Slang/linux-build/cmake_install.cmake rename to ZSharp/linux-build/cmake_install.cmake diff --git a/Slang/main.h b/ZSharp/main.h similarity index 100% rename from Slang/main.h rename to ZSharp/main.h diff --git a/Slang/resource.h b/ZSharp/resource.h similarity index 95% rename from Slang/resource.h rename to ZSharp/resource.h index b53c88e..fd0cdb8 100644 --- a/Slang/resource.h +++ b/ZSharp/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by Slang.rc +// Used by ZSharp.rc // #define IDI_ICON1 101 diff --git a/Slang/strops.cpp b/ZSharp/strops.cpp similarity index 100% rename from Slang/strops.cpp rename to ZSharp/strops.cpp diff --git a/Slang/strops.h b/ZSharp/strops.h similarity index 100% rename from Slang/strops.h rename to ZSharp/strops.h diff --git a/examples/Pong-Example-Project/script.slg b/examples/Pong-Example-Project/script.zs similarity index 100% rename from examples/Pong-Example-Project/script.slg rename to examples/Pong-Example-Project/script.zs