From 4fc32e1f7cd9882c13ad5a945bd378d4f117eb47 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 16 Jan 2014 10:34:55 -0600 Subject: [PATCH] Fix options not getting properly applied to extracted lexer in combined grammar (fixes #372) --- tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java b/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java index 52d69b2b9..33d966047 100644 --- a/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java +++ b/tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java @@ -302,7 +302,9 @@ public class GrammarTransformPipeline { if ( Grammar.lexerOptions.contains(optionName) && !Grammar.doNotCopyOptionsToLexer.contains(optionName) ) { - lexerOptionsRoot.addChild((Tree)adaptor.dupTree(o)); + GrammarAST optionTree = (GrammarAST)adaptor.dupTree(o); + lexerOptionsRoot.addChild(optionTree); + lexerAST.setOption(optionName, (GrammarAST)optionTree.getChild(1)); } } }