No commit message

GPPG.csproj

@@ -13,7 +13,8 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,6 +37,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="GPPGcopyright.rtf" />
   </ItemGroup>
   <ItemGroup>

ParserGenerator/SpecFiles/ScanAction.lex

@@ -34,15 +34,17 @@ kind     <{kindChrs}+>
 
 
 <LitChar>{
-  \'                   colNo++; BEGIN(0);
+  '                    colNo++; BEGIN(0);
   {eol}                handler.ListError(ErrSpan(1), 78);
-  \\\'                 colNo += 2;
+  \\\\                 |
+  \\'                  colNo += 2;
   .                    colNo++;
 }
 
 <LitString>{
   \"                   colNo++; BEGIN(0);
   {eol}                handler.ListError(ErrSpan(1), 78);
+  \\\\                 |
   \\\"                 colNo += 2;
   .                    colNo++;
 }

Properties/AssemblyInfo.cs

@@ -6,11 +6,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Gppg")]
-[assembly: AssemblyDescription("Gardens Point Parser Generator version 1.4.5 (2011-03-31)")]
+[assembly: AssemblyDescription("Gardens Point Parser Generator version 1.4.6 (2012-01-20)")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("QUT")]
 [assembly: AssemblyProduct("Gppg")]
-[assembly: AssemblyCopyright("Copyright © Wayne Kelly, John Gough 2005-2011")]
+[assembly: AssemblyCopyright("Copyright © Wayne Kelly, John Gough 2005-2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.4.5")]
-[assembly: AssemblyFileVersion("1.4.5")]
+[assembly: AssemblyVersion("1.4.6")]
+[assembly: AssemblyFileVersion("1.4.6")]

ShiftReduceParser/ShiftReduceParserCode.cs

@@ -73,9 +73,9 @@ protected ShiftReduceParser(AbstractScanner<TValue, TSpan> scanner)
         /// </summary>
         [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields")]
         protected TSpan CurrentLocationSpan;
+        protected int NextToken;
 
         private TSpan LastSpan;
-        private int NextToken;
         private State FsaState;
         private bool recovering;
         private int tokensSinceLastError;
@@ -787,6 +787,9 @@ public virtual void yyerror(string format, params object[] args) { }
 #if EXPORT_GPPG
     public class State
     {
+        /// <summary>
+        /// The number of states in the automaton.
+        /// </summary>
         public int number;
 #else
     internal class State
@@ -931,4 +934,4 @@ internal T Pop()
 
         internal bool IsEmpty() { return tos == 0; }
     }
-}
+}