Skip to content

Commit 915733f

Browse files
peteroupcpeteroupc
committed
code fixes
1 parent 563b450 commit 915733f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2848
-2767
lines changed

‎Numbers.sln

-5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test20", "Test20\Test20.csp
4242
EndProject
4343
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test40", "Test40\Test40.csproj", "{00EB31B6-A805-4EFB-A64B-9F8176B2A1CC}"
4444
EndProject
45-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrimProgram", "TrimProgram\TrimProgram.csproj", "{2737f981-8aaf-414d-aaaf-56d7804bfcce}"
4645
EndProject
4746
Global
4847
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -74,10 +73,6 @@ Global
7473
{00EB31B6-A805-4EFB-A64B-9F8176B2A1CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
7574
{00EB31B6-A805-4EFB-A64B-9F8176B2A1CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
7675
{00EB31B6-A805-4EFB-A64B-9F8176B2A1CC}.Release|Any CPU.Build.0 = Release|Any CPU
77-
{2737f981-8aaf-414d-aaaf-56d7804bfcce}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78-
{2737f981-8aaf-414d-aaaf-56d7804bfcce}.Debug|Any CPU.Build.0 = Debug|Any CPU
79-
{2737f981-8aaf-414d-aaaf-56d7804bfcce}.Release|Any CPU.ActiveCfg = Release|Any CPU
80-
{2737f981-8aaf-414d-aaaf-56d7804bfcce}.Release|Any CPU.Build.0 = Release|Any CPU
8176
EndGlobalSection
8277
GlobalSection(SolutionProperties) = preSolution
8378
HideSolutionNode = FALSE

‎Numbers/Numbers.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk='Microsoft.NET.Sdk'>
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0; net9.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0; net6.0</TargetFrameworks>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<Version>1.9</Version>
@@ -47,7 +47,7 @@ Version 1.8
4747
<PropertyGroup Condition=' &apos;$(Configuration)&apos;==&apos;Release&apos; '>
4848
<DebugType>none</DebugType>
4949
<DocumentationFile>bin\Release\netstandard2.0\Numbers.xml</DocumentationFile>
50-
<AssemblyOriginatorKeyFile>PeterO.snk</AssemblyOriginatorKeyFile>
50+
<PublicSign>true</PublicSign><AssemblyOriginatorKeyFile>PeterO.snk</AssemblyOriginatorKeyFile>
5151
<CodeAnalysisRuleSet>rules.ruleset</CodeAnalysisRuleSet></PropertyGroup>
5252

5353
<ItemGroup>
@@ -56,4 +56,4 @@ Version 1.8
5656
<PrivateAssets>all</PrivateAssets>
5757
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5858
</PackageReference>
59-
<AdditionalFiles Include='stylecop.json'/><AdditionalFiles Include='rules.ruleset'/><PackageReference Include='StyleCop.Analyzers' PrivateAssets='All' Version='1.2.0-beta.354'/><!-- PackageReference Include='Microsoft.CodeAnalysis.NetAnalyzers' PrivateAssets='All' Version='9.0.0-preview.24454.1' --></ItemGroup></Project>
59+
<AdditionalFiles Include='stylecop.json'/><AdditionalFiles Include='rules.ruleset'/><PackageReference Include='StyleCop.Analyzers' PrivateAssets='All' Version='1.2.0-beta.354'/><PackageReference Include='Microsoft.CodeAnalysis.NetAnalyzers' PrivateAssets='All' Version='9.0.0-preview.24454.1'/></ItemGroup></Project>

‎Numbers/PeterO/DebugUtility.cs

+14-14
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Any copyright to this work is released to the Public Domain.
99
using System.Diagnostics.CodeAnalysis;
1010
using System.Reflection;
1111
// Use directives rather than the Conditional attribute,
12-
// to avoid the chance of logging statements leaking in release builds
12+
// to avoid the chance of logging statements leaking in release builds
1313
#if DEBUGLOG
1414
namespace PeterO {
1515
internal static class DebugUtility {
@@ -29,13 +29,13 @@ private static MethodInfo GetTypeMethod(
2929
Type t,
3030
string name,
3131
Type[] parameters) {
32-
#if NET40 || NET20
33-
return t.GetMethod(name, new[] { parameter });
34-
#else
35-
{
32+
#if NET40 || NET20
33+
return t.GetMethod(name, new[] { parameter });
34+
#else
35+
{
3636
return t?.GetRuntimeMethod(name, parameters);
3737
}
38-
#endif
38+
#endif
3939
}
4040

4141
// [RequiresUnreferencedCode("Do not use in AOT or reflection-free
@@ -48,20 +48,20 @@ public static void Log(string str) {
4848
wr = writer;
4949
}
5050
if (wr != null) {
51-
#if !NET20 && !NET40
51+
#if !NET20 && !NET40
5252
System.Diagnostics.Debug.WriteLine(str);
53-
#endif
53+
#endif
5454
wr(str);
5555
return;
5656
} else {
57-
#if !NET20 && !NET40
57+
#if !NET20 && !NET40
5858
System.Diagnostics.Debug.WriteLine(str);
5959
return;
60-
#else
61-
{
62-
throw new NotSupportedException("System.Console not found");
63-
}
64-
#endif
60+
#else
61+
{
62+
throw new NotSupportedException("System.Console not found");
63+
}
64+
#endif
6565
}
6666
}
6767
Type[] types = new[] { typeof(string) };

‎Numbers/PeterO/Numbers/BitShiftAccumulator.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public FastInteger GetDigitLength() {
3939
}
4040

4141
public FastInteger OverestimateDigitLength() {
42-
return this.GetDigitLength();
42+
return this.GetDigitLength();
4343
}
4444

4545
private static void VerifyKnownLength() {
@@ -55,7 +55,7 @@ public void ShiftToDigits(
5555
}
5656
if (preShift != null && preShift.Sign > 0) {
5757
this.knownBitLength = this.knownBitLength ?? this.CalcKnownBitLength();
58-
// DebugUtility.Log("bits=" + bits + " pre=" + preShift + " known=" +
58+
// Console.WriteLine("bits=" + bits + " pre=" + preShift + " known=" +
5959
// (//kbl) + " [" + this.shiftedBigInt + "]");
6060
if (this.knownBitLength.CompareTo(bits) <= 0) {
6161
// Known digit length is already small enough
@@ -67,7 +67,7 @@ public void ShiftToDigits(
6767
} else {
6868
FastInteger bitDiff = this.knownBitLength.Copy()
6969
.Subtract(bits);
70-
// DebugUtility.Log("bitDiff=" + bitDiff);
70+
// Console.WriteLine("bitDiff=" + bitDiff);
7171
int cmp = bitDiff.CompareTo(preShift);
7272
if (cmp <= 0) {
7373
// NOTE: For BitShiftAccumulator, truncating and shifting
@@ -123,7 +123,7 @@ public FastInteger ShiftedIntFast
123123
public int ShiftedIntMod(int mod) {
124124
if (mod < 1) {
125125
throw new ArgumentException("mod (" + mod +
126-
") is not greater or equal to 1");
126+
") is not greater or equal to 1");
127127
}
128128
switch (mod) {
129129
case 1:
@@ -263,7 +263,7 @@ private void ShiftRightBig(int bits) {
263263
// the last one is set
264264
this.bitsAfterLeftmost |= 1;
265265
this.bitLeftmost = this.shiftedBigInt.GetSignedBit(bs - 1) ? 1 :
266-
0;
266+
0;
267267
} else if (lowestSetBit.CompareTo(bs - 1) > 0) {
268268
// Means all discarded bits are zero
269269
this.bitLeftmost = 0;
@@ -277,7 +277,7 @@ private void ShiftRightBig(int bits) {
277277
// the last one is set
278278
this.bitsAfterLeftmost |= 1;
279279
this.bitLeftmost = this.shiftedBigInt.GetSignedBit(bs - 1) ? 1 :
280-
0;
280+
0;
281281
} else if (lowestSet > bs - 1) {
282282
// Means all discarded bits are zero
283283
this.bitLeftmost = 0;
@@ -314,12 +314,12 @@ private FastInteger CalcKnownBitLength() {
314314
return new FastInteger(kb);
315315
}
316316
if (this.shiftedBigInt.IsZero) {
317-
{ return new FastInteger(1);
317+
{ return new FastInteger(1);
318+
}
318319
}
319-
}
320320
long sbe = this.shiftedBigInt.GetSignedBitLengthAsInt64();
321321
return (sbe < Int32.MaxValue) ? new FastInteger((int)sbe) :
322-
FastInteger.FromBig(this.shiftedBigInt.GetSignedBitLengthAsEInteger());
322+
FastInteger.FromBig(this.shiftedBigInt.GetSignedBitLengthAsEInteger());
323323
}
324324

325325
private void ShiftBigToBits(int bits) {
@@ -368,7 +368,7 @@ private void ShiftBigToBits(int bits) {
368368
// the last one is set
369369
this.bitsAfterLeftmost |= 1;
370370
this.bitLeftmost = this.shiftedBigInt.GetSignedBit(bs - 1) ? 1 :
371-
0;
371+
0;
372372
} else if (lowestSetBit.CompareTo(bs - 1) > 0) {
373373
// Means all discarded bits are zero
374374
this.bitLeftmost = 0;
@@ -382,7 +382,7 @@ private void ShiftBigToBits(int bits) {
382382
// the last one is set
383383
this.bitsAfterLeftmost |= 1;
384384
this.bitLeftmost = this.shiftedBigInt.GetSignedBit(bs - 1) ? 1 :
385-
0;
385+
0;
386386
} else if (lowestSet > bs - 1) {
387387
// Means all discarded bits are zero
388388
this.bitLeftmost = 0;
@@ -441,7 +441,7 @@ private void ShiftRightSmall(int bits) {
441441
this.bitsAfterLeftmost |= this.bitLeftmost;
442442
// Get the bottommost shift minus 1 bits
443443
this.bitsAfterLeftmost |= (shift > 1 && (this.shiftedSmall <<
444-
(SmallBitLength - shift + 1)) != 0) ? 1 : 0;
444+
(SmallBitLength - shift + 1)) != 0) ? 1 : 0;
445445
// Get the bit just above that bit
446446
this.bitLeftmost = (int)((this.shiftedSmall >> (shift - 1)) & 0x01);
447447
this.shiftedSmall >>= shift;
@@ -483,7 +483,7 @@ private void ShiftSmallToBits(int bits) {
483483
this.bitsAfterLeftmost |= this.bitLeftmost;
484484
// Get the bottommost shift minus 1 bits
485485
this.bitsAfterLeftmost |= (shift > 1 && (this.shiftedSmall <<
486-
(SmallBitLength - shift + 1)) != 0) ? 1 : 0;
486+
(SmallBitLength - shift + 1)) != 0) ? 1 : 0;
487487
// Get the bit just above that bit
488488
this.bitLeftmost = (int)((this.shiftedSmall >> (shift - 1)) & 0x01);
489489
this.bitsAfterLeftmost = (this.bitsAfterLeftmost != 0) ? 1 : 0;

0 commit comments

Comments
 (0)