Revert "fixed parser issue with iCS_B_MemberCall precedence"

retailcoder · retailcoder · commit 4f724da1071a · 2016-04-06T16:16:39.000-04:00
This reverts commit 36c9a64.
diff --git a/Rubberduck.Parsing/Grammar/VBAParser.cs b/Rubberduck.Parsing/Grammar/VBAParser.cs
diff --git a/Rubberduck.Parsing/Grammar/VBAParser.g4 b/Rubberduck.Parsing/Grammar/VBAParser.g4
@@ -467,14 +467,14 @@ eCS_ProcedureCall : CALL whiteSpace ambiguousIdentifier typeHint? (whiteSpace? L
 eCS_MemberProcedureCall : CALL whiteSpace implicitCallStmt_InStmt? DOT ambiguousIdentifier typeHint? (whiteSpace? LPAREN whiteSpace? argsCall whiteSpace? RPAREN)? (whiteSpace? LPAREN subscripts RPAREN)*;
 
 implicitCallStmt_InBlock :
-	iCS_B_ProcedureCall
-	| iCS_B_MemberProcedureCall 
+	iCS_B_MemberProcedureCall 
+	| iCS_B_ProcedureCall
 ;
 
-iCS_B_ProcedureCall : certainIdentifier (whiteSpace argsCall)? (whiteSpace? LPAREN subscripts RPAREN)*;
-
 iCS_B_MemberProcedureCall : implicitCallStmt_InStmt? whiteSpace? DOT whiteSpace? ambiguousIdentifier typeHint? (whiteSpace argsCall)? (whiteSpace? dictionaryCallStmt)? (whiteSpace? LPAREN subscripts RPAREN)*;
 
+iCS_B_ProcedureCall : certainIdentifier (whiteSpace argsCall)? (whiteSpace? LPAREN subscripts RPAREN)*;
+
 implicitCallStmt_InStmt :
 	iCS_S_MembersCall
 	| iCS_S_VariableOrProcedureCall
diff --git a/Rubberduck.Parsing/Grammar/VBAParserBaseListener.cs b/Rubberduck.Parsing/Grammar/VBAParserBaseListener.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Dev\Rubberduck\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Grammar/VBAParserBaseVisitor.cs b/Rubberduck.Parsing/Grammar/VBAParserBaseVisitor.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Dev\Rubberduck\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Grammar/VBAParserListener.cs b/Rubberduck.Parsing/Grammar/VBAParserListener.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Dev\Rubberduck\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Grammar/VBAParserVisitor.cs b/Rubberduck.Parsing/Grammar/VBAParserVisitor.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Dev\Rubberduck\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs b/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs
@@ -595,7 +595,7 @@ private Declaration ResolveInternal(VBAParser.ICS_S_MembersCallContext context,
             }
 
             Declaration parent;
-            if (_withBlockQualifiers.Any() && (context.iCS_S_VariableOrProcedureCall() == null && context.iCS_S_ProcedureOrArrayCall() == null))
+            if (_withBlockQualifiers.Any())
             {
                 parent = _withBlockQualifiers.Peek();
                 if (parent == null)
diff --git a/Rubberduck.Parsing/VBA/RubberduckParser.cs b/Rubberduck.Parsing/VBA/RubberduckParser.cs
@@ -318,7 +318,7 @@ private void ResolveDeclarations(VBComponent component, IParseTree tree)
                 ParseTreeWalker.Default.Walk(declarationsListener, tree);
             } catch (Exception exception)
             {
-                Debug.Print("Exception thrown finding declarations for '{0}' (thread {2}): {1}", component.Name, exception, Thread.CurrentThread.ManagedThreadId);
+                Debug.Print("Exception thrown resolving '{0}' (thread {2}): {1}", component.Name, exception, Thread.CurrentThread.ManagedThreadId);
                 _state.SetModuleState(component, ParserState.ResolverError);
             }
 
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
@@ -166,7 +166,7 @@ private ParserState EvaluateParserState()
             }
 
             // "working" states are toggled when *any* module has them.
-            var result = moduleStates.Except(new[]{ParserState.Ready}).Min();
+            var result = moduleStates.Min();
             if (moduleStates.Any(ms => ms == ParserState.LoadingReference))
             {
                 result = ParserState.LoadingReference;

Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,7 @@ private Declaration ResolveInternal(VBAParser.ICS_S_MembersCallContext context,`
`595`	`595`	`}`
`596`	`596`
`597`	`597`	`Declaration parent;`
`598`		`- if (_withBlockQualifiers.Any() && (context.iCS_S_VariableOrProcedureCall() == null && context.iCS_S_ProcedureOrArrayCall() == null))`
	`598`	`+ if (_withBlockQualifiers.Any())`
`599`	`599`	`{`
`600`	`600`	`parent = _withBlockQualifiers.Peek();`
`601`	`601`	`if (parent == null)`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ private void ResolveDeclarations(VBComponent component, IParseTree tree)`
`318`	`318`	`ParseTreeWalker.Default.Walk(declarationsListener, tree);`
`319`	`319`	`} catch (Exception exception)`
`320`	`320`	`{`
`321`		`- Debug.Print("Exception thrown finding declarations for '{0}' (thread {2}): {1}", component.Name, exception, Thread.CurrentThread.ManagedThreadId);`
	`321`	`+ Debug.Print("Exception thrown resolving '{0}' (thread {2}): {1}", component.Name, exception, Thread.CurrentThread.ManagedThreadId);`
`322`	`322`	`_state.SetModuleState(component, ParserState.ResolverError);`
`323`	`323`	`}`
`324`	`324`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ private ParserState EvaluateParserState()`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`// "working" states are toggled when any module has them.`
`169`		`- var result = moduleStates.Except(new[]{ParserState.Ready}).Min();`
	`169`	`+ var result = moduleStates.Min();`
`170`	`170`	`if (moduleStates.Any(ms => ms == ParserState.LoadingReference))`
`171`	`171`	`{`
`172`	`172`	`result = ParserState.LoadingReference;`