fixed prec bug

IronyProject · Mar 11, 2013 · 0836e24 · 0836e24
1 parent 8a9dc81
commit 0836e24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Irony/Parsing/Parser/SpecialActionsHints/PrecedenceBasedParserAction.cs b/Irony/Parsing/Parser/SpecialActionsHints/PrecedenceBasedParserAction.cs
@@ -28,10 +28,12 @@ public PrecedenceBasedParserAction(BnfTerm shiftTerm, ParserState newShiftState,
       base.DefaultAction = _shiftAction = new ShiftParserAction(shiftTerm, newShiftState);
     }
 
-    private static bool CheckMustReduce(ParsingContext context) {
+    private bool CheckMustReduce(ParsingContext context) {
       var input = context.CurrentParserInput;
-      for (int i = context.ParserStack.Count - 1; i >= 0; i--) {
-        var prevNode = context.ParserStack[i];
+      var stackCount = context.ParserStack.Count;
+      var prodLength = _reduceAction.Production.RValues.Count;
+      for (int i = 1; i <= prodLength; i++) {
+        var prevNode = context.ParserStack[stackCount - i];
         if (prevNode == null) continue;
         if (prevNode.Precedence == BnfTerm.NoPrecedence) continue;
         //if previous operator has the same precedence then use associativity

diff --git a/...CF9B843421/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.pdb b/...CF9B843421/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.pdb
diff --git a/pingme.txt b/pingme.txt