diff --git a/.coderabbit.yaml b/.coderabbit.yaml index 5adddc45..e8f39d24 100644 --- a/.coderabbit.yaml +++ b/.coderabbit.yaml @@ -19,7 +19,7 @@ reviews: path_instructions: - path: "**/*.cs" instructions: | - Review the C# code against the Microsoft Framework design guidelines as well as 10 guidelines + Review the C# code against the Microsoft Framework design guidelines as well as 10 guidelines from "Building Maintainable Software" by Joost Visser. Point out deviations and improvements. - path: "**/*.md" instructions: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cba08601..980dab1c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,10 +1,18 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.3 + rev: v8.30.0 hooks: - id: gitleaks - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v6.0.0 hooks: - id: end-of-file-fixer - id: trailing-whitespace +- repo: local + hooks: + - id: dotnet-format + name: dotnet format (whitespace + style, verify only) + entry: bash -c 'cd OSLC4Net_SDK && dotnet format whitespace . --verify-no-changes && dotnet format style . --verify-no-changes --no-restore' + language: system + pass_filenames: false + files: '\.cs$' diff --git a/.vscode/settings.json b/.vscode/settings.json index e7a86fc1..308cc6b4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { "dotnet.defaultSolution": "OSLC4Net_SDK/OSLC4Net.Core.slnx" -} \ No newline at end of file +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a28e0600..7d9697df 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -38,4 +38,4 @@ "problemMatcher": "$msCompile" } ] -} \ No newline at end of file +} diff --git a/AGENTS.md b/AGENTS.md index c7ffd918..d344dfca 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -56,8 +56,6 @@ Do not inline the `AGENT_BUILD` variable! You must be CD'd into `OSLC4Net_SDK` or subfolder before running `dotnet` commands. -Run `dotnet format` before commit. - ### Test Filters Running TUnit via `dotnet run` supports test filters. @@ -99,6 +97,19 @@ TUnit also supports filtering by your own [properties](https://thomhurst.github. And if your test had a property with the name "MyFilterName" and its value contained "SomeValue", then your test would be executed. +## Formatting (required before every commit) + +Run from the repo root: + +```bash +dotnet format whitespace ./OSLC4Net_SDK && dotnet format style ./OSLC4Net_SDK --no-restore +``` + +- Use `whitespace` + `style` only. Skip `analyzers` — it runs third-party rules (Meziantou etc.) and is slow/noisy. +- `--no-restore` on the second call avoids a redundant restore. +- Also run this **after resolving merge conflicts**. Hand-edited hunks re-introduce style drift even when both parents were clean. +- A pre-commit hook (`.pre-commit-config.yaml`) enforces this; install once with `pre-commit install`. + ## Project Structure - `OSLC4Net_SDK/` - Main SDK projects (.NET 10) diff --git a/CLAUDE.md b/CLAUDE.md new file mode 120000 index 00000000..47dc3e3d --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1 @@ +AGENTS.md \ No newline at end of file diff --git a/OSLC4Net_SDK/.config/dotnet-tools.json b/OSLC4Net_SDK/.config/dotnet-tools.json index e4992634..4082aed8 100644 --- a/OSLC4Net_SDK/.config/dotnet-tools.json +++ b/OSLC4Net_SDK/.config/dotnet-tools.json @@ -10,4 +10,4 @@ "rollForward": false } } -} \ No newline at end of file +} diff --git a/OSLC4Net_SDK/.dockerignore b/OSLC4Net_SDK/.dockerignore index fe1152bd..8a0a6f1a 100644 --- a/OSLC4Net_SDK/.dockerignore +++ b/OSLC4Net_SDK/.dockerignore @@ -27,4 +27,4 @@ README.md !.git/HEAD !.git/config !.git/packed-refs -!.git/refs/heads/** \ No newline at end of file +!.git/refs/heads/** diff --git a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzConstants.cs b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzConstants.cs index 0f11f0ef..89154351 100644 --- a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzConstants.cs +++ b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzConstants.cs @@ -4,7 +4,7 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * and Eclipse Distribution License v. 1.0 which accompanies this distribution. - * + * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. diff --git a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzFormAuthClient.cs b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzFormAuthClient.cs index 862946fe..79a8129e 100644 --- a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzFormAuthClient.cs +++ b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzFormAuthClient.cs @@ -4,7 +4,7 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * and Eclipse Distribution License v. 1.0 which accompanies this distribution. - * + * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. @@ -59,7 +59,7 @@ public JazzFormAuthClient(String url, String user, String password, ILogger /// the URL of the Jazz server, including the web app context - /// the base URL to use for authentication. This is normally the + /// the base URL to use for authentication. This is normally the /// application base URL for RQM and RTC and is the JTS application URL for fronting /// applications like RRC and DM. /// diff --git a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzRootServicesConstants.cs b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzRootServicesConstants.cs index 4cbad44b..43ddc3bc 100644 --- a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzRootServicesConstants.cs +++ b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Jazz/Oslc/Jazz/JazzRootServicesConstants.cs @@ -4,7 +4,7 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * and Eclipse Distribution License v. 1.0 which accompanies this distribution. - * + * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. diff --git a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/ERMSample.cs b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/ERMSample.cs index 4d334be9..609d999e 100644 --- a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/ERMSample.cs +++ b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/ERMSample.cs @@ -4,7 +4,7 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * and Eclipse Distribution License v. 1.0 which accompanies this distribution. - * + * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. @@ -30,7 +30,7 @@ namespace OSLC4Net.Client.Samples; /// /// Samples of logging in to Enterprise Requirements Management (ERM) and running OSLC operations -/// +/// /// - run an OSLC Requirement query and retrieve OSLC Requirements and display results /// - demonstrate query result pagination and member enumeration /// diff --git a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/ETMSample.cs b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/ETMSample.cs index 62d35bfb..0b51503f 100644 --- a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/ETMSample.cs +++ b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/ETMSample.cs @@ -4,7 +4,7 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * and Eclipse Distribution License v. 1.0 which accompanies this distribution. - * + * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. @@ -27,7 +27,7 @@ namespace OSLC4Net.Client.Samples; /// /// Samples of logging in to Enterprise Test Management (ETM) and running OSLC operations -/// +/// /// - run an OLSC TestResult query and retrieve OSLC TestResults and de-serialize them as .NET objects /// - retrieve an OSLC TestResult and print it as XML /// - create a new TestCase @@ -137,8 +137,8 @@ async Task RunAsync(string webContextUrl, string user, string passwd, string pro Logger.LogInformation("\n------------------------------\n"); - //SCENARIO B: Run a query for a specific TestResult selecting only certain - //attributes and then print it as raw XML. Change the dcterms:title below to match a + //SCENARIO B: Run a query for a specific TestResult selecting only certain + //attributes and then print it as raw XML. Change the dcterms:title below to match a //real TestResult in your ETM project area OslcQueryParameters queryParams2 = new OslcQueryParameters(); queryParams2.SetWhere("dcterms:title=\"Consistent_display_of_currency_Firefox_DB2_WAS_Windows_S1\""); @@ -169,7 +169,7 @@ async Task RunAsync(string webContextUrl, string user, string passwd, string pro String testcaseLocation = creationResponse.Headers.Location.ToString(); Logger.LogInformation("Test Case created a location {Location}", testcaseLocation); - //Get the test case from the service provider and update its title property + //Get the test case from the service provider and update its title property testcase = await (await client.GetResourceRawAsync(testcaseLocation, OslcMediaType.APPLICATION_RDF_XML).ConfigureAwait(false)).Content.ReadAsAsync(client.GetFormatters()).ConfigureAwait(false); testcase.SetTitle(testcase.GetTitle() + " (updated)"); diff --git a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/EWMSample.cs b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/EWMSample.cs index 3a6790b2..c37a2142 100644 --- a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/EWMSample.cs +++ b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/EWMSample.cs @@ -4,7 +4,7 @@ * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * and Eclipse Distribution License v. 1.0 which accompanies this distribution. - * + * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. @@ -27,8 +27,8 @@ namespace OSLC4Net.Client.Samples; /// /// Samples of logging in to Enterprise Workflow Management (EWM) and running OSLC operations -/// -/// +/// +/// /// - run an OLSC ChangeRequest query and retrieve OSLC ChangeRequests and de-serialize them as .NET objects /// - retrieve an OSLC ChangeRequest and print it as XML /// - create a new ChangeRequest @@ -390,7 +390,7 @@ protected override void PrintResourceInfo(ChangeRequest cr) foreach (var val in values) { Logger.LogInformation("Found allowed value >{}<", val); - // Skip empty or whitespace values + // Skip empty or whitespace values // if (!val.Contains("Unassigned", StringComparison.OrdinalIgnoreCase)) // { // Logger.LogInformation("Resolved Filed Against category: {Category}", val); @@ -427,4 +427,3 @@ protected override void PrintResourceInfo(ChangeRequest cr) } } } - diff --git a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/Program.cs b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/Program.cs index 613c1c23..f7f749e0 100644 --- a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/Program.cs +++ b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/Program.cs @@ -64,4 +64,3 @@ static async Task Main(string[] args) } } } - diff --git a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/Properties/AssemblyInfo.cs b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/Properties/AssemblyInfo.cs index 95f3972a..62eb2498 100644 --- a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/Properties/AssemblyInfo.cs +++ b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/Properties/AssemblyInfo.cs @@ -1,7 +1,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("OSLC4Net.Client.Samples")] @@ -13,8 +13,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -24,11 +24,11 @@ // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] diff --git a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/SampleBase.cs b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/SampleBase.cs index c12dfafa..ec8d99c0 100644 --- a/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/SampleBase.cs +++ b/OSLC4Net_SDK/Examples/OSLC4Net.Client.Samples/SampleBase.cs @@ -50,7 +50,7 @@ protected async Task ProcessCurrentPageAsync(OslcQueryResult result, OslcClient try { - //Get a single artifact by its URL + //Get a single artifact by its URL HttpResponseMessage response = await client.GetResourceRawAsync(resultsUrl, OSLCConstants.CT_RDF).ConfigureAwait(false); if (response != null) diff --git a/OSLC4Net_SDK/Examples/OSLC4NetExamples.Server.NetCoreApi/Dockerfile b/OSLC4Net_SDK/Examples/OSLC4NetExamples.Server.NetCoreApi/Dockerfile index 42baca8d..851f1ce6 100644 --- a/OSLC4Net_SDK/Examples/OSLC4NetExamples.Server.NetCoreApi/Dockerfile +++ b/OSLC4Net_SDK/Examples/OSLC4NetExamples.Server.NetCoreApi/Dockerfile @@ -32,4 +32,4 @@ RUN dotnet publish "./OSLC4NetExamples.Server.NetCoreApi.csproj" -c $BUILD_CONFI FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "OSLC4NetExamples.Server.NetCoreApi.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "OSLC4NetExamples.Server.NetCoreApi.dll"] diff --git a/OSLC4Net_SDK/Examples/OSLC4NetExamples.Server.NetCoreApi/Models/RootServicesDto.cs b/OSLC4Net_SDK/Examples/OSLC4NetExamples.Server.NetCoreApi/Models/RootServicesDto.cs index a75f7985..e9ffb604 100644 --- a/OSLC4Net_SDK/Examples/OSLC4NetExamples.Server.NetCoreApi/Models/RootServicesDto.cs +++ b/OSLC4Net_SDK/Examples/OSLC4NetExamples.Server.NetCoreApi/Models/RootServicesDto.cs @@ -217,4 +217,3 @@ public string ToXml() } } } - diff --git a/OSLC4Net_SDK/Examples/scripts/README.md b/OSLC4Net_SDK/Examples/scripts/README.md index 49739475..bb0189cc 100644 --- a/OSLC4Net_SDK/Examples/scripts/README.md +++ b/OSLC4Net_SDK/Examples/scripts/README.md @@ -6,7 +6,7 @@ This directory contains test scripts for the OSLC4Net client samples targeting E The OSLC4Net samples have been renamed from legacy IBM product names to current product names: - **RTC** (Rational Team Concert) → **EWM** (Enterprise Workflow Management) -- **RRC** (Rational Requirements Composer) → **ERM** (Enterprise Requirements Management) +- **RRC** (Rational Requirements Composer) → **ERM** (Enterprise Requirements Management) - **RQM** (Rational Quality Manager) → **ETM** (Enterprise Test Management) ## Setup @@ -40,7 +40,7 @@ The test scripts will: ``` This tests: -- **EWM** (Enterprise Workflow Management) +- **EWM** (Enterprise Workflow Management) - Queries for open change requests - Creates, updates, and retrieves change requests - **ERM** (Enterprise Requirements Management) @@ -48,7 +48,7 @@ This tests: - Builds requirement collections - Queries requirements by various criteria - **ETM** (Enterprise Test Management) - - Queries for passed test results + - Queries for passed test results - Creates and updates test cases ### Test against Nordic (IBM Cloud instance) @@ -101,7 +101,7 @@ dotnet run --project ../OSLC4Net.Client.Samples/ -- etm ` ### Sample Classes Located in `../OSLC4Net.Client.Samples/`: - `EWMSample.cs` - Demonstrates OSLC 2.0 Change Management operations -- `ERMSample.cs` - Demonstrates OSLC 2.0 Requirements Management operations +- `ERMSample.cs` - Demonstrates OSLC 2.0 Requirements Management operations - `ETMSample.cs` - Demonstrates OSLC 2.0 Quality Management operations ### Program Architecture @@ -136,4 +136,3 @@ Located in `../OSLC4Net.Client.Samples/`: - See `lyo-samples` repository for similar Java samples - [OSLC Specifications](http://open-services.net/) - [Eclipse Lyo Documentation](https://projects.eclipse.org/projects/technology.lyo) - diff --git a/OSLC4Net_SDK/OSLC4Net.ChangeManagement/OSLC4Net.ChangeManagementCommon.csproj.DotSettings b/OSLC4Net_SDK/OSLC4Net.ChangeManagement/OSLC4Net.ChangeManagementCommon.csproj.DotSettings index 6e7fff86..f71a2bc0 100644 --- a/OSLC4Net_SDK/OSLC4Net.ChangeManagement/OSLC4Net.ChangeManagementCommon.csproj.DotSettings +++ b/OSLC4Net_SDK/OSLC4Net.ChangeManagement/OSLC4Net.ChangeManagementCommon.csproj.DotSettings @@ -1,2 +1,2 @@  - No \ No newline at end of file + No diff --git a/OSLC4Net_SDK/OSLC4Net.Client/Oslc/OslcClient.cs b/OSLC4Net_SDK/OSLC4Net.Client/Oslc/OslcClient.cs index 811a57a3..8fe410db 100644 --- a/OSLC4Net_SDK/OSLC4Net.Client/Oslc/OslcClient.cs +++ b/OSLC4Net_SDK/OSLC4Net.Client/Oslc/OslcClient.cs @@ -893,4 +893,3 @@ public void Dispose() _client.Dispose(); } } - diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcOrderBy.g b/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcOrderBy.g index 4c67519f..55da2de8 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcOrderBy.g +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcOrderBy.g @@ -3,13 +3,13 @@ * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Eclipse Distribution License is available at + * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. * - * Contributors: + * Contributors: * * Steve Pitchke - initial API and implementation *******************************************************************************/ @@ -33,18 +33,18 @@ tokens { this(new CommonTokenStream(new OslcOrderByLexer(new ANTLRStringStream(orderBy)))) { } - + public object Result { get { return oslc_order_by().Tree; } } } -oslc_order_by : sort_terms +oslc_order_by : sort_terms ; sort_terms : sort_term ( ',' sort_term )* -> ^( 'terms' sort_term (sort_term)* ) - ; + ; sort_term : scoped_sort_term | DIRECTION identifier -> ^( 'simple_term' identifier DIRECTION ) ; @@ -77,7 +77,7 @@ PNAME_LN ; -DIRECTION +DIRECTION : PLUS | MINUS ; @@ -92,7 +92,7 @@ PN_CHARS : PN_CHARS_U | MINUS | DIGIT - | '\u00B7' + | '\u00B7' | '\u0300'..'\u036F' | '\u203F'..'\u2040' ; diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcPrefix.g b/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcPrefix.g index 1c90d132..2b0bb9bb 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcPrefix.g +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcPrefix.g @@ -3,13 +3,13 @@ * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Eclipse Distribution License is available at + * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. * - * Contributors: + * Contributors: * * Steve Pitchke - initial API and implementation *******************************************************************************/ @@ -17,7 +17,7 @@ grammar OslcPrefix; options { language = 'CSharp3'; - output=AST; + output=AST; } tokens { @@ -32,17 +32,17 @@ tokens { this(new CommonTokenStream(new OslcPrefixLexer(new ANTLRStringStream(prefixes)))) { } - + public object Result { get { return oslc_prefixes().Tree; } - } + } } -oslc_prefixes : prefix_binding ( ',' prefix_binding )* -> ^( 'prefix_list' prefix_binding (prefix_binding)* ) +oslc_prefixes : prefix_binding ( ',' prefix_binding )* -> ^( 'prefix_list' prefix_binding (prefix_binding)* ) ; - + prefix_binding : PN_PREFIX '=' IRI_REF -> ^( 'prefix' PN_PREFIX IRI_REF ) ; @@ -62,7 +62,7 @@ EOL PN_PREFIX : PN_CHARS_BASE ((PN_CHARS|DOT)* PN_CHARS)? ; - + fragment PN_CHARS_BASE : 'A'..'Z' @@ -85,7 +85,7 @@ PN_CHARS : PN_CHARS_U | MINUS | DIGIT - | '\u00B7' + | '\u00B7' | '\u0300'..'\u036F' | '\u203F'..'\u2040' ; @@ -101,7 +101,7 @@ DIGIT ; IRI_REF - : LESS ( options {greedy=false;} : ~(LESS | GREATER | '"' | OPEN_CURLY_BRACE | CLOSE_CURLY_BRACE | '|' | '^' | '\\' | '`' | ('\u0000'..'\u0020')) )* GREATER + : LESS ( options {greedy=false;} : ~(LESS | GREATER | '"' | OPEN_CURLY_BRACE | CLOSE_CURLY_BRACE | '|' | '^' | '\\' | '`' | ('\u0000'..'\u0020')) )* GREATER ; COMMA diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcSearchTerms.g b/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcSearchTerms.g index 40b1c1fa..a48fa537 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcSearchTerms.g +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcSearchTerms.g @@ -3,13 +3,13 @@ * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Eclipse Distribution License is available at + * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. * - * Contributors: + * Contributors: * * Steve Pitchke - initial API and implementation *******************************************************************************/ @@ -17,7 +17,7 @@ grammar OslcSearchTerms; options { language = 'CSharp3'; - output=AST; + output=AST; } tokens { @@ -31,14 +31,14 @@ tokens { this(new CommonTokenStream(new OslcSearchTermsLexer(new ANTLRStringStream(searcTerms)))) { } - + public object Result { get { return oslc_search_terms().Tree; } - } + } } -oslc_search_terms : string_esc ( ',' string_esc )* -> ^('string_list' string_esc (string_esc)* ) +oslc_search_terms : string_esc ( ',' string_esc )* -> ^('string_list' string_esc (string_esc)* ) ; string_esc : STRING_LITERAL ; diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcSelect.g b/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcSelect.g index c49f0c78..f7b83d51 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcSelect.g +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcSelect.g @@ -3,13 +3,13 @@ * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Eclipse Distribution License is available at + * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. * - * Contributors: + * Contributors: * * Steve Pitchke - initial API and implementation *******************************************************************************/ @@ -34,7 +34,7 @@ tokens { this(new CommonTokenStream(new OslcSelectLexer(new ANTLRStringStream(select)))) { } - + public object Result { get { return oslc_select().Tree; } @@ -46,7 +46,7 @@ oslc_select : properties properties : property ( ',' property )* -> ^( 'properties' property (property)* ) ; - + property : identifier | nested_property ; @@ -94,7 +94,7 @@ PN_CHARS : PN_CHARS_U | MINUS | DIGIT - | '\u00B7' + | '\u00B7' | '\u0300'..'\u036F' | '\u203F'..'\u2040' ; diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcWhere.g b/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcWhere.g index 3bcd0ce0..8bd6964e 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcWhere.g +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Grammars/OslcWhere.g @@ -3,13 +3,13 @@ * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Eclipse Distribution License is available at + * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. * - * Contributors: + * Contributors: * * Steve Pitchke - initial API and implementation *******************************************************************************/ @@ -37,20 +37,20 @@ tokens { this(new CommonTokenStream(new OslcWhereLexer(new ANTLRStringStream(where)))) { } - + public object Result { get { return oslc_where().Tree; } } } -oslc_where : compound_term +oslc_where : compound_term ; compound_term : simple_term ( boolean_op simple_term)* -> ^( 'terms' simple_term (simple_term)* ) - ; + ; -simple_term : term | scoped_term +simple_term : term | scoped_term ; space : ' '! ; @@ -60,7 +60,7 @@ boolean_op : ' and '! ; term : term_simple | in_term ; term_simple - : identifier_wc comparison_op value -> ^( 'simple_term' identifier_wc comparison_op value ) + : identifier_wc comparison_op value -> ^( 'simple_term' identifier_wc comparison_op value ) ; in_term : identifier_wc in_op space? in_val -> ^( 'in_term' identifier_wc in_val ) @@ -87,13 +87,13 @@ value : iriRef | literal_value ; literal_value : boolean_val | decimal | string_esc | typed_string | langed_string ; - + typed_string - : string_esc ( '^^' prefixedName ) -> ^( 'typed_value' string_esc prefixedName? ) + : string_esc ( '^^' prefixedName ) -> ^( 'typed_value' string_esc prefixedName? ) ; langed_string - : string_esc LANGTAG -> ^( 'langed_value' string_esc LANGTAG ) + : string_esc LANGTAG -> ^( 'langed_value' string_esc LANGTAG ) ; @@ -103,18 +103,18 @@ decimal : DECIMAL ; string_esc : STRING_LITERAL ; -properties : - property (',' property )* +properties : + property (',' property )* ; -property : - prefixedName ( nested_property )* +property : + prefixedName ( nested_property )* ; nested_property : '{' property (',' property )* '}' ; - + iriRef : IRI_REF | prefixedName @@ -145,21 +145,21 @@ PNAME_LN IRI_REF - : LESS ( options {greedy=false;} : ~(LESS | GREATER | '"' | OPEN_CURLY_BRACE | CLOSE_CURLY_BRACE | '|' | '^' | '\\' | '`' | ('\u0000'..'\u0020')) )* GREATER + : LESS ( options {greedy=false;} : ~(LESS | GREATER | '"' | OPEN_CURLY_BRACE | CLOSE_CURLY_BRACE | '|' | '^' | '\\' | '`' | ('\u0000'..'\u0020')) )* GREATER ; LANGTAG : '@' ALPHA_CHARS+ (MINUS (DIGIT | ALPHA_CHARS)+)* ; - + fragment ALPHA_CHARS : 'a'..'z' | 'A'..'Z' ; -BOOLEAN +BOOLEAN : 'true' | 'false' ; @@ -189,7 +189,7 @@ PN_CHARS : PN_CHARS_U | MINUS | DIGIT - | '\u00B7' + | '\u00B7' | '\u0300'..'\u036F' | '\u203F'..'\u2040' ; diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/GeneratingParsers.txt b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/GeneratingParsers.txt index 0df74fcc..652fa4de 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/GeneratingParsers.txt +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/GeneratingParsers.txt @@ -1,4 +1,4 @@ cd into Impl directory execute a command similar to this c:\ANTLR3.5\bin\antlrgen.bat -o . ../Grammars/OslcOrderBy.g -ignoring all the warnings \ No newline at end of file +ignoring all the warnings diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcOrderByLexer.cs b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcOrderByLexer.cs index 41241180..f15df242 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcOrderByLexer.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcOrderByLexer.cs @@ -96,7 +96,7 @@ private void mSCOPED_TERM() // ../Grammars/OslcOrderBy.g:7:15: 'scoped_term' { DebugLocation(7, 15); - Match("scoped_term"); + Match("scoped_term"); } @@ -132,7 +132,7 @@ private void mSIMPLE_TERM() // ../Grammars/OslcOrderBy.g:8:15: 'simple_term' { DebugLocation(8, 15); - Match("simple_term"); + Match("simple_term"); } @@ -168,7 +168,7 @@ private void mTERMS() // ../Grammars/OslcOrderBy.g:9:9: 'terms' { DebugLocation(9, 9); - Match("terms"); + Match("terms"); } @@ -249,7 +249,7 @@ private void mWS() } finally { DebugExitSubRule(1); } DebugLocation(68, 25); - _channel=Hidden; + _channel=Hidden; } @@ -307,7 +307,7 @@ private void mPNAME_NS() int pStart83 = CharIndex; int pStartLine83 = Line; int pStartCharPos83 = CharPositionInLine; - mPN_PREFIX(); + mPN_PREFIX(); p = new CommonToken(input, TokenTypes.Invalid, TokenChannels.Default, pStart83, CharIndex-1); p.Line = pStartLine83; p.CharPositionInLine = pStartCharPos83; @@ -319,7 +319,7 @@ private void mPNAME_NS() } finally { DebugExitSubRule(2); } DebugLocation(72, 20); - Match(':'); + Match(':'); } @@ -354,9 +354,9 @@ private void mPNAME_LN() // ../Grammars/OslcOrderBy.g:76:7: PNAME_NS PN_LOCAL { DebugLocation(76, 7); - mPNAME_NS(); + mPNAME_NS(); DebugLocation(76, 16); - mPN_LOCAL(); + mPN_LOCAL(); } @@ -519,7 +519,7 @@ private void mPN_PREFIX() // ../Grammars/OslcOrderBy.g:103:7: PN_CHARS_BASE ( ( PN_CHARS | DOT )* PN_CHARS )? { DebugLocation(103, 7); - mPN_CHARS_BASE(); + mPN_CHARS_BASE(); DebugLocation(103, 21); // ../Grammars/OslcOrderBy.g:103:21: ( ( PN_CHARS | DOT )* PN_CHARS )? int alt4=2; @@ -589,7 +589,7 @@ private void mPN_PREFIX() } finally { DebugExitSubRule(3); } DebugLocation(103, 38); - mPN_CHARS(); + mPN_CHARS(); } break; @@ -708,7 +708,7 @@ private void mPN_LOCAL() } finally { DebugExitSubRule(5); } DebugLocation(108, 47); - mPN_CHARS(); + mPN_CHARS(); } break; @@ -830,7 +830,7 @@ private void mDOT() // ../Grammars/OslcOrderBy.g:135:7: '.' { DebugLocation(135, 7); - Match('.'); + Match('.'); } @@ -905,7 +905,7 @@ private void mOPEN_CURLY_BRACE() // ../Grammars/OslcOrderBy.g:143:7: '{' { DebugLocation(143, 7); - Match('{'); + Match('{'); } @@ -940,7 +940,7 @@ private void mCLOSE_CURLY_BRACE() // ../Grammars/OslcOrderBy.g:147:7: '}' { DebugLocation(147, 7); - Match('}'); + Match('}'); } @@ -973,7 +973,7 @@ private void mPLUS() // ../Grammars/OslcOrderBy.g:153:7: '+' { DebugLocation(153, 7); - Match('+'); + Match('+'); } @@ -1004,7 +1004,7 @@ private void mMINUS() // ../Grammars/OslcOrderBy.g:158:7: '-' { DebugLocation(158, 7); - Match('-'); + Match('-'); } @@ -1037,7 +1037,7 @@ private void mASTERISK() // ../Grammars/OslcOrderBy.g:161:7: '*' { DebugLocation(161, 7); - Match('*'); + Match('*'); } @@ -1072,7 +1072,7 @@ private void mCOMMA() // ../Grammars/OslcOrderBy.g:165:7: ',' { DebugLocation(165, 7); - Match(','); + Match(','); } @@ -1110,7 +1110,7 @@ public override void mTokens() // ../Grammars/OslcOrderBy.g:1:10: SCOPED_TERM { DebugLocation(1, 10); - mSCOPED_TERM(); + mSCOPED_TERM(); } break; @@ -1119,7 +1119,7 @@ public override void mTokens() // ../Grammars/OslcOrderBy.g:1:22: SIMPLE_TERM { DebugLocation(1, 22); - mSIMPLE_TERM(); + mSIMPLE_TERM(); } break; @@ -1128,7 +1128,7 @@ public override void mTokens() // ../Grammars/OslcOrderBy.g:1:34: TERMS { DebugLocation(1, 34); - mTERMS(); + mTERMS(); } break; @@ -1137,7 +1137,7 @@ public override void mTokens() // ../Grammars/OslcOrderBy.g:1:40: WS { DebugLocation(1, 40); - mWS(); + mWS(); } break; @@ -1146,7 +1146,7 @@ public override void mTokens() // ../Grammars/OslcOrderBy.g:1:43: PNAME_NS { DebugLocation(1, 43); - mPNAME_NS(); + mPNAME_NS(); } break; @@ -1155,7 +1155,7 @@ public override void mTokens() // ../Grammars/OslcOrderBy.g:1:52: PNAME_LN { DebugLocation(1, 52); - mPNAME_LN(); + mPNAME_LN(); } break; @@ -1164,7 +1164,7 @@ public override void mTokens() // ../Grammars/OslcOrderBy.g:1:61: DIRECTION { DebugLocation(1, 61); - mDIRECTION(); + mDIRECTION(); } break; @@ -1173,7 +1173,7 @@ public override void mTokens() // ../Grammars/OslcOrderBy.g:1:71: OPEN_CURLY_BRACE { DebugLocation(1, 71); - mOPEN_CURLY_BRACE(); + mOPEN_CURLY_BRACE(); } break; @@ -1182,7 +1182,7 @@ public override void mTokens() // ../Grammars/OslcOrderBy.g:1:88: CLOSE_CURLY_BRACE { DebugLocation(1, 88); - mCLOSE_CURLY_BRACE(); + mCLOSE_CURLY_BRACE(); } break; @@ -1191,7 +1191,7 @@ public override void mTokens() // ../Grammars/OslcOrderBy.g:1:106: ASTERISK { DebugLocation(1, 106); - mASTERISK(); + mASTERISK(); } break; @@ -1200,7 +1200,7 @@ public override void mTokens() // ../Grammars/OslcOrderBy.g:1:115: COMMA { DebugLocation(1, 115); - mCOMMA(); + mCOMMA(); } break; @@ -1445,7 +1445,7 @@ public override void Error(NoViableAltException nvae) } } - + #endregion } diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcOrderByParser.cs b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcOrderByParser.cs index f3d761e2..5a107e02 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcOrderByParser.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcOrderByParser.cs @@ -28,20 +28,20 @@ using Antlr.Runtime.Tree; using RewriteRuleITokenStream = Antlr.Runtime.Tree.RewriteRuleTokenStream; -namespace OSLC4Net.Core.Query.Impl +namespace OSLC4Net.Core.Query.Impl { /****************************************************************************** * Copyright (c) 2013 IBM Corporation. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Eclipse Distribution License is available at + * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. * - * Contributors: + * Contributors: * * Steve Pitchke - initial API and implementation *******************************************************************************/ @@ -113,7 +113,7 @@ public OslcOrderByParser(string orderBy) : this(new CommonTokenStream(new OslcOrderByLexer(new ANTLRStringStream(orderBy)))) { } - + public object Result { get { return oslc_order_by().Tree; } @@ -246,7 +246,7 @@ private AstParserRuleReturnScope sort_terms() // ../Grammars/OslcOrderBy.g:46:27: ',' sort_term { DebugLocation(46, 27); - char_literal3=(IToken)Match(input,COMMA,Follow._COMMA_in_sort_terms86); + char_literal3=(IToken)Match(input,COMMA,Follow._COMMA_in_sort_terms86); stream_COMMA.Add(char_literal3); DebugLocation(46, 31); @@ -274,11 +274,11 @@ private AstParserRuleReturnScope sort_terms() { // AST REWRITE // elements: sort_term, sort_term, TERMS - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -408,7 +408,7 @@ private AstParserRuleReturnScope sort_term() // ../Grammars/OslcOrderBy.g:49:34: DIRECTION identifier { DebugLocation(49, 34); - DIRECTION6=(IToken)Match(input,DIRECTION,Follow._DIRECTION_in_sort_term124); + DIRECTION6=(IToken)Match(input,DIRECTION,Follow._DIRECTION_in_sort_term124); stream_DIRECTION.Add(DIRECTION6); DebugLocation(49, 44); @@ -422,11 +422,11 @@ private AstParserRuleReturnScope sort_term() { // AST REWRITE // elements: identifier, DIRECTION, SIMPLE_TERM - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -524,7 +524,7 @@ private AstParserRuleReturnScope scoped_sort_term() stream_identifier.Add(identifier8.Tree); DebugLocation(52, 31); - char_literal9=(IToken)Match(input,OPEN_CURLY_BRACE,Follow._OPEN_CURLY_BRACE_in_scoped_sort_term150); + char_literal9=(IToken)Match(input,OPEN_CURLY_BRACE,Follow._OPEN_CURLY_BRACE_in_scoped_sort_term150); stream_OPEN_CURLY_BRACE.Add(char_literal9); DebugLocation(52, 35); @@ -534,7 +534,7 @@ private AstParserRuleReturnScope scoped_sort_term() stream_sort_terms.Add(sort_terms10.Tree); DebugLocation(52, 46); - char_literal11=(IToken)Match(input,CLOSE_CURLY_BRACE,Follow._CLOSE_CURLY_BRACE_in_scoped_sort_term154); + char_literal11=(IToken)Match(input,CLOSE_CURLY_BRACE,Follow._CLOSE_CURLY_BRACE_in_scoped_sort_term154); stream_CLOSE_CURLY_BRACE.Add(char_literal11); @@ -542,11 +542,11 @@ private AstParserRuleReturnScope scoped_sort_term() { // AST REWRITE // elements: SCOPED_TERM, identifier, sort_terms - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -757,4 +757,4 @@ private static class Follow #endregion Follow sets } -} // namespace OSLC4Net.Core.Query.Impl +} // namespace OSLC4Net.Core.Query.Impl diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcPrefixLexer.cs b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcPrefixLexer.cs index 5f42fa83..1ea2c7a5 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcPrefixLexer.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcPrefixLexer.cs @@ -93,7 +93,7 @@ private void mPREFIX() // ../Grammars/OslcPrefix.g:7:10: 'prefix' { DebugLocation(7, 10); - Match("prefix"); + Match("prefix"); } @@ -129,7 +129,7 @@ private void mPREFIX_LIST() // ../Grammars/OslcPrefix.g:8:15: 'prefix_list' { DebugLocation(8, 15); - Match("prefix_list"); + Match("prefix_list"); } @@ -165,7 +165,7 @@ private void mT__21() // ../Grammars/OslcPrefix.g:9:9: '=' { DebugLocation(9, 9); - Match('='); + Match('='); } @@ -245,7 +245,7 @@ private void mWS() } finally { DebugExitSubRule(1); } DebugLocation(54, 25); - Skip(); + Skip(); } @@ -322,7 +322,7 @@ private void mPN_PREFIX() // ../Grammars/OslcPrefix.g:63:7: PN_CHARS_BASE ( ( PN_CHARS | DOT )* PN_CHARS )? { DebugLocation(63, 7); - mPN_CHARS_BASE(); + mPN_CHARS_BASE(); DebugLocation(63, 21); // ../Grammars/OslcPrefix.g:63:21: ( ( PN_CHARS | DOT )* PN_CHARS )? int alt3=2; @@ -392,7 +392,7 @@ private void mPN_PREFIX() } finally { DebugExitSubRule(2); } DebugLocation(63, 38); - mPN_CHARS(); + mPN_CHARS(); } break; @@ -602,7 +602,7 @@ private void mIRI_REF() // ../Grammars/OslcPrefix.g:104:7: LESS ( options {greedy=false; } :~ ( LESS | GREATER | '\"' | OPEN_CURLY_BRACE | CLOSE_CURLY_BRACE | '|' | '^' | '\\\\' | '`' | ( '\\u0000' .. '\\u0020' ) ) )* GREATER { DebugLocation(104, 7); - mLESS(); + mLESS(); DebugLocation(104, 12); // ../Grammars/OslcPrefix.g:104:12: ( options {greedy=false; } :~ ( LESS | GREATER | '\"' | OPEN_CURLY_BRACE | CLOSE_CURLY_BRACE | '|' | '^' | '\\\\' | '`' | ( '\\u0000' .. '\\u0020' ) ) )* try { DebugEnterSubRule(4); @@ -647,7 +647,7 @@ private void mIRI_REF() } finally { DebugExitSubRule(4); } DebugLocation(104, 154); - mGREATER(); + mGREATER(); } @@ -682,7 +682,7 @@ private void mCOMMA() // ../Grammars/OslcPrefix.g:108:7: ',' { DebugLocation(108, 7); - Match(','); + Match(','); } @@ -717,7 +717,7 @@ private void mDOT() // ../Grammars/OslcPrefix.g:112:7: '.' { DebugLocation(112, 7); - Match('.'); + Match('.'); } @@ -752,7 +752,7 @@ private void mMINUS() // ../Grammars/OslcPrefix.g:116:7: '-' { DebugLocation(116, 7); - Match('-'); + Match('-'); } @@ -787,7 +787,7 @@ private void mOPEN_CURLY_BRACE() // ../Grammars/OslcPrefix.g:120:7: '{' { DebugLocation(120, 7); - Match('{'); + Match('{'); } @@ -822,7 +822,7 @@ private void mCLOSE_CURLY_BRACE() // ../Grammars/OslcPrefix.g:124:7: '}' { DebugLocation(124, 7); - Match('}'); + Match('}'); } @@ -857,7 +857,7 @@ private void mLESS() // ../Grammars/OslcPrefix.g:128:7: '<' { DebugLocation(128, 7); - Match('<'); + Match('<'); } @@ -892,7 +892,7 @@ private void mGREATER() // ../Grammars/OslcPrefix.g:132:7: '>' { DebugLocation(132, 7); - Match('>'); + Match('>'); } @@ -1085,7 +1085,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:10: PREFIX { DebugLocation(1, 10); - mPREFIX(); + mPREFIX(); } break; @@ -1094,7 +1094,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:17: PREFIX_LIST { DebugLocation(1, 17); - mPREFIX_LIST(); + mPREFIX_LIST(); } break; @@ -1103,7 +1103,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:29: T__21 { DebugLocation(1, 29); - mT__21(); + mT__21(); } break; @@ -1112,7 +1112,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:35: WS { DebugLocation(1, 35); - mWS(); + mWS(); } break; @@ -1121,7 +1121,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:38: PN_PREFIX { DebugLocation(1, 38); - mPN_PREFIX(); + mPN_PREFIX(); } break; @@ -1130,7 +1130,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:48: IRI_REF { DebugLocation(1, 48); - mIRI_REF(); + mIRI_REF(); } break; @@ -1139,7 +1139,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:56: COMMA { DebugLocation(1, 56); - mCOMMA(); + mCOMMA(); } break; @@ -1148,7 +1148,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:62: DOT { DebugLocation(1, 62); - mDOT(); + mDOT(); } break; @@ -1157,7 +1157,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:66: MINUS { DebugLocation(1, 66); - mMINUS(); + mMINUS(); } break; @@ -1166,7 +1166,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:72: OPEN_CURLY_BRACE { DebugLocation(1, 72); - mOPEN_CURLY_BRACE(); + mOPEN_CURLY_BRACE(); } break; @@ -1175,7 +1175,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:89: CLOSE_CURLY_BRACE { DebugLocation(1, 89); - mCLOSE_CURLY_BRACE(); + mCLOSE_CURLY_BRACE(); } break; @@ -1184,7 +1184,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:107: LESS { DebugLocation(1, 107); - mLESS(); + mLESS(); } break; @@ -1193,7 +1193,7 @@ public override void mTokens() // ../Grammars/OslcPrefix.g:1:112: GREATER { DebugLocation(1, 112); - mGREATER(); + mGREATER(); } break; @@ -1210,7 +1210,7 @@ protected override void InitDFAs() base.InitDFAs(); } - + #endregion } diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcPrefixParser.cs b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcPrefixParser.cs index 73a16274..ee33f353 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcPrefixParser.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcPrefixParser.cs @@ -28,20 +28,20 @@ using Antlr.Runtime.Tree; using RewriteRuleITokenStream = Antlr.Runtime.Tree.RewriteRuleTokenStream; -namespace OSLC4Net.Core.Query.Impl +namespace OSLC4Net.Core.Query.Impl { /****************************************************************************** * Copyright (c) 2013 IBM Corporation. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Eclipse Distribution License is available at + * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. * - * Contributors: + * Contributors: * * Steve Pitchke - initial API and implementation *******************************************************************************/ @@ -110,11 +110,11 @@ public OslcPrefixParser(string prefixes) : this(new CommonTokenStream(new OslcPrefixLexer(new ANTLRStringStream(prefixes)))) { } - + public object Result { get { return oslc_prefixes().Tree; } - } + } partial void OnCreated(); @@ -181,7 +181,7 @@ private AstParserRuleReturnScope oslc_prefixes() // ../Grammars/OslcPrefix.g:43:37: ',' prefix_binding { DebugLocation(43, 37); - char_literal2=(IToken)Match(input,COMMA,Follow._COMMA_in_oslc_prefixes73); + char_literal2=(IToken)Match(input,COMMA,Follow._COMMA_in_oslc_prefixes73); stream_COMMA.Add(char_literal2); DebugLocation(43, 41); @@ -209,11 +209,11 @@ private AstParserRuleReturnScope oslc_prefixes() { // AST REWRITE // elements: prefix_binding, PREFIX_LIST, prefix_binding - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -309,15 +309,15 @@ private AstParserRuleReturnScope prefix_binding() // ../Grammars/OslcPrefix.g:46:18: PN_PREFIX '=' IRI_REF { DebugLocation(46, 18); - PN_PREFIX4=(IToken)Match(input,PN_PREFIX,Follow._PN_PREFIX_in_prefix_binding105); + PN_PREFIX4=(IToken)Match(input,PN_PREFIX,Follow._PN_PREFIX_in_prefix_binding105); stream_PN_PREFIX.Add(PN_PREFIX4); DebugLocation(46, 28); - char_literal5=(IToken)Match(input,21,Follow._21_in_prefix_binding107); + char_literal5=(IToken)Match(input,21,Follow._21_in_prefix_binding107); stream_21.Add(char_literal5); DebugLocation(46, 32); - IRI_REF6=(IToken)Match(input,IRI_REF,Follow._IRI_REF_in_prefix_binding109); + IRI_REF6=(IToken)Match(input,IRI_REF,Follow._IRI_REF_in_prefix_binding109); stream_IRI_REF.Add(IRI_REF6); @@ -325,11 +325,11 @@ private AstParserRuleReturnScope prefix_binding() { // AST REWRITE // elements: IRI_REF, PREFIX, PN_PREFIX - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -399,4 +399,4 @@ private static class Follow #endregion Follow sets } -} // namespace OSLC4Net.Core.Query.Impl +} // namespace OSLC4Net.Core.Query.Impl diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSearchTermsLexer.cs b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSearchTermsLexer.cs index 240e7ac6..00a231fc 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSearchTermsLexer.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSearchTermsLexer.cs @@ -81,7 +81,7 @@ private void mSTRING_LIST() // ../Grammars/OslcSearchTerms.g:7:15: 'string_list' { DebugLocation(7, 15); - Match("string_list"); + Match("string_list"); } @@ -162,7 +162,7 @@ private void mWS() } finally { DebugExitSubRule(1); } DebugLocation(51, 25); - _channel=Hidden; + _channel=Hidden; } @@ -239,7 +239,7 @@ private void mSTRING_LITERAL() // ../Grammars/OslcSearchTerms.g:60:7: '\"' ( options {greedy=false; } :~ ( '\\u0022' | '\\u005C' | '\\u000A' | '\\u000D' ) | ECHAR )* '\"' { DebugLocation(60, 7); - Match('\"'); + Match('\"'); DebugLocation(60, 12); // ../Grammars/OslcSearchTerms.g:60:12: ( options {greedy=false; } :~ ( '\\u0022' | '\\u005C' | '\\u000A' | '\\u000D' ) | ECHAR )* try { DebugEnterSubRule(2); @@ -281,7 +281,7 @@ private void mSTRING_LITERAL() // ../Grammars/OslcSearchTerms.g:60:87: ECHAR { DebugLocation(60, 87); - mECHAR(); + mECHAR(); } break; @@ -297,7 +297,7 @@ private void mSTRING_LITERAL() } finally { DebugExitSubRule(2); } DebugLocation(60, 96); - Match('\"'); + Match('\"'); } @@ -330,7 +330,7 @@ private void mECHAR() // ../Grammars/OslcSearchTerms.g:66:7: '\\\\' ( 't' | 'b' | 'n' | 'r' | 'f' | '\\\\' | '\"' | '\\'' ) { DebugLocation(66, 7); - Match('\\'); + Match('\\'); DebugLocation(66, 12); if (input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t') { @@ -376,7 +376,7 @@ private void mCOMMA() // ../Grammars/OslcSearchTerms.g:69:7: ',' { DebugLocation(69, 7); - Match(','); + Match(','); } @@ -438,7 +438,7 @@ public override void mTokens() // ../Grammars/OslcSearchTerms.g:1:10: STRING_LIST { DebugLocation(1, 10); - mSTRING_LIST(); + mSTRING_LIST(); } break; @@ -447,7 +447,7 @@ public override void mTokens() // ../Grammars/OslcSearchTerms.g:1:22: WS { DebugLocation(1, 22); - mWS(); + mWS(); } break; @@ -456,7 +456,7 @@ public override void mTokens() // ../Grammars/OslcSearchTerms.g:1:25: STRING_LITERAL { DebugLocation(1, 25); - mSTRING_LITERAL(); + mSTRING_LITERAL(); } break; @@ -465,7 +465,7 @@ public override void mTokens() // ../Grammars/OslcSearchTerms.g:1:40: COMMA { DebugLocation(1, 40); - mCOMMA(); + mCOMMA(); } break; @@ -482,7 +482,7 @@ protected override void InitDFAs() base.InitDFAs(); } - + #endregion } diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSearchTermsParser.cs b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSearchTermsParser.cs index ba6df129..cdd3ccf7 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSearchTermsParser.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSearchTermsParser.cs @@ -28,20 +28,20 @@ using Antlr.Runtime.Tree; using RewriteRuleITokenStream = Antlr.Runtime.Tree.RewriteRuleTokenStream; -namespace OSLC4Net.Core.Query.Impl +namespace OSLC4Net.Core.Query.Impl { /****************************************************************************** * Copyright (c) 2013 IBM Corporation. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Eclipse Distribution License is available at + * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. * - * Contributors: + * Contributors: * * Steve Pitchke - initial API and implementation *******************************************************************************/ @@ -98,11 +98,11 @@ public OslcSearchTermsParser(string searcTerms) : this(new CommonTokenStream(new OslcSearchTermsLexer(new ANTLRStringStream(searcTerms)))) { } - + public object Result { get { return oslc_search_terms().Tree; } - } + } partial void OnCreated(); @@ -169,7 +169,7 @@ private AstParserRuleReturnScope oslc_search_terms() // ../Grammars/OslcSearchTerms.g:41:37: ',' string_esc { DebugLocation(41, 37); - char_literal2=(IToken)Match(input,COMMA,Follow._COMMA_in_oslc_search_terms64); + char_literal2=(IToken)Match(input,COMMA,Follow._COMMA_in_oslc_search_terms64); stream_COMMA.Add(char_literal2); DebugLocation(41, 41); @@ -197,11 +197,11 @@ private AstParserRuleReturnScope oslc_search_terms() { // AST REWRITE // elements: string_esc, STRING_LIST, string_esc - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -292,7 +292,7 @@ private AstParserRuleReturnScope string_esc() root_0 = (object)adaptor.Nil(); DebugLocation(44, 17); - STRING_LITERAL4=(IToken)Match(input,STRING_LITERAL,Follow._STRING_LITERAL_in_string_esc97); + STRING_LITERAL4=(IToken)Match(input,STRING_LITERAL,Follow._STRING_LITERAL_in_string_esc97); STRING_LITERAL4_tree = (object)adaptor.Create(STRING_LITERAL4); adaptor.AddChild(root_0, STRING_LITERAL4_tree); @@ -337,4 +337,4 @@ private static class Follow #endregion Follow sets } -} // namespace OSLC4Net.Core.Query.Impl +} // namespace OSLC4Net.Core.Query.Impl diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSelectLexer.cs b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSelectLexer.cs index a1e8a824..ed243208 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSelectLexer.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSelectLexer.cs @@ -98,7 +98,7 @@ private void mNESTED_PROPERTIES() // ../Grammars/OslcSelect.g:7:21: 'nested_property' { DebugLocation(7, 21); - Match("nested_property"); + Match("nested_property"); } @@ -134,7 +134,7 @@ private void mPREFIXED_NAME() // ../Grammars/OslcSelect.g:8:17: 'prefixed_name' { DebugLocation(8, 17); - Match("prefixed_name"); + Match("prefixed_name"); } @@ -170,7 +170,7 @@ private void mPROPERTIES() // ../Grammars/OslcSelect.g:9:14: 'properties' { DebugLocation(9, 14); - Match("properties"); + Match("properties"); } @@ -206,7 +206,7 @@ private void mWILDCARD() // ../Grammars/OslcSelect.g:10:12: 'wildcard' { DebugLocation(10, 12); - Match("wildcard"); + Match("wildcard"); } @@ -287,7 +287,7 @@ private void mWS() } finally { DebugExitSubRule(1); } DebugLocation(71, 25); - _channel=Hidden; + _channel=Hidden; } @@ -345,7 +345,7 @@ private void mPNAME_NS() int pStart91 = CharIndex; int pStartLine91 = Line; int pStartCharPos91 = CharPositionInLine; - mPN_PREFIX(); + mPN_PREFIX(); p = new CommonToken(input, TokenTypes.Invalid, TokenChannels.Default, pStart91, CharIndex-1); p.Line = pStartLine91; p.CharPositionInLine = pStartCharPos91; @@ -357,7 +357,7 @@ private void mPNAME_NS() } finally { DebugExitSubRule(2); } DebugLocation(75, 20); - Match(':'); + Match(':'); } @@ -392,9 +392,9 @@ private void mPNAME_LN() // ../Grammars/OslcSelect.g:79:7: PNAME_NS PN_LOCAL { DebugLocation(79, 7); - mPNAME_NS(); + mPNAME_NS(); DebugLocation(79, 16); - mPN_LOCAL(); + mPN_LOCAL(); } @@ -427,7 +427,7 @@ private void mECHAR() // ../Grammars/OslcSelect.g:85:7: '\\\\' ( 't' | 'b' | 'n' | 'r' | 'f' | '\\\\' | '\"' | '\\'' ) { DebugLocation(85, 7); - Match('\\'); + Match('\\'); DebugLocation(85, 12); if (input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t') { @@ -555,7 +555,7 @@ private void mPN_PREFIX() // ../Grammars/OslcSelect.g:105:7: PN_CHARS_BASE ( ( PN_CHARS | DOT )* PN_CHARS )? { DebugLocation(105, 7); - mPN_CHARS_BASE(); + mPN_CHARS_BASE(); DebugLocation(105, 21); // ../Grammars/OslcSelect.g:105:21: ( ( PN_CHARS | DOT )* PN_CHARS )? int alt4=2; @@ -625,7 +625,7 @@ private void mPN_PREFIX() } finally { DebugExitSubRule(3); } DebugLocation(105, 38); - mPN_CHARS(); + mPN_CHARS(); } break; @@ -744,7 +744,7 @@ private void mPN_LOCAL() } finally { DebugExitSubRule(5); } DebugLocation(110, 47); - mPN_CHARS(); + mPN_CHARS(); } break; @@ -910,7 +910,7 @@ private void mOPEN_CURLY_BRACE() // ../Grammars/OslcSelect.g:140:7: '{' { DebugLocation(140, 7); - Match('{'); + Match('{'); } @@ -945,7 +945,7 @@ private void mCLOSE_CURLY_BRACE() // ../Grammars/OslcSelect.g:144:7: '}' { DebugLocation(144, 7); - Match('}'); + Match('}'); } @@ -980,7 +980,7 @@ private void mDOT() // ../Grammars/OslcSelect.g:148:7: '.' { DebugLocation(148, 7); - Match('.'); + Match('.'); } @@ -1015,7 +1015,7 @@ private void mPLUS() // ../Grammars/OslcSelect.g:152:7: '+' { DebugLocation(152, 7); - Match('+'); + Match('+'); } @@ -1050,7 +1050,7 @@ private void mMINUS() // ../Grammars/OslcSelect.g:156:7: '-' { DebugLocation(156, 7); - Match('-'); + Match('-'); } @@ -1085,7 +1085,7 @@ private void mASTERISK() // ../Grammars/OslcSelect.g:160:7: '*' { DebugLocation(160, 7); - Match('*'); + Match('*'); } @@ -1120,7 +1120,7 @@ private void mCOMMA() // ../Grammars/OslcSelect.g:164:7: ',' { DebugLocation(164, 7); - Match(','); + Match(','); } @@ -1155,7 +1155,7 @@ private void mNOT() // ../Grammars/OslcSelect.g:168:7: '!' { DebugLocation(168, 7); - Match('!'); + Match('!'); } @@ -1193,7 +1193,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:10: NESTED_PROPERTIES { DebugLocation(1, 10); - mNESTED_PROPERTIES(); + mNESTED_PROPERTIES(); } break; @@ -1202,7 +1202,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:28: PREFIXED_NAME { DebugLocation(1, 28); - mPREFIXED_NAME(); + mPREFIXED_NAME(); } break; @@ -1211,7 +1211,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:42: PROPERTIES { DebugLocation(1, 42); - mPROPERTIES(); + mPROPERTIES(); } break; @@ -1220,7 +1220,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:53: WILDCARD { DebugLocation(1, 53); - mWILDCARD(); + mWILDCARD(); } break; @@ -1229,7 +1229,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:62: WS { DebugLocation(1, 62); - mWS(); + mWS(); } break; @@ -1238,7 +1238,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:65: PNAME_NS { DebugLocation(1, 65); - mPNAME_NS(); + mPNAME_NS(); } break; @@ -1247,7 +1247,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:74: PNAME_LN { DebugLocation(1, 74); - mPNAME_LN(); + mPNAME_LN(); } break; @@ -1256,7 +1256,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:83: OPEN_CURLY_BRACE { DebugLocation(1, 83); - mOPEN_CURLY_BRACE(); + mOPEN_CURLY_BRACE(); } break; @@ -1265,7 +1265,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:100: CLOSE_CURLY_BRACE { DebugLocation(1, 100); - mCLOSE_CURLY_BRACE(); + mCLOSE_CURLY_BRACE(); } break; @@ -1274,7 +1274,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:118: DOT { DebugLocation(1, 118); - mDOT(); + mDOT(); } break; @@ -1283,7 +1283,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:122: PLUS { DebugLocation(1, 122); - mPLUS(); + mPLUS(); } break; @@ -1292,7 +1292,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:127: MINUS { DebugLocation(1, 127); - mMINUS(); + mMINUS(); } break; @@ -1301,7 +1301,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:133: ASTERISK { DebugLocation(1, 133); - mASTERISK(); + mASTERISK(); } break; @@ -1310,7 +1310,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:142: COMMA { DebugLocation(1, 142); - mCOMMA(); + mCOMMA(); } break; @@ -1319,7 +1319,7 @@ public override void mTokens() // ../Grammars/OslcSelect.g:1:148: NOT { DebugLocation(1, 148); - mNOT(); + mNOT(); } break; @@ -1660,7 +1660,7 @@ public override void Error(NoViableAltException nvae) } } - + #endregion } diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSelectParser.cs b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSelectParser.cs index 26bae1a3..d18483b1 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSelectParser.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcSelectParser.cs @@ -28,20 +28,20 @@ using Antlr.Runtime.Tree; using RewriteRuleITokenStream = Antlr.Runtime.Tree.RewriteRuleTokenStream; -namespace OSLC4Net.Core.Query.Impl +namespace OSLC4Net.Core.Query.Impl { /****************************************************************************** * Copyright (c) 2013 IBM Corporation. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Eclipse Distribution License is available at + * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. * - * Contributors: + * Contributors: * * Steve Pitchke - initial API and implementation *******************************************************************************/ @@ -115,7 +115,7 @@ public OslcSelectParser(string select) : this(new CommonTokenStream(new OslcSelectLexer(new ANTLRStringStream(select)))) { } - + public object Result { get { return oslc_select().Tree; } @@ -248,7 +248,7 @@ private AstParserRuleReturnScope properties() // ../Grammars/OslcSelect.g:47:26: ',' property { DebugLocation(47, 26); - char_literal3=(IToken)Match(input,COMMA,Follow._COMMA_in_properties93); + char_literal3=(IToken)Match(input,COMMA,Follow._COMMA_in_properties93); stream_COMMA.Add(char_literal3); DebugLocation(47, 30); @@ -276,11 +276,11 @@ private AstParserRuleReturnScope properties() { // AST REWRITE // elements: PROPERTIES, property, property - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -515,7 +515,7 @@ private AstParserRuleReturnScope nested_property() stream_identifier.Add(identifier7.Tree); DebugLocation(53, 30); - OPEN_CURLY_BRACE8=(IToken)Match(input,OPEN_CURLY_BRACE,Follow._OPEN_CURLY_BRACE_in_nested_property147); + OPEN_CURLY_BRACE8=(IToken)Match(input,OPEN_CURLY_BRACE,Follow._OPEN_CURLY_BRACE_in_nested_property147); stream_OPEN_CURLY_BRACE.Add(OPEN_CURLY_BRACE8); DebugLocation(53, 47); @@ -525,7 +525,7 @@ private AstParserRuleReturnScope nested_property() stream_properties.Add(properties9.Tree); DebugLocation(53, 58); - CLOSE_CURLY_BRACE10=(IToken)Match(input,CLOSE_CURLY_BRACE,Follow._CLOSE_CURLY_BRACE_in_nested_property151); + CLOSE_CURLY_BRACE10=(IToken)Match(input,CLOSE_CURLY_BRACE,Follow._CLOSE_CURLY_BRACE_in_nested_property151); stream_CLOSE_CURLY_BRACE.Add(CLOSE_CURLY_BRACE10); @@ -533,11 +533,11 @@ private AstParserRuleReturnScope nested_property() { // AST REWRITE // elements: properties, NESTED_PROPERTIES, identifier - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -654,11 +654,11 @@ private AstParserRuleReturnScope identifier() { // AST REWRITE // elements: prefixedName, PREFIXED_NAME - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -690,7 +690,7 @@ private AstParserRuleReturnScope identifier() // ../Grammars/OslcSelect.g:57:7: ASTERISK { DebugLocation(57, 7); - ASTERISK12=(IToken)Match(input,ASTERISK,Follow._ASTERISK_in_identifier191); + ASTERISK12=(IToken)Match(input,ASTERISK,Follow._ASTERISK_in_identifier191); stream_ASTERISK.Add(ASTERISK12); @@ -698,11 +698,11 @@ private AstParserRuleReturnScope identifier() { // AST REWRITE // elements: WILDCARD - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -848,4 +848,4 @@ private static class Follow #endregion Follow sets } -} // namespace OSLC4Net.Core.Query.Impl +} // namespace OSLC4Net.Core.Query.Impl diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcWhereLexer.cs b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcWhereLexer.cs index 075742ea..106a12a0 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcWhereLexer.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcWhereLexer.cs @@ -124,7 +124,7 @@ private void mCOMPOUND_TERM() // ../Grammars/OslcWhere.g:7:17: 'compound_term' { DebugLocation(7, 17); - Match("compound_term"); + Match("compound_term"); } @@ -160,7 +160,7 @@ private void mIN_TERM() // ../Grammars/OslcWhere.g:8:11: 'in_term' { DebugLocation(8, 11); - Match("in_term"); + Match("in_term"); } @@ -196,7 +196,7 @@ private void mIN_VALUES() // ../Grammars/OslcWhere.g:9:13: 'in_values' { DebugLocation(9, 13); - Match("in_values"); + Match("in_values"); } @@ -232,7 +232,7 @@ private void mLANGED_VALUE() // ../Grammars/OslcWhere.g:10:16: 'langed_value' { DebugLocation(10, 16); - Match("langed_value"); + Match("langed_value"); } @@ -268,7 +268,7 @@ private void mSIMPLE_TERM() // ../Grammars/OslcWhere.g:11:15: 'simple_term' { DebugLocation(11, 15); - Match("simple_term"); + Match("simple_term"); } @@ -304,7 +304,7 @@ private void mTERMS() // ../Grammars/OslcWhere.g:12:9: 'terms' { DebugLocation(12, 9); - Match("terms"); + Match("terms"); } @@ -340,7 +340,7 @@ private void mTYPED_VALUE() // ../Grammars/OslcWhere.g:13:15: 'typed_value' { DebugLocation(13, 15); - Match("typed_value"); + Match("typed_value"); } @@ -376,7 +376,7 @@ private void mT__50() // ../Grammars/OslcWhere.g:14:9: ' ' { DebugLocation(14, 9); - Match(' '); + Match(' '); } @@ -411,7 +411,7 @@ private void mT__51() // ../Grammars/OslcWhere.g:15:9: ' and ' { DebugLocation(15, 9); - Match(" and "); + Match(" and "); } @@ -447,7 +447,7 @@ private void mT__52() // ../Grammars/OslcWhere.g:16:9: ' in' { DebugLocation(16, 9); - Match(" in"); + Match(" in"); } @@ -528,7 +528,7 @@ private void mWS() } finally { DebugExitSubRule(1); } DebugLocation(135, 25); - _channel=Hidden; + _channel=Hidden; } @@ -586,7 +586,7 @@ private void mPNAME_NS() int pStart139 = CharIndex; int pStartLine139 = Line; int pStartCharPos139 = CharPositionInLine; - mPN_PREFIX(); + mPN_PREFIX(); p = new CommonToken(input, TokenTypes.Invalid, TokenChannels.Default, pStart139, CharIndex-1); p.Line = pStartLine139; p.CharPositionInLine = pStartCharPos139; @@ -598,7 +598,7 @@ private void mPNAME_NS() } finally { DebugExitSubRule(2); } DebugLocation(139, 20); - Match(':'); + Match(':'); } @@ -633,9 +633,9 @@ private void mPNAME_LN() // ../Grammars/OslcWhere.g:143:7: PNAME_NS PN_LOCAL { DebugLocation(143, 7); - mPNAME_NS(); + mPNAME_NS(); DebugLocation(143, 16); - mPN_LOCAL(); + mPN_LOCAL(); } @@ -670,7 +670,7 @@ private void mIRI_REF() // ../Grammars/OslcWhere.g:148:7: LESS ( options {greedy=false; } :~ ( LESS | GREATER | '\"' | OPEN_CURLY_BRACE | CLOSE_CURLY_BRACE | '|' | '^' | '\\\\' | '`' | ( '\\u0000' .. '\\u0020' ) ) )* GREATER { DebugLocation(148, 7); - mLESS(); + mLESS(); DebugLocation(148, 12); // ../Grammars/OslcWhere.g:148:12: ( options {greedy=false; } :~ ( LESS | GREATER | '\"' | OPEN_CURLY_BRACE | CLOSE_CURLY_BRACE | '|' | '^' | '\\\\' | '`' | ( '\\u0000' .. '\\u0020' ) ) )* try { DebugEnterSubRule(3); @@ -715,7 +715,7 @@ private void mIRI_REF() } finally { DebugExitSubRule(3); } DebugLocation(148, 154); - mGREATER(); + mGREATER(); } @@ -750,7 +750,7 @@ private void mLANGTAG() // ../Grammars/OslcWhere.g:153:7: '@' ( ALPHA_CHARS )+ ( MINUS ( DIGIT | ALPHA_CHARS )+ )* { DebugLocation(153, 7); - Match('@'); + Match('@'); DebugLocation(153, 11); // ../Grammars/OslcWhere.g:153:11: ( ALPHA_CHARS )+ int cnt4=0; @@ -819,7 +819,7 @@ private void mLANGTAG() // ../Grammars/OslcWhere.g:153:25: MINUS ( DIGIT | ALPHA_CHARS )+ { DebugLocation(153, 25); - mMINUS(); + mMINUS(); DebugLocation(153, 31); // ../Grammars/OslcWhere.g:153:31: ( DIGIT | ALPHA_CHARS )+ int cnt5=0; @@ -977,7 +977,7 @@ private void mBOOLEAN() // ../Grammars/OslcWhere.g:163:7: 'true' { DebugLocation(163, 7); - Match("true"); + Match("true"); } @@ -987,7 +987,7 @@ private void mBOOLEAN() // ../Grammars/OslcWhere.g:164:7: 'false' { DebugLocation(164, 7); - Match("false"); + Match("false"); } @@ -1113,7 +1113,7 @@ private void mDECIMAL() } finally { DebugExitSubRule(9); } DebugLocation(168, 30); - mDOT(); + mDOT(); DebugLocation(168, 34); // ../Grammars/OslcWhere.g:168:34: ( DIGIT )* try { DebugEnterSubRule(10); @@ -1189,7 +1189,7 @@ private void mDECIMAL() } finally { DebugExitSubRule(11); } DebugLocation(169, 23); - mDOT(); + mDOT(); DebugLocation(169, 27); // ../Grammars/OslcWhere.g:169:27: ( DIGIT )+ int cnt12=0; @@ -1351,7 +1351,7 @@ private void mSTRING_LITERAL() // ../Grammars/OslcWhere.g:174:7: '\"' ( options {greedy=false; } :~ ( '\\u0022' | '\\u005C' | '\\u000A' | '\\u000D' ) | ECHAR )* '\"' { DebugLocation(174, 7); - Match('\"'); + Match('\"'); DebugLocation(174, 12); // ../Grammars/OslcWhere.g:174:12: ( options {greedy=false; } :~ ( '\\u0022' | '\\u005C' | '\\u000A' | '\\u000D' ) | ECHAR )* try { DebugEnterSubRule(16); @@ -1393,7 +1393,7 @@ private void mSTRING_LITERAL() // ../Grammars/OslcWhere.g:174:87: ECHAR { DebugLocation(174, 87); - mECHAR(); + mECHAR(); } break; @@ -1409,7 +1409,7 @@ private void mSTRING_LITERAL() } finally { DebugExitSubRule(16); } DebugLocation(174, 96); - Match('\"'); + Match('\"'); } @@ -1442,7 +1442,7 @@ private void mECHAR() // ../Grammars/OslcWhere.g:180:7: '\\\\' ( 't' | 'b' | 'n' | 'r' | 'f' | '\\\\' | '\"' | '\\'' ) { DebugLocation(180, 7); - Match('\\'); + Match('\\'); DebugLocation(180, 12); if (input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t') { @@ -1570,7 +1570,7 @@ private void mPN_PREFIX() // ../Grammars/OslcWhere.g:200:7: PN_CHARS_BASE ( ( PN_CHARS | DOT )* PN_CHARS )? { DebugLocation(200, 7); - mPN_CHARS_BASE(); + mPN_CHARS_BASE(); DebugLocation(200, 21); // ../Grammars/OslcWhere.g:200:21: ( ( PN_CHARS | DOT )* PN_CHARS )? int alt18=2; @@ -1640,7 +1640,7 @@ private void mPN_PREFIX() } finally { DebugExitSubRule(17); } DebugLocation(200, 38); - mPN_CHARS(); + mPN_CHARS(); } break; @@ -1759,7 +1759,7 @@ private void mPN_LOCAL() } finally { DebugExitSubRule(19); } DebugLocation(205, 47); - mPN_CHARS(); + mPN_CHARS(); } break; @@ -1925,7 +1925,7 @@ private void mREFERENCE() // ../Grammars/OslcWhere.g:235:7: '^^' { DebugLocation(235, 7); - Match("^^"); + Match("^^"); } @@ -1961,7 +1961,7 @@ private void mLESS_EQUAL() // ../Grammars/OslcWhere.g:239:7: '<=' { DebugLocation(239, 7); - Match("<="); + Match("<="); } @@ -1997,7 +1997,7 @@ private void mGREATER_EQUAL() // ../Grammars/OslcWhere.g:243:7: '>=' { DebugLocation(243, 7); - Match(">="); + Match(">="); } @@ -2033,7 +2033,7 @@ private void mNOT_EQUAL() // ../Grammars/OslcWhere.g:247:7: '!=' { DebugLocation(247, 7); - Match("!="); + Match("!="); } @@ -2069,7 +2069,7 @@ private void mAND() // ../Grammars/OslcWhere.g:251:7: '&&' { DebugLocation(251, 7); - Match("&&"); + Match("&&"); } @@ -2105,7 +2105,7 @@ private void mOR() // ../Grammars/OslcWhere.g:255:7: '||' { DebugLocation(255, 7); - Match("||"); + Match("||"); } @@ -2141,7 +2141,7 @@ private void mOPEN_BRACE() // ../Grammars/OslcWhere.g:259:7: '(' { DebugLocation(259, 7); - Match('('); + Match('('); } @@ -2176,7 +2176,7 @@ private void mCLOSE_BRACE() // ../Grammars/OslcWhere.g:263:7: ')' { DebugLocation(263, 7); - Match(')'); + Match(')'); } @@ -2211,7 +2211,7 @@ private void mOPEN_CURLY_BRACE() // ../Grammars/OslcWhere.g:267:7: '{' { DebugLocation(267, 7); - Match('{'); + Match('{'); } @@ -2246,7 +2246,7 @@ private void mCLOSE_CURLY_BRACE() // ../Grammars/OslcWhere.g:271:7: '}' { DebugLocation(271, 7); - Match('}'); + Match('}'); } @@ -2281,7 +2281,7 @@ private void mOPEN_SQUARE_BRACE() // ../Grammars/OslcWhere.g:275:7: '[' { DebugLocation(275, 7); - Match('['); + Match('['); } @@ -2316,7 +2316,7 @@ private void mCLOSE_SQUARE_BRACE() // ../Grammars/OslcWhere.g:279:7: ']' { DebugLocation(279, 7); - Match(']'); + Match(']'); } @@ -2351,7 +2351,7 @@ private void mSEMICOLON() // ../Grammars/OslcWhere.g:283:7: ';' { DebugLocation(283, 7); - Match(';'); + Match(';'); } @@ -2386,7 +2386,7 @@ private void mDOT() // ../Grammars/OslcWhere.g:287:7: '.' { DebugLocation(287, 7); - Match('.'); + Match('.'); } @@ -2421,7 +2421,7 @@ private void mPLUS() // ../Grammars/OslcWhere.g:291:7: '+' { DebugLocation(291, 7); - Match('+'); + Match('+'); } @@ -2456,7 +2456,7 @@ private void mMINUS() // ../Grammars/OslcWhere.g:295:7: '-' { DebugLocation(295, 7); - Match('-'); + Match('-'); } @@ -2491,7 +2491,7 @@ private void mASTERISK() // ../Grammars/OslcWhere.g:299:7: '*' { DebugLocation(299, 7); - Match('*'); + Match('*'); } @@ -2526,7 +2526,7 @@ private void mCOMMA() // ../Grammars/OslcWhere.g:303:7: ',' { DebugLocation(303, 7); - Match(','); + Match(','); } @@ -2561,7 +2561,7 @@ private void mNOT() // ../Grammars/OslcWhere.g:307:7: '!' { DebugLocation(307, 7); - Match('!'); + Match('!'); } @@ -2596,7 +2596,7 @@ private void mEQUAL() // ../Grammars/OslcWhere.g:311:7: '=' { DebugLocation(311, 7); - Match('='); + Match('='); } @@ -2631,7 +2631,7 @@ private void mLESS() // ../Grammars/OslcWhere.g:315:7: '<' { DebugLocation(315, 7); - Match('<'); + Match('<'); } @@ -2666,7 +2666,7 @@ private void mGREATER() // ../Grammars/OslcWhere.g:319:7: '>' { DebugLocation(319, 7); - Match('>'); + Match('>'); } @@ -2704,7 +2704,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:10: COMPOUND_TERM { DebugLocation(1, 10); - mCOMPOUND_TERM(); + mCOMPOUND_TERM(); } break; @@ -2713,7 +2713,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:24: IN_TERM { DebugLocation(1, 24); - mIN_TERM(); + mIN_TERM(); } break; @@ -2722,7 +2722,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:32: IN_VALUES { DebugLocation(1, 32); - mIN_VALUES(); + mIN_VALUES(); } break; @@ -2731,7 +2731,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:42: LANGED_VALUE { DebugLocation(1, 42); - mLANGED_VALUE(); + mLANGED_VALUE(); } break; @@ -2740,7 +2740,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:55: SIMPLE_TERM { DebugLocation(1, 55); - mSIMPLE_TERM(); + mSIMPLE_TERM(); } break; @@ -2749,7 +2749,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:67: TERMS { DebugLocation(1, 67); - mTERMS(); + mTERMS(); } break; @@ -2758,7 +2758,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:73: TYPED_VALUE { DebugLocation(1, 73); - mTYPED_VALUE(); + mTYPED_VALUE(); } break; @@ -2767,7 +2767,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:85: T__50 { DebugLocation(1, 85); - mT__50(); + mT__50(); } break; @@ -2776,7 +2776,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:91: T__51 { DebugLocation(1, 91); - mT__51(); + mT__51(); } break; @@ -2785,7 +2785,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:97: T__52 { DebugLocation(1, 97); - mT__52(); + mT__52(); } break; @@ -2794,7 +2794,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:103: WS { DebugLocation(1, 103); - mWS(); + mWS(); } break; @@ -2803,7 +2803,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:106: PNAME_NS { DebugLocation(1, 106); - mPNAME_NS(); + mPNAME_NS(); } break; @@ -2812,7 +2812,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:115: PNAME_LN { DebugLocation(1, 115); - mPNAME_LN(); + mPNAME_LN(); } break; @@ -2821,7 +2821,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:124: IRI_REF { DebugLocation(1, 124); - mIRI_REF(); + mIRI_REF(); } break; @@ -2830,7 +2830,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:132: LANGTAG { DebugLocation(1, 132); - mLANGTAG(); + mLANGTAG(); } break; @@ -2839,7 +2839,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:140: BOOLEAN { DebugLocation(1, 140); - mBOOLEAN(); + mBOOLEAN(); } break; @@ -2848,7 +2848,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:148: DECIMAL { DebugLocation(1, 148); - mDECIMAL(); + mDECIMAL(); } break; @@ -2857,7 +2857,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:156: STRING_LITERAL { DebugLocation(1, 156); - mSTRING_LITERAL(); + mSTRING_LITERAL(); } break; @@ -2866,7 +2866,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:171: REFERENCE { DebugLocation(1, 171); - mREFERENCE(); + mREFERENCE(); } break; @@ -2875,7 +2875,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:181: LESS_EQUAL { DebugLocation(1, 181); - mLESS_EQUAL(); + mLESS_EQUAL(); } break; @@ -2884,7 +2884,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:192: GREATER_EQUAL { DebugLocation(1, 192); - mGREATER_EQUAL(); + mGREATER_EQUAL(); } break; @@ -2893,7 +2893,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:206: NOT_EQUAL { DebugLocation(1, 206); - mNOT_EQUAL(); + mNOT_EQUAL(); } break; @@ -2902,7 +2902,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:216: AND { DebugLocation(1, 216); - mAND(); + mAND(); } break; @@ -2911,7 +2911,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:220: OR { DebugLocation(1, 220); - mOR(); + mOR(); } break; @@ -2920,7 +2920,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:223: OPEN_BRACE { DebugLocation(1, 223); - mOPEN_BRACE(); + mOPEN_BRACE(); } break; @@ -2929,7 +2929,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:234: CLOSE_BRACE { DebugLocation(1, 234); - mCLOSE_BRACE(); + mCLOSE_BRACE(); } break; @@ -2938,7 +2938,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:246: OPEN_CURLY_BRACE { DebugLocation(1, 246); - mOPEN_CURLY_BRACE(); + mOPEN_CURLY_BRACE(); } break; @@ -2947,7 +2947,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:263: CLOSE_CURLY_BRACE { DebugLocation(1, 263); - mCLOSE_CURLY_BRACE(); + mCLOSE_CURLY_BRACE(); } break; @@ -2956,7 +2956,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:281: OPEN_SQUARE_BRACE { DebugLocation(1, 281); - mOPEN_SQUARE_BRACE(); + mOPEN_SQUARE_BRACE(); } break; @@ -2965,7 +2965,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:299: CLOSE_SQUARE_BRACE { DebugLocation(1, 299); - mCLOSE_SQUARE_BRACE(); + mCLOSE_SQUARE_BRACE(); } break; @@ -2974,7 +2974,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:318: SEMICOLON { DebugLocation(1, 318); - mSEMICOLON(); + mSEMICOLON(); } break; @@ -2983,7 +2983,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:328: DOT { DebugLocation(1, 328); - mDOT(); + mDOT(); } break; @@ -2992,7 +2992,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:332: PLUS { DebugLocation(1, 332); - mPLUS(); + mPLUS(); } break; @@ -3001,7 +3001,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:337: MINUS { DebugLocation(1, 337); - mMINUS(); + mMINUS(); } break; @@ -3010,7 +3010,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:343: ASTERISK { DebugLocation(1, 343); - mASTERISK(); + mASTERISK(); } break; @@ -3019,7 +3019,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:352: COMMA { DebugLocation(1, 352); - mCOMMA(); + mCOMMA(); } break; @@ -3028,7 +3028,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:358: NOT { DebugLocation(1, 358); - mNOT(); + mNOT(); } break; @@ -3037,7 +3037,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:362: EQUAL { DebugLocation(1, 362); - mEQUAL(); + mEQUAL(); } break; @@ -3046,7 +3046,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:368: LESS { DebugLocation(1, 368); - mLESS(); + mLESS(); } break; @@ -3055,7 +3055,7 @@ public override void mTokens() // ../Grammars/OslcWhere.g:1:373: GREATER { DebugLocation(1, 373); - mGREATER(); + mGREATER(); } break; @@ -3651,7 +3651,7 @@ public override void Error(NoViableAltException nvae) } } - + #endregion } diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcWhereParser.cs b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcWhereParser.cs index c0526496..1736f80b 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcWhereParser.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core.Query/Impl/OslcWhereParser.cs @@ -28,20 +28,20 @@ using Antlr.Runtime.Tree; using RewriteRuleITokenStream = Antlr.Runtime.Tree.RewriteRuleTokenStream; -namespace OSLC4Net.Core.Query.Impl +namespace OSLC4Net.Core.Query.Impl { /****************************************************************************** * Copyright (c) 2013 IBM Corporation. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v. 1.0 which accompanies this distribution. + * and Eclipse Distribution License v. 1.0 which accompanies this distribution. * * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Eclipse Distribution License is available at + * and the Eclipse Distribution License is available at * http://www.eclipse.org/org/documents/edl-v10.php. * - * Contributors: + * Contributors: * * Steve Pitchke - initial API and implementation *******************************************************************************/ @@ -141,7 +141,7 @@ public OslcWhereParser(string where) : this(new CommonTokenStream(new OslcWhereLexer(new ANTLRStringStream(where)))) { } - + public object Result { get { return oslc_where().Tree; } @@ -303,11 +303,11 @@ private AstParserRuleReturnScope compound_term() { // AST REWRITE // elements: TERMS, simple_term, simple_term - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -530,7 +530,7 @@ private AstParserRuleReturnScope space() root_0 = (object)adaptor.Nil(); DebugLocation(56, 20); - char_literal7=(IToken)Match(input,50,Follow._50_in_space177); + char_literal7=(IToken)Match(input,50,Follow._50_in_space177); } @@ -589,7 +589,7 @@ private AstParserRuleReturnScope boolean_op() root_0 = (object)adaptor.Nil(); DebugLocation(58, 24); - string_literal8=(IToken)Match(input,51,Follow._51_in_boolean_op190); + string_literal8=(IToken)Match(input,51,Follow._51_in_boolean_op190); } @@ -804,11 +804,11 @@ private AstParserRuleReturnScope term_simple() { // AST REWRITE // elements: comparison_op, SIMPLE_TERM, value, identifier_wc - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -951,11 +951,11 @@ private AstParserRuleReturnScope in_term() { // AST REWRITE // elements: in_val, IN_TERM, identifier_wc - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -1051,7 +1051,7 @@ private AstParserRuleReturnScope scoped_term() stream_identifier_wc.Add(identifier_wc18.Tree); DebugLocation(70, 31); - char_literal19=(IToken)Match(input,OPEN_CURLY_BRACE,Follow._OPEN_CURLY_BRACE_in_scoped_term277); + char_literal19=(IToken)Match(input,OPEN_CURLY_BRACE,Follow._OPEN_CURLY_BRACE_in_scoped_term277); stream_OPEN_CURLY_BRACE.Add(char_literal19); DebugLocation(70, 35); @@ -1061,7 +1061,7 @@ private AstParserRuleReturnScope scoped_term() stream_compound_term.Add(compound_term20.Tree); DebugLocation(70, 49); - char_literal21=(IToken)Match(input,CLOSE_CURLY_BRACE,Follow._CLOSE_CURLY_BRACE_in_scoped_term281); + char_literal21=(IToken)Match(input,CLOSE_CURLY_BRACE,Follow._CLOSE_CURLY_BRACE_in_scoped_term281); stream_CLOSE_CURLY_BRACE.Add(char_literal21); @@ -1069,11 +1069,11 @@ private AstParserRuleReturnScope scoped_term() { // AST REWRITE // elements: COMPOUND_TERM, compound_term, identifier_wc - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -1321,7 +1321,7 @@ private AstParserRuleReturnScope wildcard() root_0 = (object)adaptor.Nil(); DebugLocation(77, 17); - ASTERISK25=(IToken)Match(input,ASTERISK,Follow._ASTERISK_in_wildcard334); + ASTERISK25=(IToken)Match(input,ASTERISK,Follow._ASTERISK_in_wildcard334); ASTERISK25_tree = (object)adaptor.Create(ASTERISK25); adaptor.AddChild(root_0, ASTERISK25_tree); @@ -1455,7 +1455,7 @@ private AstParserRuleReturnScope in_op() root_0 = (object)adaptor.Nil(); DebugLocation(81, 17); - string_literal27=(IToken)Match(input,52,Follow._52_in_in_op380); + string_literal27=(IToken)Match(input,52,Follow._52_in_in_op380); string_literal27_tree = (object)adaptor.Create(string_literal27); adaptor.AddChild(root_0, string_literal27_tree); @@ -1524,7 +1524,7 @@ private AstParserRuleReturnScope in_val() // ../Grammars/OslcWhere.g:83:17: '[' value ( ',' value )* ']' { DebugLocation(83, 17); - char_literal28=(IToken)Match(input,OPEN_SQUARE_BRACE,Follow._OPEN_SQUARE_BRACE_in_in_val396); + char_literal28=(IToken)Match(input,OPEN_SQUARE_BRACE,Follow._OPEN_SQUARE_BRACE_in_in_val396); stream_OPEN_SQUARE_BRACE.Add(char_literal28); DebugLocation(83, 21); @@ -1556,7 +1556,7 @@ private AstParserRuleReturnScope in_val() // ../Grammars/OslcWhere.g:83:28: ',' value { DebugLocation(83, 28); - char_literal30=(IToken)Match(input,COMMA,Follow._COMMA_in_in_val401); + char_literal30=(IToken)Match(input,COMMA,Follow._COMMA_in_in_val401); stream_COMMA.Add(char_literal30); DebugLocation(83, 32); @@ -1580,7 +1580,7 @@ private AstParserRuleReturnScope in_val() } finally { DebugExitSubRule(6); } DebugLocation(83, 40); - char_literal32=(IToken)Match(input,CLOSE_SQUARE_BRACE,Follow._CLOSE_SQUARE_BRACE_in_in_val407); + char_literal32=(IToken)Match(input,CLOSE_SQUARE_BRACE,Follow._CLOSE_SQUARE_BRACE_in_in_val407); stream_CLOSE_SQUARE_BRACE.Add(char_literal32); @@ -1588,11 +1588,11 @@ private AstParserRuleReturnScope in_val() { // AST REWRITE // elements: value, IN_VALUES, value - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -1986,7 +1986,7 @@ private AstParserRuleReturnScope typed_string() // ../Grammars/OslcWhere.g:92:17: '^^' prefixedName { DebugLocation(92, 17); - string_literal41=(IToken)Match(input,REFERENCE,Follow._REFERENCE_in_typed_string486); + string_literal41=(IToken)Match(input,REFERENCE,Follow._REFERENCE_in_typed_string486); stream_REFERENCE.Add(string_literal41); DebugLocation(92, 22); @@ -2003,11 +2003,11 @@ private AstParserRuleReturnScope typed_string() { // AST REWRITE // elements: prefixedName, TYPED_VALUE, string_esc - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -2105,7 +2105,7 @@ private AstParserRuleReturnScope langed_string() stream_string_esc.Add(string_esc43.Tree); DebugLocation(96, 15); - LANGTAG44=(IToken)Match(input,LANGTAG,Follow._LANGTAG_in_langed_string518); + LANGTAG44=(IToken)Match(input,LANGTAG,Follow._LANGTAG_in_langed_string518); stream_LANGTAG.Add(LANGTAG44); @@ -2113,11 +2113,11 @@ private AstParserRuleReturnScope langed_string() { // AST REWRITE // elements: LANGED_VALUE, string_esc, LANGTAG - // token labels: + // token labels: // rule labels: retval - // token list labels: - // rule list labels: - // wildcard labels: + // token list labels: + // rule list labels: + // wildcard labels: retval.Tree = root_0; RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null); @@ -2201,7 +2201,7 @@ private AstParserRuleReturnScope boolean_val() root_0 = (object)adaptor.Nil(); DebugLocation(100, 17); - BOOLEAN45=(IToken)Match(input,BOOLEAN,Follow._BOOLEAN_in_boolean_val545); + BOOLEAN45=(IToken)Match(input,BOOLEAN,Follow._BOOLEAN_in_boolean_val545); BOOLEAN45_tree = (object)adaptor.Create(BOOLEAN45); adaptor.AddChild(root_0, BOOLEAN45_tree); @@ -2262,7 +2262,7 @@ private AstParserRuleReturnScope @decimal() root_0 = (object)adaptor.Nil(); DebugLocation(102, 17); - DECIMAL46=(IToken)Match(input,DECIMAL,Follow._DECIMAL_in_decimal560); + DECIMAL46=(IToken)Match(input,DECIMAL,Follow._DECIMAL_in_decimal560); DECIMAL46_tree = (object)adaptor.Create(DECIMAL46); adaptor.AddChild(root_0, DECIMAL46_tree); @@ -2323,7 +2323,7 @@ private AstParserRuleReturnScope string_esc() root_0 = (object)adaptor.Nil(); DebugLocation(104, 17); - STRING_LITERAL47=(IToken)Match(input,STRING_LITERAL,Follow._STRING_LITERAL_in_string_esc572); + STRING_LITERAL47=(IToken)Match(input,STRING_LITERAL,Follow._STRING_LITERAL_in_string_esc572); STRING_LITERAL47_tree = (object)adaptor.Create(STRING_LITERAL47); adaptor.AddChild(root_0, STRING_LITERAL47_tree); @@ -2414,7 +2414,7 @@ private AstParserRuleReturnScope properties() // ../Grammars/OslcWhere.g:107:12: ',' property { DebugLocation(107, 12); - char_literal49=(IToken)Match(input,COMMA,Follow._COMMA_in_properties588); + char_literal49=(IToken)Match(input,COMMA,Follow._COMMA_in_properties588); char_literal49_tree = (object)adaptor.Create(char_literal49); adaptor.AddChild(root_0, char_literal49_tree); DebugLocation(107, 16); @@ -2606,7 +2606,7 @@ private AstParserRuleReturnScope nested_property() root_0 = (object)adaptor.Nil(); DebugLocation(115, 2); - char_literal53=(IToken)Match(input,OPEN_CURLY_BRACE,Follow._OPEN_CURLY_BRACE_in_nested_property627); + char_literal53=(IToken)Match(input,OPEN_CURLY_BRACE,Follow._OPEN_CURLY_BRACE_in_nested_property627); char_literal53_tree = (object)adaptor.Create(char_literal53); adaptor.AddChild(root_0, char_literal53_tree); DebugLocation(115, 6); @@ -2638,7 +2638,7 @@ private AstParserRuleReturnScope nested_property() // ../Grammars/OslcWhere.g:115:16: ',' property { DebugLocation(115, 16); - char_literal55=(IToken)Match(input,COMMA,Follow._COMMA_in_nested_property632); + char_literal55=(IToken)Match(input,COMMA,Follow._COMMA_in_nested_property632); char_literal55_tree = (object)adaptor.Create(char_literal55); adaptor.AddChild(root_0, char_literal55_tree); DebugLocation(115, 20); @@ -2662,7 +2662,7 @@ private AstParserRuleReturnScope nested_property() } finally { DebugExitSubRule(11); } DebugLocation(115, 33); - char_literal57=(IToken)Match(input,CLOSE_CURLY_BRACE,Follow._CLOSE_CURLY_BRACE_in_nested_property640); + char_literal57=(IToken)Match(input,CLOSE_CURLY_BRACE,Follow._CLOSE_CURLY_BRACE_in_nested_property640); char_literal57_tree = (object)adaptor.Create(char_literal57); adaptor.AddChild(root_0, char_literal57_tree); @@ -2746,7 +2746,7 @@ private AstParserRuleReturnScope iriRef() root_0 = (object)adaptor.Nil(); DebugLocation(119, 7); - IRI_REF58=(IToken)Match(input,IRI_REF,Follow._IRI_REF_in_iriRef655); + IRI_REF58=(IToken)Match(input,IRI_REF,Follow._IRI_REF_in_iriRef655); IRI_REF58_tree = (object)adaptor.Create(IRI_REF58); adaptor.AddChild(root_0, IRI_REF58_tree); @@ -2935,4 +2935,4 @@ private static class Follow #endregion Follow sets } -} // namespace OSLC4Net.Core.Query.Impl +} // namespace OSLC4Net.Core.Query.Impl diff --git a/OSLC4Net_SDK/OSLC4Net.Core/Attribute/OslcAllowedValues.cs b/OSLC4Net_SDK/OSLC4Net.Core/Attribute/OslcAllowedValues.cs index bcc5487a..2d2a1498 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core/Attribute/OslcAllowedValues.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core/Attribute/OslcAllowedValues.cs @@ -25,7 +25,7 @@ namespace OSLC4Net.Core.Attribute; public class OslcAllowedValues : System.Attribute { /// - /// URI of the allowed values resource for the OSLC property. + /// URI of the allowed values resource for the OSLC property. /// public readonly string value; diff --git a/OSLC4Net_SDK/OSLC4Net.Core/Model/IResource.cs b/OSLC4Net_SDK/OSLC4Net.Core/Model/IResource.cs index 17c7dac6..eb59abef 100644 --- a/OSLC4Net_SDK/OSLC4Net.Core/Model/IResource.cs +++ b/OSLC4Net_SDK/OSLC4Net.Core/Model/IResource.cs @@ -28,4 +28,3 @@ public interface IResource [Obsolete("Use .About instead")] void SetAbout(Uri about); } - diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.DotNetRdfProviderTests/AllowedValuesSerializationTests.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Core.DotNetRdfProviderTests/AllowedValuesSerializationTests.cs index 6a9f32ad..fbcbef3c 100644 --- a/OSLC4Net_SDK/Tests/OSLC4Net.Core.DotNetRdfProviderTests/AllowedValuesSerializationTests.cs +++ b/OSLC4Net_SDK/Tests/OSLC4Net.Core.DotNetRdfProviderTests/AllowedValuesSerializationTests.cs @@ -35,4 +35,3 @@ public async Task TestAllowedValuesRoundTrip() await Verify(deserialized); } } - diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.DotNetRdfProviderTests/Properties/AssemblyInfo.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Core.DotNetRdfProviderTests/Properties/AssemblyInfo.cs index bded9bbd..848165ad 100644 --- a/OSLC4Net_SDK/Tests/OSLC4Net.Core.DotNetRdfProviderTests/Properties/AssemblyInfo.cs +++ b/OSLC4Net_SDK/Tests/OSLC4Net.Core.DotNetRdfProviderTests/Properties/AssemblyInfo.cs @@ -1,2 +1 @@ // File intentionally removed: COM interop settings are not needed in test projects targeting .NET 8. - diff --git a/OSLC4Net_SDK/Tests/OSLC4NetExamples.Server.Tests/Models/RootServicesDtoTests.cs b/OSLC4Net_SDK/Tests/OSLC4NetExamples.Server.Tests/Models/RootServicesDtoTests.cs index ed7691f9..05b6396e 100644 --- a/OSLC4Net_SDK/Tests/OSLC4NetExamples.Server.Tests/Models/RootServicesDtoTests.cs +++ b/OSLC4Net_SDK/Tests/OSLC4NetExamples.Server.Tests/Models/RootServicesDtoTests.cs @@ -19,7 +19,7 @@ public void DeserializeFromFile_ShouldCorrectlyParseRootServices1() { // Arrange var xmlContent = File.ReadAllText("TestData/rootservices.rdf"); Console.WriteLine($"XML Content: {xmlContent}"); - + // Act var result = RootServicesDto.FromXml(xmlContent); @@ -87,9 +87,9 @@ public void RoundTrip_DeserializeAndSerialize_ShouldMaintainDataIntegrity(string // Act - Serialize back to XML string serializedXmlContent; using (var stringWriter = new StringWriter()) - using (var xmlWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings - { - Indent = true, + using (var xmlWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings + { + Indent = true, IndentChars = " ", Encoding = Encoding.UTF8, OmitXmlDeclaration = false @@ -179,9 +179,9 @@ public void Serialize_ShouldProduceValidXmlDocument() // Act string xmlContent; using (var stringWriter = new StringWriter()) - using (var xmlWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings - { - Indent = true, + using (var xmlWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings + { + Indent = true, IndentChars = " ", Encoding = Encoding.UTF8, OmitXmlDeclaration = false @@ -210,7 +210,7 @@ public void Constructor_ShouldInitializeNamespacesCorrectly() // Assert dto.Namespaces.Should().NotBeNull(); - + // Check that all required namespaces are present var namespaces = new Dictionary(); dto.Namespaces.ToArray().ToList().ForEach(ns => namespaces.Add(ns.Name, ns.Namespace)); diff --git a/OSLC4Net_SDK/Tests/OSLC4NetExamples.Server.Tests/TestData/rootservices.rdf b/OSLC4Net_SDK/Tests/OSLC4NetExamples.Server.Tests/TestData/rootservices.rdf index e12e70c0..4513e37b 100644 --- a/OSLC4Net_SDK/Tests/OSLC4NetExamples.Server.Tests/TestData/rootservices.rdf +++ b/OSLC4Net_SDK/Tests/OSLC4NetExamples.Server.Tests/TestData/rootservices.rdf @@ -1,5 +1,5 @@ - - - \ No newline at end of file + diff --git a/misc/_static/logo.svg b/misc/_static/logo.svg index e8139eab..fecc486a 100644 --- a/misc/_static/logo.svg +++ b/misc/_static/logo.svg @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/misc/instructions/gov-uk-technical-content.md b/misc/instructions/gov-uk-technical-content.md index 5a842acc..69a84508 100644 --- a/misc/instructions/gov-uk-technical-content.md +++ b/misc/instructions/gov-uk-technical-content.md @@ -578,4 +578,4 @@ To emphasise words or phrases, you can: front-load sentences use headings -use bullets \ No newline at end of file +use bullets diff --git a/misc/instructions/iso-house-guide.md b/misc/instructions/iso-house-guide.md index 362e711a..7a8a4305 100644 --- a/misc/instructions/iso-house-guide.md +++ b/misc/instructions/iso-house-guide.md @@ -378,8 +378,8 @@ Use “e.g.” when giving an example in brackets or at the end of a sentence:  Use “for example” when the example is given as part of the sentence or to introduce a list: * “Applicable actions can include, for example, the provision of training or the re-assignment of personnel.”  -* “Processing can involve a range of processes, including, for example:  - —   addition of stabilizing agents;  +* “Processing can involve a range of processes, including, for example:  + —   addition of stabilizing agents;  —   homogenization prior to packaging.”  Use “i.e.” when clarifying a point or explaining something in another way: @@ -498,7 +498,7 @@ ISO documents use two formats for lists. * the penultimate list item does not include “and” or “or”, except to avoid ambiguity; * the final list item ends with a full stop. -EXAMPLES +EXAMPLES When preparing the Foreword, add all document-specific elements into the fixed text. * The number and title of the responsible TC and SC. @@ -618,4 +618,3 @@ For a duration of time, write: * “the twenty-first century” and not “the 21st century” In tables or figures, use the format “2020-10-31” (YYYY-MM-DD), as specified in [ISO 8601-1](https://www.iso.org/obp/ui/#iso:std:iso:8601:-1:ed-1:v1:en). Avoid ambiguous phrases such as “last year” or “recently” since a publication is likely to remain in use for several years. Give the date instead. - diff --git a/scripts/Generate-LlmTxt.ps1 b/scripts/Generate-LlmTxt.ps1 index b37399c0..147e76ad 100644 --- a/scripts/Generate-LlmTxt.ps1 +++ b/scripts/Generate-LlmTxt.ps1 @@ -22,11 +22,11 @@ function Get-AssemblySignature { try { # --- ATTEMPT 1: REFLECTION (Preferred, Cleaner Output) --- $asm = [System.Reflection.Assembly]::LoadFrom($DllPath) - + # Iterate over all exported types foreach ($type in $asm.GetExportedTypes()) { "Class: $($type.FullName)" - + # Get methods and signatures foreach ($method in $type.GetMethods([System.Reflection.BindingFlags]"Public,Instance,Static,DeclaredOnly")) { " Method: $($method.ReturnType.Name) $($method.Name)($(($method.GetParameters() | ForEach-Object { $_.ParameterType.Name }) -join ', '))" @@ -52,4 +52,4 @@ function Get-AssemblySignature { } # Run the function and pipe to Tee-Object -Get-AssemblySignature -DllPath $TargetDll | Tee-Object -FilePath $OutputFile \ No newline at end of file +Get-AssemblySignature -DllPath $TargetDll | Tee-Object -FilePath $OutputFile