index a30849986c45fa9d2054587864c280b9e7a5cc23..ab5419d7d444c39fc645df0c04704756cb0678fd 100644 (file)
--- a/src/oberon-type-compat.c
+++ b/src/oberon-type-compat.c
#include <stdbool.h>
#include <math.h>
#include <stdbool.h>
#include <math.h>
-#include "../include/oberon.h"
-
-#include "oberon-common.h"
#include "oberon-internals.h"
#include "oberon-type-compat.h"
#include "oberon-internals.h"
#include "oberon-type-compat.h"
+#include "oberon-common.h"
bool
oberon_is_array_type(oberon_type_t * t)
bool
oberon_is_array_type(oberon_type_t * t)
/* фактический параметр может быть указателем любого типа. */
return oberon_is_some_types(Tf, Ta)
/* фактический параметр может быть указателем любого типа. */
return oberon_is_some_types(Tf, Ta)
- || (oberon_is_record_type(Tf) && oberon_extension_of(Ta, Tf))
+ || (oberon_is_record_type(Tf) && oberon_extension_of(Tf, Ta))
|| (oberon_is_system_byte_type(Tf) && (oberon_is_char_type(Ta) || oberon_is_byte_type(Ta)))
|| (oberon_is_array_of_system_byte_type(Tf))
|| (oberon_is_system_ptr_type(Tf));
|| (oberon_is_system_byte_type(Tf) && (oberon_is_char_type(Ta) || oberon_is_byte_type(Ta)))
|| (oberon_is_array_of_system_byte_type(Tf))
|| (oberon_is_system_ptr_type(Tf));