Namespace change

This commit is contained in:
2025-07-23 01:06:48 -04:00
parent 0e716e083c
commit 6800d0d7a9
33 changed files with 97 additions and 93 deletions

View File

@@ -1,11 +1,11 @@
using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Attributes;
using IronJava.Core; using MarketAlly.IronJava.Core;
using IronJava.Core.AST; using MarketAlly.IronJava.Core.AST;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.AST.Query; using MarketAlly.IronJava.Core.AST.Query;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Benchmarks namespace MarketAlly.IronJava.Benchmarks
{ {
[MemoryDiagnoser] [MemoryDiagnoser]
public class AstTraversalBenchmarks public class AstTraversalBenchmarks
@@ -108,7 +108,7 @@ namespace IronJava.Benchmarks
public void Reset() => NodeCount = 0; public void Reset() => NodeCount = 0;
protected override void DefaultVisit(IronJava.Core.AST.JavaNode node) protected override void DefaultVisit(MarketAlly.IronJava.Core.AST.JavaNode node)
{ {
NodeCount++; NodeCount++;
base.DefaultVisit(node); base.DefaultVisit(node);

View File

@@ -5,6 +5,7 @@
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>MarketAlly.IronJava.Benchmarks</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

View File

@@ -1,7 +1,7 @@
using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Attributes;
using IronJava.Core; using MarketAlly.IronJava.Core;
namespace IronJava.Benchmarks namespace MarketAlly.IronJava.Benchmarks
{ {
[MemoryDiagnoser] [MemoryDiagnoser]
[SimpleJob(warmupCount: 3, iterationCount: 5)] [SimpleJob(warmupCount: 3, iterationCount: 5)]

View File

@@ -1,6 +1,6 @@
using BenchmarkDotNet.Running; using BenchmarkDotNet.Running;
namespace IronJava.Benchmarks namespace MarketAlly.IronJava.Benchmarks
{ {
class Program class Program
{ {

View File

@@ -1,11 +1,11 @@
using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Attributes;
using IronJava.Core; using MarketAlly.IronJava.Core;
using IronJava.Core.AST; using MarketAlly.IronJava.Core.AST;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.AST.Transformation; using MarketAlly.IronJava.Core.AST.Transformation;
using IronJava.Core.Serialization; using MarketAlly.IronJava.Core.Serialization;
namespace IronJava.Benchmarks namespace MarketAlly.IronJava.Benchmarks
{ {
[MemoryDiagnoser] [MemoryDiagnoser]
public class TransformationBenchmarks public class TransformationBenchmarks

View File

@@ -4,10 +4,10 @@ using System.Linq;
using Antlr4.Runtime; using Antlr4.Runtime;
using Antlr4.Runtime.Misc; using Antlr4.Runtime.Misc;
using Antlr4.Runtime.Tree; using Antlr4.Runtime.Tree;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.Grammar; using MarketAlly.IronJava.Core.Grammar;
namespace IronJava.Core.AST.Builders namespace MarketAlly.IronJava.Core.AST.Builders
{ {
/// <summary> /// <summary>
/// Builds a typed AST from ANTLR parse tree. /// Builds a typed AST from ANTLR parse tree.

View File

@@ -1,10 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.AST.Comparison namespace MarketAlly.IronJava.Core.AST.Comparison
{ {
/// <summary> /// <summary>
/// Provides equality comparison for AST nodes. /// Provides equality comparison for AST nodes.

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.AST namespace MarketAlly.IronJava.Core.AST
{ {
/// <summary> /// <summary>
/// Base class for all Java AST nodes. /// Base class for all Java AST nodes.

View File

@@ -1,6 +1,6 @@
using System; using System;
namespace IronJava.Core.AST namespace MarketAlly.IronJava.Core.AST
{ {
/// <summary> /// <summary>
/// Java access modifiers and other modifiers as flags. /// Java access modifiers and other modifiers as flags.

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.AST.Nodes namespace MarketAlly.IronJava.Core.AST.Nodes
{ {
/// <summary> /// <summary>
/// Represents a Java annotation usage. /// Represents a Java annotation usage.

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.AST.Nodes namespace MarketAlly.IronJava.Core.AST.Nodes
{ {
/// <summary> /// <summary>
/// Represents a Java source file (compilation unit). /// Represents a Java source file (compilation unit).

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.AST.Nodes namespace MarketAlly.IronJava.Core.AST.Nodes
{ {
/// <summary> /// <summary>
/// Base class for all expressions. /// Base class for all expressions.

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.AST.Nodes namespace MarketAlly.IronJava.Core.AST.Nodes
{ {
/// <summary> /// <summary>
/// Base class for class/interface members. /// Base class for class/interface members.

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.AST.Nodes namespace MarketAlly.IronJava.Core.AST.Nodes
{ {
/// <summary> /// <summary>
/// Base class for all statements. /// Base class for all statements.

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.AST.Nodes namespace MarketAlly.IronJava.Core.AST.Nodes
{ {
/// <summary> /// <summary>
/// Base class for all type declarations (class, interface, enum, annotation). /// Base class for all type declarations (class, interface, enum, annotation).

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.AST.Nodes namespace MarketAlly.IronJava.Core.AST.Nodes
{ {
/// <summary> /// <summary>
/// Represents a reference to a type. /// Represents a reference to a type.

View File

@@ -1,10 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.AST.Query namespace MarketAlly.IronJava.Core.AST.Query
{ {
/// <summary> /// <summary>
/// Provides LINQ-style querying capabilities for AST nodes. /// Provides LINQ-style querying capabilities for AST nodes.

View File

@@ -1,4 +1,4 @@
namespace IronJava.Core.AST namespace MarketAlly.IronJava.Core.AST
{ {
/// <summary> /// <summary>
/// Represents a location in the source code. /// Represents a location in the source code.

View File

@@ -1,10 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.AST.Transformation namespace MarketAlly.IronJava.Core.AST.Transformation
{ {
/// <summary> /// <summary>
/// Base class for AST transformations that create modified copies of nodes. /// Base class for AST transformations that create modified copies of nodes.

View File

@@ -1,8 +1,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
namespace IronJava.Core.AST.Visitors namespace MarketAlly.IronJava.Core.AST.Visitors
{ {
/// <summary> /// <summary>
/// Example visitor that collects all class names in the AST. /// Example visitor that collects all class names in the AST.

View File

@@ -1,6 +1,6 @@
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
namespace IronJava.Core.AST.Visitors namespace MarketAlly.IronJava.Core.AST.Visitors
{ {
/// <summary> /// <summary>
/// Visitor interface for traversing Java AST nodes without returning values. /// Visitor interface for traversing Java AST nodes without returning values.

View File

@@ -1,6 +1,6 @@
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
namespace IronJava.Core.AST.Visitors namespace MarketAlly.IronJava.Core.AST.Visitors
{ {
/// <summary> /// <summary>
/// Base implementation of IJavaVisitor that visits all child nodes by default. /// Base implementation of IJavaVisitor that visits all child nodes by default.

View File

@@ -35,7 +35,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
namespace IronJava.Core.Grammar namespace MarketAlly.IronJava.Core.Grammar
{ {
public abstract class Java9LexerBase : Lexer public abstract class Java9LexerBase : Lexer
{ {

View File

@@ -4,10 +4,11 @@
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>MarketAlly.IronJava</RootNamespace>
<!-- NuGet Package Metadata --> <!-- NuGet Package Metadata -->
<PackageId>IronJava</PackageId> <PackageId>IronJava</PackageId>
<Version>1.1.0</Version> <Version>2.0.0</Version>
<Authors>David H Friedel Jr</Authors> <Authors>David H Friedel Jr</Authors>
<Company>MarketAlly</Company> <Company>MarketAlly</Company>
<Title>IronJava</Title> <Title>IronJava</Title>
@@ -53,10 +54,10 @@
<ItemGroup> <ItemGroup>
<Antlr4 Include="Grammar\Java9Lexer.g4"> <Antlr4 Include="Grammar\Java9Lexer.g4">
<Package>IronJava.Core.Grammar</Package> <Package>MarketAlly.IronJava.Core.Grammar</Package>
</Antlr4> </Antlr4>
<Antlr4 Include="Grammar\Java9Parser.g4"> <Antlr4 Include="Grammar\Java9Parser.g4">
<Package>IronJava.Core.Grammar</Package> <Package>MarketAlly.IronJava.Core.Grammar</Package>
<Listener>false</Listener> <Listener>false</Listener>
<Visitor>true</Visitor> <Visitor>true</Visitor>
</Antlr4> </Antlr4>

View File

@@ -1,9 +1,9 @@
using Antlr4.Runtime; using Antlr4.Runtime;
using IronJava.Core.AST.Builders; using MarketAlly.IronJava.Core.AST.Builders;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.Grammar; using MarketAlly.IronJava.Core.Grammar;
namespace IronJava.Core namespace MarketAlly.IronJava.Core
{ {
public class JavaParser public class JavaParser
{ {

View File

@@ -3,11 +3,11 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using IronJava.Core.AST; using MarketAlly.IronJava.Core.AST;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
namespace IronJava.Core.Serialization namespace MarketAlly.IronJava.Core.Serialization
{ {
/// <summary> /// <summary>
/// Provides JSON serialization for Java AST nodes. /// Provides JSON serialization for Java AST nodes.

View File

@@ -1,14 +1,14 @@
using System; using System;
using System.Linq; using System.Linq;
using IronJava.Core.AST; using MarketAlly.IronJava.Core.AST;
using IronJava.Core.AST.Comparison; using MarketAlly.IronJava.Core.AST.Comparison;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.AST.Query; using MarketAlly.IronJava.Core.AST.Query;
using IronJava.Core.AST.Transformation; using MarketAlly.IronJava.Core.AST.Transformation;
using IronJava.Core.Serialization; using MarketAlly.IronJava.Core.Serialization;
using Xunit; using Xunit;
namespace IronJava.Tests namespace MarketAlly.IronJava.Tests
{ {
public class Phase3Tests public class Phase3Tests
{ {

View File

@@ -1,10 +1,10 @@
using IronJava.Core; using MarketAlly.IronJava.Core;
using IronJava.Core.AST; using MarketAlly.IronJava.Core.AST;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
using Xunit; using Xunit;
namespace IronJava.Tests namespace MarketAlly.IronJava.Tests
{ {
/// <summary> /// <summary>
/// Demonstrates Phase 2 functionality with our typed AST. /// Demonstrates Phase 2 functionality with our typed AST.

View File

@@ -1,9 +1,9 @@
using IronJava.Core; using MarketAlly.IronJava.Core;
using IronJava.Core.AST; using MarketAlly.IronJava.Core.AST;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using Xunit; using Xunit;
namespace IronJava.Tests namespace MarketAlly.IronJava.Tests
{ {
public class BasicParsingTests public class BasicParsingTests
{ {

View File

@@ -4,6 +4,7 @@
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>MarketAlly.IronJava.Tests</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject> <IsTestProject>true</IsTestProject>

View File

@@ -1,12 +1,12 @@
using System.Linq; using System.Linq;
using System.Text.Json; using System.Text.Json;
using IronJava.Core; using MarketAlly.IronJava.Core;
using IronJava.Core.AST; using MarketAlly.IronJava.Core.AST;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.Serialization; using MarketAlly.IronJava.Core.Serialization;
using Xunit; using Xunit;
namespace IronJava.Tests namespace MarketAlly.IronJava.Tests
{ {
public class JsonDeserializationTests public class JsonDeserializationTests
{ {

View File

@@ -5,6 +5,7 @@
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>MarketAlly.IronJava.Sample</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

View File

@@ -1,12 +1,12 @@
using IronJava.Core; using MarketAlly.IronJava.Core;
using IronJava.Core.AST; using MarketAlly.IronJava.Core.AST;
using IronJava.Core.AST.Nodes; using MarketAlly.IronJava.Core.AST.Nodes;
using IronJava.Core.AST.Query; using MarketAlly.IronJava.Core.AST.Query;
using IronJava.Core.AST.Transformation; using MarketAlly.IronJava.Core.AST.Transformation;
using IronJava.Core.AST.Visitors; using MarketAlly.IronJava.Core.AST.Visitors;
using IronJava.Core.Serialization; using MarketAlly.IronJava.Core.Serialization;
namespace IronJava.Sample namespace MarketAlly.IronJava.Sample
{ {
class Program class Program
{ {