diff --git a/README.md b/README.md index 1d9be939..2b0ef43c 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,7 @@ Supported Features: * auto variables, parameters and return types * for range loop * constexpr compile time evaluation +* parameter packs and templates ## Installation and Usage @@ -558,6 +559,13 @@ This sample fills a single screen column with a given color, by generating 25 as This sample initially assigns the value 0 to the pre processor macro ry and increments it each time the loop body is replicated. The loop generates 25 copies of the body, each with a different value for ry. +A simpler loop with only a single line template expansion is provided with the #for(iterator, count) preprocessor command: + + char * const ScreenRows2[] = { + #for(i,SCREEN_HEIGHT) Screen + SCREEN_WIDTH * i, + }; + + ### Linker control diff --git a/oscar64/oscar64.cpp b/oscar64/oscar64.cpp index 2653d136..cb0e4db3 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.25.218"); + strcpy(strProductVersion, "1.26.219"); #ifdef __APPLE__ uint32_t length = sizeof(basePath); diff --git a/oscar64/oscar64.rc b/oscar64/oscar64.rc index 1fbb7d20..bd4392e1 100644 --- a/oscar64/oscar64.rc +++ b/oscar64/oscar64.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,25,218,0 - PRODUCTVERSION 1,25,218,0 + FILEVERSION 1,26,219,0 + PRODUCTVERSION 1,26,219,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,12 +43,12 @@ BEGIN BEGIN VALUE "CompanyName", "oscar64" VALUE "FileDescription", "oscar64 compiler" - VALUE "FileVersion", "1.25.218.0" + VALUE "FileVersion", "1.26.219.0" VALUE "InternalName", "oscar64.exe" VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "oscar64.exe" VALUE "ProductName", "oscar64" - VALUE "ProductVersion", "1.25.218.0" + VALUE "ProductVersion", "1.26.219.0" END END BLOCK "VarFileInfo" diff --git a/oscar64setup/oscar64setup.vdproj b/oscar64setup/oscar64setup.vdproj index 3e511e26..abcda9f3 100644 --- a/oscar64setup/oscar64setup.vdproj +++ b/oscar64setup/oscar64setup.vdproj @@ -244,12 +244,6 @@ } "Entry" { - "MsmKey" = "8:_32B099B0E98B47D0892700BA42D0760E" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_33E047EAEFFB45778C59472F157161DA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1006,6 +1000,12 @@ } "Entry" { + "MsmKey" = "8:_D38EB85FE8E3492DA4BD8E6E4F7CEBEB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_D52B954DFBCE4EB0932433DE7FCE9090" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2073,26 +2073,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_32B099B0E98B47D0892700BA42D0760E" - { - "SourcePath" = "8:..\\include\\opp\\move.h" - "TargetName" = "8:move.h" - "Tag" = "8:" - "Folder" = "8:_D76A1802AFD04C48A519C9F8700E53CC" - "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}:_33E047EAEFFB45778C59472F157161DA" { "SourcePath" = "8:..\\include\\c64\\iecbus.h" @@ -4613,6 +4593,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D38EB85FE8E3492DA4BD8E6E4F7CEBEB" + { + "SourcePath" = "8:..\\include\\opp\\utility.h" + "TargetName" = "8:utility.h" + "Tag" = "8:" + "Folder" = "8:_D76A1802AFD04C48A519C9F8700E53CC" + "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}:_D52B954DFBCE4EB0932433DE7FCE9090" { "SourcePath" = "8:..\\samples\\hiresmc\\paint.c" @@ -5686,15 +5686,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:oscar64" - "ProductCode" = "8:{041674C8-9934-4E51-B424-DA00BD3E2C89}" - "PackageCode" = "8:{7F8F7803-BF9B-423B-AD7F-ABAFD9B5DC8F}" + "ProductCode" = "8:{CBCAE13D-B17A-44B2-8FC3-38EE53B02C31}" + "PackageCode" = "8:{75E5F5B4-AE17-4214-ADB6-18D9177E8E1B}" "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.25.218" + "ProductVersion" = "8:1.26.219" "Manufacturer" = "8:oscar64" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:"