projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Warn about type qualifiers in the return type of function types.
[cparser]
/
parser.c
diff --git
a/parser.c
b/parser.c
index
2e18543
..
119677c
100644
(file)
--- a/
parser.c
+++ b/
parser.c
@@
-2475,6
+2475,10
@@
finish_designator:
if (type == NULL) {
/* we are already outside, ... */
if (type == NULL) {
/* we are already outside, ... */
+ if (is_type_compound(outer_type) &&
+ !outer_type->compound.declaration->init.complete) {
+ goto error_parse_next;
+ }
goto error_excess;
}
goto error_excess;
}
@@
-3584,10
+3588,8
@@
warn_about_long_long:
default:
/* invalid specifier combination, give an error message */
if (type_specifiers == 0) {
default:
/* invalid specifier combination, give an error message */
if (type_specifiers == 0) {
- if (saw_error) {
- specifiers->type = type_error_type;
- return;
- }
+ if (saw_error)
+ goto end_error;
if (!strict_mode) {
if (warning.implicit_int) {
if (!strict_mode) {
if (warning.implicit_int) {
@@
-3606,15
+3608,13
@@
warn_about_long_long:
} else {
errorf(HERE, "multiple datatypes in declaration");
}
} else {
errorf(HERE, "multiple datatypes in declaration");
}
-
atomic_type = ATOMIC_TYPE_INVALID
;
+
goto end_error
;
}
}
- if (type_specifiers & SPECIFIER_COMPLEX &&
- atomic_type != ATOMIC_TYPE_INVALID) {
+ if (type_specifiers & SPECIFIER_COMPLEX) {
type = allocate_type_zero(TYPE_COMPLEX, &builtin_source_position);
type->complex.akind = atomic_type;
type = allocate_type_zero(TYPE_COMPLEX, &builtin_source_position);
type->complex.akind = atomic_type;
- } else if (type_specifiers & SPECIFIER_IMAGINARY &&
- atomic_type != ATOMIC_TYPE_INVALID) {
+ } else if (type_specifiers & SPECIFIER_IMAGINARY) {
type = allocate_type_zero(TYPE_IMAGINARY, &builtin_source_position);
type->imaginary.akind = atomic_type;
} else {
type = allocate_type_zero(TYPE_IMAGINARY, &builtin_source_position);
type->imaginary.akind = atomic_type;
} else {
@@
-3637,7
+3637,10
@@
warn_about_long_long:
}
specifiers->type = result;
}
specifiers->type = result;
+ return;
+
end_error:
end_error:
+ specifiers->type = type_error_type;
return;
}
return;
}
@@
-4164,6
+4167,10
@@
static type_t *construct_declarator_type(construct_type_t *construct_list,
errorf(HERE, "function returning array is not allowed");
type = type_error_type;
} else {
errorf(HERE, "function returning array is not allowed");
type = type_error_type;
} else {
+ if (skipped_return_type->base.qualifiers != 0) {
+ warningf(HERE,
+ "type qualifiers in return type of function type are meaningless");
+ }
type = function_type;
}
break;
type = function_type;
}
break;
@@
-4308,7
+4315,7
@@
static void check_type_of_main(const declaration_t *const decl, const function_t
warningf(&decl->source_position,
"'main' is normally a non-static function");
}
warningf(&decl->source_position,
"'main' is normally a non-static function");
}
- if (
skip_typeref(func_type->return_type) != type_int
) {
+ if (
!types_compatible(skip_typeref(func_type->return_type), type_int)
) {
warningf(&decl->source_position,
"return type of 'main' should be 'int', but is '%T'",
func_type->return_type);
warningf(&decl->source_position,
"return type of 'main' should be 'int', but is '%T'",
func_type->return_type);