From 4e6769d81c795862ffd61a36ae1aa87c91b042f9 Mon Sep 17 00:00:00 2001
From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com>
Date: Mon, 2 Oct 2023 18:43:58 +0200
Subject: [PATCH] Add <new> header file

---
 include/new                      | 11 +++++++++++
 include/opp/vector.h             |  1 +
 oscar64/Scanner.cpp              |  7 +++++++
 oscar64/oscar64.cpp              |  2 +-
 oscar64/oscar64.rc               |  8 ++++----
 oscar64setup/oscar64setup.vdproj | 32 +++++++++++++++++++++++++++++---
 6 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 include/new

diff --git a/include/new b/include/new
new file mode 100644
index 00000000..24cda012
--- /dev/null
+++ b/include/new
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "stddef.h"
+
+namespace std
+{
+	
+	void * operator new(size_t size);
+	void * operator new(void * ptr, size_t size);
+
+}
diff --git a/include/opp/vector.h b/include/opp/vector.h
index f1fa8dda..57f07d87 100644
--- a/include/opp/vector.h
+++ b/include/opp/vector.h
@@ -1,6 +1,7 @@
 #ifndef OPP_VECTOR_H
 #define OPP_VECTOR_H
 
+#include <new>
 #include <stdlib.h>
 #include <opp/utility.h>
 
diff --git a/oscar64/Scanner.cpp b/oscar64/Scanner.cpp
index 472c04e9..53938078 100644
--- a/oscar64/Scanner.cpp
+++ b/oscar64/Scanner.cpp
@@ -1722,6 +1722,13 @@ void Scanner::NextRawToken(void)
 						mTokenIdent = Ident::Unique("operator->");
 						break;
 
+					case TK_NEW:
+						mTokenIdent = Ident::Unique("operator-new");
+						break;
+					case TK_DELETE:
+						mTokenIdent = Ident::Unique("operator-delete");
+						break;
+
 					default:
 						// dirty little hack to implement token preview, got to fix
 						// this with an infinit preview sequence at one point
diff --git a/oscar64/oscar64.cpp b/oscar64/oscar64.cpp
index 5c3d4052..b64e26d9 100644
--- a/oscar64/oscar64.cpp
+++ b/oscar64/oscar64.cpp
@@ -74,7 +74,7 @@ int main2(int argc, const char** argv)
 
 #else
 		strcpy(strProductName, "oscar64");
-		strcpy(strProductVersion, "1.26.220");
+		strcpy(strProductVersion, "1.26.221");
 
 #ifdef __APPLE__
 		uint32_t length = sizeof(basePath);
diff --git a/oscar64/oscar64.rc b/oscar64/oscar64.rc
index 8363333f..c3ab1c50 100644
--- a/oscar64/oscar64.rc
+++ b/oscar64/oscar64.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,26,220,0
- PRODUCTVERSION 1,26,220,0
+ FILEVERSION 1,26,221,0
+ PRODUCTVERSION 1,26,221,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,12 +43,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "oscar64"
             VALUE "FileDescription", "oscar64 compiler"
-            VALUE "FileVersion", "1.26.220.0"
+            VALUE "FileVersion", "1.26.221.0"
             VALUE "InternalName", "oscar64.exe"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "oscar64.exe"
             VALUE "ProductName", "oscar64"
-            VALUE "ProductVersion", "1.26.220.0"
+            VALUE "ProductVersion", "1.26.221.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/oscar64setup/oscar64setup.vdproj b/oscar64setup/oscar64setup.vdproj
index 843e433e..a772017b 100644
--- a/oscar64setup/oscar64setup.vdproj
+++ b/oscar64setup/oscar64setup.vdproj
@@ -202,6 +202,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_26E38AB4F85C4C9DB284803C4A3473F3"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_29ED5D9B606D45DA80CFF329A7643DC8"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -1933,6 +1939,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_26E38AB4F85C4C9DB284803C4A3473F3"
+            {
+            "SourcePath" = "8:..\\include\\new"
+            "TargetName" = "8:new"
+            "Tag" = "8:"
+            "Folder" = "8:_7C0D28C244F14A21B5F72213BBE59B6F"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29ED5D9B606D45DA80CFF329A7643DC8"
             {
             "SourcePath" = "8:..\\samples\\kernalio\\diskdir.c"
@@ -5686,15 +5712,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:oscar64"
-        "ProductCode" = "8:{532AC6ED-3D25-48DC-91FD-DBE96AF0026F}"
-        "PackageCode" = "8:{9C57F5C1-1D7C-4915-8DD9-DFE81E950DCA}"
+        "ProductCode" = "8:{76114EBF-11A9-4AB2-9F9C-04180A284C4B}"
+        "PackageCode" = "8:{A38D2D44-B7EB-49A4-ACA8-8974DC5EB905}"
         "UpgradeCode" = "8:{9AB61EFF-ACAC-4079-9950-8D96615CD4EF}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.26.220"
+        "ProductVersion" = "8:1.26.221"
         "Manufacturer" = "8:oscar64"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"