Merge pull request #5190 from AndrejMitrovic/fix-15186

Issue 15186 - Emit better diagnostic for C++ member lookup operators
dlang · Oct 11, 2015 · c5a0636 · c5a0636
2 parents 65b079f + 4a7fbdc
commit c5a0636
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/src/parse.d b/src/parse.d
@@ -4438,6 +4438,16 @@ public:
                 Token* t = peek(&token);
                 if (t.value == TOKcolon)
                 {
+                    Token* nt = peek(t);
+                    if (nt.value == TOKcolon)
+                    {
+                        // skip ident::
+                        nextToken();
+                        nextToken();
+                        nextToken();
+                        error("use '.' for member lookup, not '::'");
+                        break;
+                    }
                     // It's a label
                     Identifier ident = token.ident;
                     nextToken();
@@ -6485,6 +6495,18 @@ public:
         {
         case TOKidentifier:
             {
+                Token* t1 = peek(&token);
+                Token* t2 = peek(t1);
+                if (t1.value == TOKmin && t2.value == TOKgt)
+                {
+                    // skip ident->
+                    nextToken();
+                    nextToken();
+                    nextToken();
+                    error("use '.' for member lookup, not '->'");
+                    goto Lerr;
+                }
+
                 if (peekNext() == TOKgoesto)
                     goto case_delegate;
                 id = token.ident;

diff --git a/test/fail_compilation/diag15186.d b/test/fail_compilation/diag15186.d
@@ -0,0 +1,16 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/diag15186.d(14): Error: use '.' for member lookup, not '::'
+fail_compilation/diag15186.d(15): Error: use '.' for member lookup, not '->'
+---
+*/
+
+void main()
+{
+    struct S { static int x; int y; }
+    S* s;
+
+    S::x = 1;
+    s->y = 2;
+}