Renamed to remove "Irony" from name; and tidied up PGIrony usings.

pgeerkens · May 11, 2016 · 31eb927 · 31eb927
1 parent a072128
commit 31eb927
Show file tree

Hide file tree

Showing 33 changed files with 82 additions and 201 deletions.
diff --git a/PGIrony/AbstractAstNode.cs b/PGIrony/AbstractAstNode.cs
@@ -11,12 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using System.Text;
-using System.CodeDom;
-using System.Xml;
-using System.IO;
 
-using Irony.Ast;
 using Irony.Parsing;
 
 // Additional bits and pieces needed in Irony.Ast

diff --git a/PGIrony/AstContext.cs b/PGIrony/AstContext.cs
@@ -8,9 +8,6 @@
  * *********************************************************************************/
 #endregion
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 using Irony.Ast;
 using Irony.Parsing;

diff --git a/PGIrony/MyFixedLengthLiteral.cs b/PGIrony/MyFixedLengthLiteral.cs
diff --git a/PGIrony/PGIrony.csproj b/PGIrony/PGIrony.csproj
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{970150DB-B109-4F5D-9F0B-AF8921B3D7F1}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PGSoftwareSolutionsInc.PGIrony</RootNamespace>
     <AssemblyName>PGIrony</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -26,19 +20,14 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\MyIrony.xml</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>
-    </DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\PGIrony.xml</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -47,29 +36,27 @@
     <AssemblyOriginatorKeyFile>PGIrony.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Irony, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ca48ace7223ead47, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Irony_2013_12_12\Irony\bin\Release\Irony.dll</HintPath>
+    <Reference Include="Irony">
+      <HintPath>..\..\bin\Irony\Release\Irony.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AbstractAstNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="AbstractAstNode.cs" />
     <Compile Include="AstContext.cs" />
+    <Compile Include="AstNode.cs" />
     <Compile Include="DataLiteralBase.cs" />
     <Compile Include="Grammar.cs" />
     <Compile Include="LogMessage.cs" />
     <Compile Include="NonTerminals.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="AstNode.cs" />
     <Compile Include="RegexBasedTerminalX.cs" />
     <Compile Include="Terminals.cs" />
   </ItemGroup>

