From c2145a4120607afa562dc23a84053c357cf9dc62 Mon Sep 17 00:00:00 2001 From: parrt Date: Sat, 26 Nov 2011 13:04:15 -0800 Subject: [PATCH] didn't store parser::members in combined grammar [git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9470] --- tool/src/org/antlr/v4/tool/Grammar.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tool/src/org/antlr/v4/tool/Grammar.java b/tool/src/org/antlr/v4/tool/Grammar.java index 1a76e95ac..ed47a558a 100644 --- a/tool/src/org/antlr/v4/tool/Grammar.java +++ b/tool/src/org/antlr/v4/tool/Grammar.java @@ -264,7 +264,8 @@ public class Grammar implements AttributeResolver { } else { String scope = atAST.getChild(0).getText(); - if ( scope.equals(getTypeString()) ) { + String gtype = getTypeString(); + if ( scope.equals(gtype) || (scope.equals("parser")&>ype.equals("combined")) ) { String name = atAST.getChild(1).getText(); namedActions.put(name, (ActionAST)atAST.getChild(2)); }