Cleaning up naming

This commit is contained in:
Jordan Wages 2025-08-20 20:32:13 -05:00
commit 9b74c03a9d
22 changed files with 61 additions and 67 deletions

View file

@ -2,17 +2,17 @@
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>CsMic</RootNamespace>
<RootNamespace>CSMic</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<AssemblyName>CsMic.Core</AssemblyName>
<AssemblyName>CSMic.Core</AssemblyName>
<Version>2.0.0-beta-01</Version>
<PackageId>CsMic</PackageId>
<PackageId>CSMic</PackageId>
</PropertyGroup>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="dotnet tool run coco -namespace CsMic.Interpreter -frames $(ProjectDir)cocor $(ProjectDir)cocor/Interpreter.atg" />
<Exec Command="dotnet tool run coco -namespace CSMic.Interpreter -frames $(ProjectDir)CocoR $(ProjectDir)CocoR/Interpreter.atg" />
</Target>
<Import Project="NuGetPublish.targets" Condition="Exists('NuGetPublish.targets')" />

View file

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CsMic
namespace CSMic
{
public class FunctionArgument
{

View file

@ -1,11 +1,11 @@
using CsMic;
using CSMic;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CsMic
namespace CSMic
{
public class FunctionValue
{

View file

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CsMic
namespace CSMic
{
public enum FunctionValueType
{

View file

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CsMic
namespace CSMic
{
public interface ICodedFunction
{

View file

@ -2,7 +2,7 @@
using System.Text;
using System.IO;
namespace CsMic
namespace CSMic
{
public class InputInterpreter
{
@ -122,8 +122,8 @@ namespace CsMic
// Create a child interpreter sharing stores, so ProduceOutput doesn't affect parent state
var child = new InputInterpreter(this);
using var ms = new MemoryStream(Encoding.UTF8.GetBytes(expressionText));
var scanner = new CsMic.Interpreter.Scanner(ms);
var parser = new CsMic.Interpreter.Parser(scanner)
var scanner = new CSMic.Interpreter.Scanner(ms);
var parser = new CSMic.Interpreter.Parser(scanner)
{
Interpreter = child
};
@ -138,8 +138,8 @@ namespace CsMic
try
{
using var ms = new MemoryStream(Encoding.UTF8.GetBytes(input ?? string.Empty));
var scanner = new CsMic.Interpreter.Scanner(ms);
var parser = new CsMic.Interpreter.Parser(scanner)
var scanner = new CSMic.Interpreter.Scanner(ms);
var parser = new CSMic.Interpreter.Parser(scanner)
{
Interpreter = this
};

View file

@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Placeholder target file for NuGet publishing -->
<Target Name="PublishNuGet" AfterTargets="Pack">
<Exec Command="dotnet nuget push --source wagenet-git bin\Release\CsMic.$(Version).nupkg" />
<Exec Command="dotnet nuget push --source wagenet-git bin\Release\CSMic.$(Version).nupkg" />
</Target>
</Project>

View file

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CsMic
namespace CSMic
{
public class Variable
{

View file

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CsMic
namespace CSMic
{
public enum VariableType
{

View file

@ -2,7 +2,7 @@
using System.Globalization;
using System.Text;
using System.Collections.Generic;
using CsMic;
using CSMic;
COMPILER INTERPRETER

View file

@ -1,37 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.12.35707.178
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsMic.Core", "Core\CsMic.Core.csproj", "{5387FF55-3044-4EB4-BB90-AD2E922131C1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6394EDF0-24F7-4B75-B4CE-E5F884EE88AC}"
ProjectSection(SolutionItems) = preProject
setup.ps1 = setup.ps1
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsMic.Tests", "Tests\CsMic.Tests.csproj", "{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSMic.Core", "Core\CSMic.Core.csproj", "{4DAA770D-1624-48D7-8D92-2B2067E21C27}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsMic.StandardLibrary", "StandardLibrary\CsMic.StandardLibrary.csproj", "{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSMic.StandardLibrary", "StandardLibrary\CSMic.StandardLibrary.csproj", "{1533FED0-C765-4929-8797-CE6C2E594DAB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Description = CS-MIC is a .NET library written in C# designed to give developers easy access to expression parsing.
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5387FF55-3044-4EB4-BB90-AD2E922131C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5387FF55-3044-4EB4-BB90-AD2E922131C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5387FF55-3044-4EB4-BB90-AD2E922131C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5387FF55-3044-4EB4-BB90-AD2E922131C1}.Release|Any CPU.Build.0 = Release|Any CPU
{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}.Release|Any CPU.Build.0 = Release|Any CPU
{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}.Release|Any CPU.Build.0 = Release|Any CPU
{4DAA770D-1624-48D7-8D92-2B2067E21C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4DAA770D-1624-48D7-8D92-2B2067E21C27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4DAA770D-1624-48D7-8D92-2B2067E21C27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4DAA770D-1624-48D7-8D92-2B2067E21C27}.Release|Any CPU.Build.0 = Release|Any CPU
{1533FED0-C765-4929-8797-CE6C2E594DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1533FED0-C765-4929-8797-CE6C2E594DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1533FED0-C765-4929-8797-CE6C2E594DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1533FED0-C765-4929-8797-CE6C2E594DAB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View file

@ -1,6 +1,6 @@
using CsMic;
using CSMic;
namespace CsMic.StandardLibrary
namespace CSMic.StandardLibrary
{
public static class Constants
{

View file

@ -2,18 +2,20 @@
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>CsMic.StandardLibrary</RootNamespace>
<AssemblyName>CsMic.StandardLibrary</AssemblyName>
<RootNamespace>CSMic.StandardLibrary</RootNamespace>
<AssemblyName>CSMic.StandardLibrary</AssemblyName>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Core\CsMic.Core.csproj" />
<Compile Remove="Functions\hyperbolic\**" />
<EmbeddedResource Remove="Functions\hyperbolic\**" />
<None Remove="Functions\hyperbolic\**" />
</ItemGroup>
<ItemGroup>
<Folder Include="functions\hyperbolic\" />
<ProjectReference Include="..\Core\CSMic.Core.csproj" />
</ItemGroup>
</Project>

View file

@ -1,12 +1,12 @@
using CsMic;
using CsMic.StandardLibrary.Functions;
using CSMic;
using CSMic.StandardLibrary.Functions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CsMic.StandardLibrary
namespace CSMic.StandardLibrary
{
public static class Functions
{

View file

@ -1,7 +1,6 @@
using CsMic;
using FunctionValueType = CsMic.FunctionValueType;
using CSMic;
namespace CsMic.StandardLibrary.Functions
namespace CSMic.StandardLibrary.Functions
{
public class AbsoluteValue : FunctionBase, ICodedFunction
{

View file

@ -1,7 +1,6 @@
using CsMic;
using FunctionValueType = CsMic.FunctionValueType;
using CSMic;
namespace CsMic.StandardLibrary.Functions
namespace CSMic.StandardLibrary.Functions
{
public abstract class FunctionBase
{

View file

@ -1,11 +1,11 @@
using CsMic;
using CSMic;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CsMic.StandardLibrary.Functions
namespace CSMic.StandardLibrary.Functions
{
public class Max : FunctionBase, ICodedFunction
{

View file

@ -1,11 +1,11 @@
using CsMic;
using CSMic;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CsMic.StandardLibrary.Functions
namespace CSMic.StandardLibrary.Functions
{
public class Min : FunctionBase, ICodedFunction
{

View file

@ -1,7 +1,7 @@
using CsMic;
using FunctionValueType = CsMic.FunctionValueType;
using CSMic;
namespace CsMic.StandardLibrary.Functions
namespace CSMic.StandardLibrary.Functions
{
public class Sign : FunctionBase, ICodedFunction
{

View file

@ -6,8 +6,8 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<RootNamespace>CsMic.Tests</RootNamespace>
<AssemblyName>CsMic.Tests</AssemblyName>
<RootNamespace>CSMic.Tests</RootNamespace>
<AssemblyName>CSMic.Tests</AssemblyName>
</PropertyGroup>
<ItemGroup>
@ -19,8 +19,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\CsMic.Core.csproj" />
<ProjectReference Include="..\StandardLibrary\CsMic.StandardLibrary.csproj" />
<ProjectReference Include="..\Core\CSMic.Core.csproj" />
<ProjectReference Include="..\StandardLibrary\CSMic.StandardLibrary.csproj" />
</ItemGroup>
<ItemGroup>

View file

@ -1,7 +1,7 @@
using System.Globalization;
using CsMic;
using CSMic;
namespace CsMic.Tests;
namespace CSMic.Tests;
public class InputInterpreterTests
{

View file

@ -1,11 +1,11 @@
using CsMic;
using CsMic.StandardLibrary;
using CSMic;
using CSMic.StandardLibrary;
using NUnit.Framework;
using CsMic.StandardLibrary.Functions;
using CSMic.StandardLibrary.Functions;
using System.Globalization;
using System.Reflection.Metadata;
namespace CsMic.Tests;
namespace CSMic.Tests;
public class StdlibFunctionsTests
{