diff --git a/PGIrony/PGIrony.snk b/PGIrony/PGIrony.snk
diff --git a/PGIrony/Properties/AssemblyInfo.cs b/PGIrony/Properties/AssemblyInfo.cs
@@ -1,25 +1,16 @@
-#region License - Microsoft Public License - from PG Software Solutions Inc.
-/***********************************************************************************
- * This software is copyright © 2012 by PG Software Solutions Inc. and licensed under
- * the Microsoft Public License (http://pgirony.codeplex.com/license).
- * 
- * Author:			Pieter Geerkens
- * Organization:	PG Software Solutions Inc.
- * *********************************************************************************/
-#endregion
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 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("MyIrony")]
+[assembly: AssemblyTitle("Test")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("PG Software Solutions Inc.")]
-[assembly: AssemblyProduct("MyIrony")]
-[assembly: AssemblyCopyright("Copyright © PG Software Solutions Inc. 2012")]
+[assembly: AssemblyProduct("Test")]
+[assembly: AssemblyCopyright("Copyright © PG Software Solutions Inc. 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,7 +20,7 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("22b78c7d-1cf6-4d36-8977-67b56e7d3373")]
+[assembly: Guid("30ec30f0-8c7f-49c1-83cf-28cf4247ed2a")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -41,7 +32,5 @@
 // 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.*")]
-#pragma warning disable
-[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.0.*")]
-#pragma warning restore
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/PGIrony/RegexBasedTerminalX.cs b/PGIrony/RegexBasedTerminalX.cs
@@ -21,20 +21,20 @@
 
 namespace PGSoftwareSolutionsInc.PGIrony {
 
-  /// <summary>Identical to Irony.Parsing.RegexBasedTerminal (as of 2012-09-29) except options 
-  /// Compiled and ExplicitCapture are automatically set.</summary>
-  public class RegexBasedTerminalX : Terminal {
-	  /// <summary>Identical to Irony.Parsing.RegexBasedTerminal (as of 2012-09-29) except options 
-	  /// Compiled and ExplicitCapture are automatically set.</summary>
-    public RegexBasedTerminalX(string pattern, params string[] prefixes) : base("name") {
+    /// <summary>Identical to <see cref="Irony.Parsing.RegexBasedTerminal"/> (as of 2012-09-29) except options 
+    /// Compiled and ExplicitCapture are automatically set.</summary>
+    public class RegexBasedTerminalX : Terminal {
+        /// <summary>Identical to <see cref="Irony.Parsing.RegexBasedTerminal"/> (as of 2012-09-29) except options 
+        /// Compiled and ExplicitCapture are automatically set.</summary>
+        public RegexBasedTerminalX(string pattern, params string[] prefixes) : base("name") {
       Pattern = pattern;
       if (prefixes != null)
         Prefixes.AddRange(prefixes);
 		Count++;
     }
-	  /// <summary>Identical to Irony.Parsing.RegexBasedTerminal (as of 2012-09-29) except options 
-	  /// Compiled and ExplicitCapture are automatically set.</summary>
-    public RegexBasedTerminalX(string name, string pattern, params string[] prefixes) : base(name) {
+        /// <summary>Identical to <see cref="Irony.Parsing.RegexBasedTerminal"/> (as of 2012-09-29) except options 
+        /// Compiled and ExplicitCapture are automatically set.</summary>
+        public RegexBasedTerminalX(string name, string pattern, params string[] prefixes) : base(name) {
       Pattern = pattern;
       if (prefixes != null)
         Prefixes.AddRange(prefixes);

diff --git a/PGIrony/Terminals.cs b/PGIrony/Terminals.cs
@@ -8,11 +8,7 @@
  * *********************************************************************************/
 #endregion
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
-using Irony;
 using Irony.Parsing;
 
 namespace PGSoftwareSolutionsInc.PGIrony {

diff --git a/QABCIronyParser/AwareNote.cs → Parser/AwareNote.cs b/QABCIronyParser/AwareNote.cs → Parser/AwareNote.cs
@@ -4,8 +4,6 @@
 //                   Copyright (C) Pieter Geerkens 2012
 ////////////////////////////////////////////////////////////////////////
 using System;
-using System.Collections.Generic;
-using System.Linq;
 
 using Irony.Parsing;
 

diff --git a/QABCIronyParser/KeySpec.cs → Parser/KeySpec.cs b/QABCIronyParser/KeySpec.cs → Parser/KeySpec.cs
@@ -4,9 +4,6 @@
 //                   Copyright (C) Pieter Geerkens 2012
 ////////////////////////////////////////////////////////////////////////
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 using Irony.Parsing;
 

diff --git a/QABCIronyParser/QabcIronyParser.csproj → Parser/Parser.csproj b/QABCIronyParser/QabcIronyParser.csproj → Parser/Parser.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PGSoftwareSolutionsInc.Util.PlayWaveLib</RootNamespace>
-    <AssemblyName>QABCIronyParser</AssemblyName>
+    <AssemblyName>QABCParser</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -33,7 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\QABCIronyParser.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\QABCParser.xml</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>

diff --git a/QABCIronyParser/Properties/AssemblyInfo.cs → Parser/Properties/AssemblyInfo.cs b/QABCIronyParser/Properties/AssemblyInfo.cs → Parser/Properties/AssemblyInfo.cs
diff --git a/QABCIronyParser/QabcAstContext.cs → Parser/QabcAstContext.cs b/QABCIronyParser/QabcAstContext.cs → Parser/QabcAstContext.cs
@@ -4,9 +4,6 @@
 //                   Copyright (C) Pieter Geerkens 2012
 ////////////////////////////////////////////////////////////////////////
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 using Irony.Ast;
 using Irony.Parsing;

diff --git a/QABCIronyParser/QabcAstNode.cs → Parser/QabcAstNode.cs b/QABCIronyParser/QabcAstNode.cs → Parser/QabcAstNode.cs
diff --git a/QABCIronyParser/QabcGrammar.cs → Parser/QabcGrammar.cs b/QABCIronyParser/QabcGrammar.cs → Parser/QabcGrammar.cs
@@ -13,7 +13,7 @@
 
 namespace PGSoftwareSolutionsInc.Qabc {
     /// <summary>TODO</summary>
-    [Irony.Parsing.Language("QABC", "1.0", "QBasic-ABC Parser")]
+    [Language("QABC", "1.0", "QBasic-ABC Parser")]
     public partial class QabcGrammar : PGIrony.Grammar<QabcAstContext> {
         private enum Dots { zero, one, two, three }
 
@@ -154,12 +154,12 @@ public QabcGrammar() : base(false) {
 
             #region 4-Color Highlighting
             SetHighlighting(
-                new List<Irony.Parsing.Terminal>() {ModePlay},
-                new List<Irony.Parsing.Terminal>() {Note},
-                new List<Irony.Parsing.Terminal>() {Rest},
-                new List<Irony.Parsing.Terminal>() {Mode, ModeStyle},
-                new List<Irony.Parsing.Terminal>() {NoteLetter,SharpFlat,Dot,Integer},
-                new List<Irony.Parsing.Terminal>() {Tempo,Length,Octave,Shift}
+                new List<Terminal>() {ModePlay},
+                new List<Terminal>() {Note},
+                new List<Terminal>() {Rest},
+                new List<Terminal>() {Mode, ModeStyle},
+                new List<Terminal>() {NoteLetter,SharpFlat,Dot,Integer},
+                new List<Terminal>() {Tempo,Length,Octave,Shift}
                 );
             #endregion 4-Color Highlighting
 
@@ -177,16 +177,17 @@ public QabcGrammar() : base(false) {
             #endregion
 
             MarkTransient(tune);
+            MarkTransient(beam);
             LanguageFlags = LanguageFlags.CreateAst | LanguageFlags.NewLineBeforeEOF;
         }
 
         /// <summary>Whitespace is part of this grammar, so we override the routine that skips it.</summary>
-        public override void SkipWhitespace(Irony.Parsing.ISourceStream source) { ; }
+        public override void SkipWhitespace(ISourceStream source) { ; }
 
         /// <summary>Provide MyGrammar with appropriate AstContext.</summary>
         /// <param name="language"></param>
         /// <returns></returns>
-        protected override QabcAstContext GetContext(Irony.Parsing.LanguageData language) {
+        protected override QabcAstContext GetContext(LanguageData language) {
             return new QabcAstContext(language);
         }
     }

diff --git a/QABCIronyParser/QabcIronyParser.cs → Parser/QabcIronyParser.cs b/QABCIronyParser/QabcIronyParser.cs → Parser/QabcIronyParser.cs
diff --git a/QABCIronyParser/QabcKey.cs → Parser/QabcKey.cs b/QABCIronyParser/QabcKey.cs → Parser/QabcKey.cs
diff --git a/QABCIronyParser/QabcParser.snk → Parser/QabcParser.snk b/QABCIronyParser/QabcParser.snk → Parser/QabcParser.snk
diff --git a/...er/Sample Tunes/Can You Recognize It.qabc → ...er/Sample Tunes/Can You Recognize It.qabc b/...er/Sample Tunes/Can You Recognize It.qabc → ...er/Sample Tunes/Can You Recognize It.qabc
diff --git a/...IronyParser/Sample Tunes/Doe, A Deer.qabc → Parser/Sample Tunes/Doe, A Deer.qabc b/...IronyParser/Sample Tunes/Doe, A Deer.qabc → Parser/Sample Tunes/Doe, A Deer.qabc
diff --git a/QABCIronyParser/Sample Tunes/Ecuador.qabc → Parser/Sample Tunes/Ecuador.qabc b/QABCIronyParser/Sample Tunes/Ecuador.qabc → Parser/Sample Tunes/Ecuador.qabc
diff --git a/...onyParser/Sample Tunes/Funeral March.qabc → Parser/Sample Tunes/Funeral March.qabc b/...onyParser/Sample Tunes/Funeral March.qabc → Parser/Sample Tunes/Funeral March.qabc
diff --git a/...rser/Sample Tunes/God Save The Queen.qabc → Parser/Sample Tunes/God Save The Queen.qabc b/...rser/Sample Tunes/God Save The Queen.qabc → Parser/Sample Tunes/God Save The Queen.qabc
diff --git a/...ronyParser/Sample Tunes/Jingle Bells.qabc → Parser/Sample Tunes/Jingle Bells.qabc b/...ronyParser/Sample Tunes/Jingle Bells.qabc → Parser/Sample Tunes/Jingle Bells.qabc
diff --git a/QABCIronyParser/Sample Tunes/Macarena.qabc → Parser/Sample Tunes/Macarena.qabc b/QABCIronyParser/Sample Tunes/Macarena.qabc → Parser/Sample Tunes/Macarena.qabc
diff --git a/QABCIronyParser/Sample Tunes/Popcorn.qabc → Parser/Sample Tunes/Popcorn.qabc b/QABCIronyParser/Sample Tunes/Popcorn.qabc → Parser/Sample Tunes/Popcorn.qabc
diff --git a/...e Tunes/Take Me Out To The Ball Game.qabc → ...e Tunes/Take Me Out To The Ball Game.qabc b/...e Tunes/Take Me Out To The Ball Game.qabc → ...e Tunes/Take Me Out To The Ball Game.qabc
diff --git a/...Sample Tunes/The Lion Sleeps Tonight.qabc → ...Sample Tunes/The Lion Sleeps Tonight.qabc b/...Sample Tunes/The Lion Sleeps Tonight.qabc → ...Sample Tunes/The Lion Sleeps Tonight.qabc
diff --git a/...e Tunes/William Tell Overture Finale.qabc → ...e Tunes/William Tell Overture Finale.qabc b/...e Tunes/William Tell Overture Finale.qabc → ...e Tunes/William Tell Overture Finale.qabc
diff --git a/...onyParser/Sample Tunes/Yankee Doodle.qabc → Parser/Sample Tunes/Yankee Doodle.qabc b/...onyParser/Sample Tunes/Yankee Doodle.qabc → Parser/Sample Tunes/Yankee Doodle.qabc
diff --git a/QABCIronyParser/TestGrammar.cs → Parser/TestGrammar.cs b/QABCIronyParser/TestGrammar.cs → Parser/TestGrammar.cs