1 files changed, 22 insertions, 25 deletions

diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java
index ce4b0ccfcaf..f5dd2ddd43b 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParser.java
@@ -30,7 +30,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPNodeFactory;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPBuildASTParserAction;
 import org.eclipse.cdt.core.dom.lrparser.action.cpp.CPPSecondaryParserFactory;
 
-public class CPPNoCastExpressionParser extends PrsStream implements RuleAction , IParserActionTokenProvider, IParser   
+public class CPPNoCastExpressionParser extends PrsStream implements RuleAction , IParserActionTokenProvider, IParser< IASTExpression >   
 {
     private static ParseTable prs = new CPPNoCastExpressionParserprs();
     private FixedBacktrackingParser btParser;
@@ -121,22 +121,22 @@ public class CPPNoCastExpressionParser extends PrsStream implements RuleAction ,
         super.reportError((firsttok > lasttok ? ParseErrorCodes.INSERTION_CODE : ParseErrorCodes.SUBSTITUTION_CODE), location, msg);
     }
 
-    public Object parser()
+    public void parser()
     {
-        return parser(null, 0);
+        parser(null, 0);
     }
     
-    public Object parser(Monitor monitor)
+    public void parser(Monitor monitor)
     {
-        return parser(monitor, 0);
+        parser(monitor, 0);
     }
     
-    public Object parser(int error_repair_count)
+    public void parser(int error_repair_count)
     {
-        return parser(null, error_repair_count);
+        parser(null, error_repair_count);
     }
 
-    public Object parser(Monitor monitor, int error_repair_count)
+    public void parser(Monitor monitor, int error_repair_count)
     {
         try
         {
@@ -154,7 +154,7 @@ public class CPPNoCastExpressionParser extends PrsStream implements RuleAction ,
 
         try
         {
-            return (Object) btParser.parse(error_repair_count);
+            btParser.parse(error_repair_count);
         }
         catch (BadParseException e)
         {
@@ -162,19 +162,19 @@ public class CPPNoCastExpressionParser extends PrsStream implements RuleAction ,
             DiagnoseParser diagnoseParser = new DiagnoseParser(this, prs);
             diagnoseParser.diagnose(e.error_token);
         }
-
-        return null;
     }
 
 
 private  CPPBuildASTParserAction  action;
-private ScopedStack<Object> astStack = new ScopedStack<Object>();
+private IASTCompletionNode compNode;
 
 public CPPNoCastExpressionParser() {  // constructor
 }
 
-private void initActions(IASTTranslationUnit tu, Set<IParser.Options> options) {
-	action = new  CPPBuildASTParserAction (this, tu, astStack,  CPPNodeFactory.getDefault() ,  CPPSecondaryParserFactory.getDefault() );
+private void initActions(Set<IParser.Options> options) {
+	ScopedStack<Object> astStack = new ScopedStack<Object>();
+	
+	action = new  CPPBuildASTParserAction (this, astStack,  CPPNodeFactory.getDefault() ,  CPPSecondaryParserFactory.getDefault() );
 	action.setParserOptions(options);
 	
 	 
@@ -187,20 +187,21 @@ public void addToken(IToken token) {
 }
 
 
-public IASTCompletionNode parse(IASTTranslationUnit tu, Set<IParser.Options> options) {
+public  IASTExpression  parse(Set<IParser.Options> options) {
 	// this has to be done, or... kaboom!
 	setStreamLength(getSize());
-	initActions(tu, options);
+	initActions(options);
 	
 	final int errorRepairCount = -1;  // -1 means full error handling
 	parser(null, errorRepairCount); // do the actual parse
 	super.resetTokenStream(); // allow tokens to be garbage collected
 
-	// the completion node may be null
-	IASTCompletionNode compNode = action.getASTCompletionNode();
+	compNode = action.getASTCompletionNode(); // the completion node may be null
+	return ( IASTExpression ) action.getParseResult();
+}
+
 
-	//action = null;
-	//parserAction = null;
+public IASTCompletionNode getCompletionNode() {
 	return compNode;
 }
 
@@ -209,10 +210,6 @@ public List<IToken> getRuleTokens() {
     return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 }
 
-public IASTNode getSecondaryParseResult() {
-	return  (IASTNode) astStack.pop();
-}
-
 public String[] getOrderedTerminalSymbols() {
 	return CPPNoCastExpressionParsersym.orderedTerminalSymbols;
 }
@@ -1966,7 +1963,7 @@ public CPPNoCastExpressionParser(IParserActionTokenProvider parser) {  // constr
             //
             // Rule 535:  no_cast_start ::= ERROR_TOKEN
             //
-            case 535: { action.   consumeExpressionProblem();             break;
+            case 535: { action.   consumeEmpty();             break;
             }