diff --git a/GPPG.csproj b/GPPG.csproj
index 9d81b17..069d990 100644
--- a/GPPG.csproj
+++ b/GPPG.csproj
@@ -13,7 +13,8 @@
3.5
- v2.0
+ v4.0
+
true
@@ -36,6 +37,7 @@
+
diff --git a/ParserGenerator/SpecFiles/ScanAction.lex b/ParserGenerator/SpecFiles/ScanAction.lex
index f748ad2..b186fb5 100644
--- a/ParserGenerator/SpecFiles/ScanAction.lex
+++ b/ParserGenerator/SpecFiles/ScanAction.lex
@@ -34,15 +34,17 @@ kind <{kindChrs}+>
{
- \' colNo++; BEGIN(0);
+ ' colNo++; BEGIN(0);
{eol} handler.ListError(ErrSpan(1), 78);
- \\\' colNo += 2;
+ \\\\ |
+ \\' colNo += 2;
. colNo++;
}
{
\" colNo++; BEGIN(0);
{eol} handler.ListError(ErrSpan(1), 78);
+ \\\\ |
\\\" colNo += 2;
. colNo++;
}
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 33d1c6f..9a7aa22 100644
--- a/Properties/AssemblyInfo.cs
+++ b/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")]
diff --git a/ShiftReduceParser/ShiftReduceParserCode.cs b/ShiftReduceParser/ShiftReduceParserCode.cs
index 77e87f6..d8343bd 100644
--- a/ShiftReduceParser/ShiftReduceParserCode.cs
+++ b/ShiftReduceParser/ShiftReduceParserCode.cs
@@ -73,9 +73,9 @@ protected ShiftReduceParser(AbstractScanner scanner)
///
[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
{
+ ///
+ /// The number of states in the automaton.
+ ///
public int number;
#else
internal class State
@@ -931,4 +934,4 @@ internal T Pop()
internal bool IsEmpty() { return tos == 0; }
}
-}
\ No newline at end of file
+}