forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'sharpen'

This commit is contained in:
Sam Harwell 2014-02-18 09:50:36 -06:00
parent d457eb9335 c15992da79
commit 424787bf43
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reference/antlr4

@ -1 +1 @@
Subproject commit 851cd3ce131ac59782ba12bd95f6d1f694843e5b
Subproject commit 5fb64ac91e36209b99e37a6356e66c41f5e50aab

4
runtime/CSharp/Antlr4.Runtime/Parser.cs
View File

@ -570,13 +570,13 @@ namespace Antlr4.Runtime
/// <exception cref="System.NotSupportedException">
/// if the current parser does not
/// implement the
/// <see cref="Recognizer{Symbol, ATNInterpreter}.GetSerializedATN()">Recognizer&lt;Symbol, ATNInterpreter&gt;.GetSerializedATN()</see>
/// <see cref="Recognizer{Symbol, ATNInterpreter}.SerializedAtn()">Recognizer&lt;Symbol, ATNInterpreter&gt;.SerializedAtn()</see>
/// method.
/// </exception>
[return: NotNull]
public virtual ATN GetATNWithBypassAlts()
{
string serializedAtn = GetSerializedATN();
string serializedAtn = SerializedAtn;
if (serializedAtn == null)
{
throw new NotSupportedException("The current parser does not support an ATN with bypass alternatives.");

5
runtime/CSharp/Antlr4.Runtime/Recognizer`2.cs
View File

@ -147,11 +147,14 @@ namespace Antlr4.Runtime
/// <p>For interpreters, we don't know their serialized ATN despite having
/// created the interpreter from it.</p>
/// </remarks>
public virtual string SerializedAtn
{
[return: NotNull]
public virtual string GetSerializedATN()
get
{
throw new NotSupportedException("there is no serialized ATN");
}
}
/// <summary>For debugging and other purposes, might want the grammar name.</summary>
/// <remarks>