From b07000d94215ee742a8c7d0a7a38b27af106c871 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 23 Sep 2011 22:23:19 +0000 Subject: [PATCH] Better parsing of erroneous expression on left of :=. Better parsing of erroneous non-type in type switch. From-SVN: r179133 --- gcc/go/gofrontend/parse.cc | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/gcc/go/gofrontend/parse.cc b/gcc/go/gofrontend/parse.cc index d914bebd36b..8c42fa2b24f 100644 --- a/gcc/go/gofrontend/parse.cc +++ b/gcc/go/gofrontend/parse.cc @@ -3506,7 +3506,21 @@ Parse::simple_stat(bool may_be_composite_lit, bool* return_exp, else if (return_exp != NULL) return this->verify_not_sink(exp); else - this->expression_stat(this->verify_not_sink(exp)); + { + exp = this->verify_not_sink(exp); + + if (token->is_op(OPERATOR_COLONEQ)) + { + if (!exp->is_error_expression()) + error_at(token->location(), "non-name on left side of %<:=%>"); + while (!token->is_op(OPERATOR_SEMICOLON) + && !token->is_eof()) + token = this->advance_token(); + return NULL; + } + + this->expression_stat(exp); + } return NULL; } @@ -4287,8 +4301,19 @@ Parse::type_switch_case(std::vector* types, bool* is_default) while (true) { Type* t = this->type(); + if (!t->is_error_type()) types->push_back(t); + else + { + token = this->peek_token(); + while (!token->is_op(OPERATOR_COLON) + && !token->is_op(OPERATOR_COMMA) + && !token->is_op(OPERATOR_RCURLY) + && !token->is_eof()) + token = this->advance_token(); + } + if (!this->peek_token()->is_op(OPERATOR_COMMA)) break; this->advance_token(); -- 2.30.2