Try harder to diagnose problem

instead of reporting 'Malformed my' Fixes RT #125902
rakudo · Oct 7, 2017 · c7a82d4 · c7a82d4
1 parent a09f5f2
commit c7a82d4
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -2618,8 +2618,22 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
           <DECL=multi_declarator>
         | <DECL=multi_declarator>
         ]
-        || <.ws>[<typename><.ws>]* <ident> <?before <.ws> [':'?':'?'=' | <.terminator> | $ ]> {}
-            <.malformed("$*SCOPE (did you mean to declare a sigilless \\{~$<ident>} or \${~$<ident>}?)")>
+        || <.ws>[<typename><.ws>]* <ident>
+           <?before <.ws>
+           [
+           | ':'?':'?'='
+           | <.terminator>
+           | <trait>
+           | "where" <.ws> <EXPR>
+           | $
+           ]
+           > {} <.malformed("$*SCOPE (did you mean to declare a sigilless \\{~$<ident>} or \${~$<ident>}?)")>
+        || <.ws><typename><.ws> <?before "where" <.ws> <EXPR>> {}
+            <.malformed("$*SCOPE (found type followed by constraint; did you forget a variable in between?)")>
+        || <.ws><typename><.ws> <?before <trait>> {}
+            <.malformed("$*SCOPE (found type followed by trait; did you forget a variable in between?)")>
+        || <.ws><typename><.ws> <?before [ <.terminator> | $ ]> {}
+            <.malformed("$*SCOPE (did you forget a variable after type?)")>
         || <.ws><!typename> <typo_typename> <!>
         || <.malformed($*SCOPE)>
         ]