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

Pass the ATN through the ATNSerializer prior to creating an interpreter (fixes #403)

This commit is contained in:
Sam Harwell 2014-01-13 20:17:04 -06:00
parent 2a177e07c3
commit 967e74aa0d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tool/src/org/antlr/v4/tool/Grammar.java
View File

@ -46,6 +46,8 @@ import org.antlr.v4.runtime.ParserInterpreter;
import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.TokenStream; import org.antlr.v4.runtime.TokenStream;
import org.antlr.v4.runtime.atn.ATN; import org.antlr.v4.runtime.atn.ATN;
import org.antlr.v4.runtime.atn.ATNDeserializer;
import org.antlr.v4.runtime.atn.ATNSerializer;
import org.antlr.v4.runtime.dfa.DFA; import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.misc.IntSet; import org.antlr.v4.runtime.misc.IntSet;
import org.antlr.v4.runtime.misc.IntegerList; import org.antlr.v4.runtime.misc.IntegerList;
@ -878,7 +880,9 @@ public class Grammar implements AttributeResolver {
return implicitLexer.createLexerInterpreter(input); return implicitLexer.createLexerInterpreter(input);
} }
return new LexerInterpreter(fileName, Arrays.asList(getTokenNames()), Arrays.asList(getRuleNames()), ((LexerGrammar)this).modes.keySet(), atn, input); char[] serializedAtn = ATNSerializer.getSerializedAsChars(atn);
ATN deserialized = new ATNDeserializer().deserialize(serializedAtn);
return new LexerInterpreter(fileName, Arrays.asList(getTokenNames()), Arrays.asList(getRuleNames()), ((LexerGrammar)this).modes.keySet(), deserialized, input);
} }
public ParserInterpreter createParserInterpreter(TokenStream tokenStream) { public ParserInterpreter createParserInterpreter(TokenStream tokenStream) {
@ -886,6 +890,8 @@ public class Grammar implements AttributeResolver {
throw new IllegalStateException("A parser interpreter can only be created for a parser or combined grammar."); throw new IllegalStateException("A parser interpreter can only be created for a parser or combined grammar.");
} }
return new ParserInterpreter(fileName, Arrays.asList(getTokenNames()), Arrays.asList(getRuleNames()), atn, tokenStream); char[] serializedAtn = ATNSerializer.getSerializedAsChars(atn);
ATN deserialized = new ATNDeserializer().deserialize(serializedAtn);
return new ParserInterpreter(fileName, Arrays.asList(getTokenNames()), Arrays.asList(getRuleNames()), deserialized, tokenStream);
} }
} }