Merge branch 'main' of https://github.com/hsutter/cppfront

Author: hsutter

regression-tests/pure2-return-tuple-no-identifier-error.cpp2

@@ -0,0 +1,3 @@
+d: () -> (int, int) = (1,2);
+
+main: () = { }

regression-tests/pure2-return-tuple-no-type-error.cpp2

@@ -0,0 +1,3 @@
+b: () -> (a, b:_) = (1,2);
+
+main: () = { }

regression-tests/test-results/pure2-return-tuple-no-identifier-error.cpp2.output

@@ -0,0 +1,2 @@
+pure2-return-tuple-no-identifier-error.cpp2(1,11): error: expected identifier, not 'int'
+pure2-return-tuple-no-identifier-error.cpp2(1,16): error: expected identifier, not 'int'

regression-tests/test-results/pure2-return-tuple-no-type-error.cpp2.output

@@ -0,0 +1,2 @@
+pure2-return-tuple-no-type-error.cpp2(1,11): error: return parameter 'a' must have a type
+pure2-return-tuple-no-type-error.cpp2(1,14): error: return parameter 'b' must have a type

source/parse.h

@@ -5434,7 +5434,18 @@ class parser
             error("Cpp2 is currently exploring the path of not allowing default arguments - use overloading instead", false);
             return {};
         }
-
+        if (is_named && is_returns) {
+            auto tok = n->name();
+            assert(tok);
+            if (tok->type() != lexeme::Identifier) {
+                error("expected identifier, not '" + tok->to_string(true) + "'",
+                    false, tok->position());
+            }
+            else if (n->declaration->has_wildcard_type()) {
+                error("return parameter '" + tok->to_string(true) + "' must have a type",
+                    false, tok->position());
+            }
+        }
         return n;
     }