Fixed #101: Assertion failure parsing invalid syntax: auto x = n. .n;

DDT-IDE · Mar 16, 2015 · f5e27d5 · f5e27d5
1 parent b9869bb
commit f5e27d5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/documentation/ChangeLog.md b/documentation/ChangeLog.md
@@ -1,7 +1,8 @@
 ## DDT release ChangeLog
 
 ### DDT 0.11.1
- * Fixed: AssertionFailedException, or incorrect results invoking Content Assist on unsaved editor files. (Fixes #99, #97)
+ * Fixed: Either Assertion failure or incorrect results when invoking Content Assist on unsaved editor files. (Fixes #99, #97)
+ * Fixed #101: Assertion failure parsing invalid syntax: `auto x = n. .n;`
 
 ### DDT 0.11.0
 ##### Parser:

diff --git a/plugin_tooling/src-test/dtool/parser/DeeParserSourceTests.java b/plugin_tooling/src-test/dtool/parser/DeeParserSourceTests.java
@@ -124,6 +124,7 @@ public void runAnnotatedSourceTest(AnnotatedSource testSource) {
 
 			} else if(mde.name.equals("parser") && areEqual(mde.value, "IgnoreRest")){
 				int pos = assertNoLength(mde).offset;
+
 				if(expectedRemainingSource == null) {
 					expectedParsedSource = fullSource.substring(0, pos);
 					expectedRemainingSource = fullSource.substring(pos);

diff --git a/plugin_tooling/src/dtool/parser/DeeParser_RefOrExp.java b/plugin_tooling/src/dtool/parser/DeeParser_RefOrExp.java
@@ -713,7 +713,13 @@ protected Expression parsePostfixExpression(Expression exp) {
 			if(qualifier instanceof ExpReference) {
 				ExpReference expReference = (ExpReference) qualifier;
 				if(expReference.ref instanceof RefQualified) {
-					assertTrue(((RefQualified) expReference.ref).isExpressionQualifier);
+					RefQualified refQualified = (RefQualified) expReference.ref;
+					if(refQualified.qualifiedId.isMissing()) {
+						// Special case, if refQualified.qualifiedId was missing, 
+						// the we don't try to continue parsing the expression.
+						return qualifier;
+					}
+					assertTrue(refQualified.isExpressionQualifier);
 				} else if(expReference.ref instanceof RefTemplateInstance) {
 				} else {
 					assertFail(); // ...otherwise refqualified would have been parsed already

diff --git a/plugin_tooling/testdata/parser/1_core_exps_refs/2d_ref_QualifiedIdentifier.d.tsp b/plugin_tooling/testdata/parser/1_core_exps_refs/2d_ref_QualifiedIdentifier.d.tsp
@@ -16,6 +16,9 @@ DefVariable(RefQualified(RefQualified(RefIdentifier RefIdentifier) RefIdentifier
 ▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂ 
 #PARSE(REFERENCE)     foo. #@NO_ID #@BREAK int
 #STRUCTURE_EXPECTED:  RefQualified(RefIdentifier #@NO_ID)
+▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂ bug #101 similar:
+#PARSE(REFERENCE)     foo. #@NO_ID #@BREAK .n
+#STRUCTURE_EXPECTED:  RefQualified(RefIdentifier #@NO_ID)
 
 ▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂
 #PARSE(REFERENCE)     #@TYPE_REFS__NO_BROKEN__INVALID_QUALIFIER #@IGNORE_REST .foo

diff --git a/plugin_tooling/testdata/parser/1_core_exps_refs/5c_exp_qualified.d.tsp b/plugin_tooling/testdata/parser/1_core_exps_refs/5c_exp_qualified.d.tsp
@@ -38,6 +38,10 @@
 ▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂
 #PARSE(EXPRESSION_ToE) #@QUALIFIER . #@NO_ID /* error doesnt break parsing */ () + 23
 #STRUCTURE_EXPECTED:   ExpInfix( ExpCall( ExpReference(RefQualified(#@QUALIFIER #@NO_ID)) )  Integer)
+▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂ bug  #101 :
+#PARSE(EXPRESSION_ToE) foo. #@NO_ID /* error doesnt break parsing */ #@IGNORE_REST .id
+#STRUCTURE_EXPECTED:   ExpReference(RefQualified(RefIdentifier #@NO_ID))
+
 ▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂▂
 #PARSE(EXPRESSION_ToE) . #@NO_ID /* error doesnt break parsing */ + 23
 #STRUCTURE_EXPECTED:   ExpInfix(  ExpReference(RefModuleQualified(#@NO_ID)) Integer  )