JVM: Добавлено сравнение строк

[dsw-obn.git] / src / oberon-type-compat.c

diff --git a/src/oberon-type-compat.c b/src/oberon-type-compat.c
index 6c3b698cbb88e41066ba632d23608ef70145d06a..60b37c40e76895feb562ccfda9930c8462cd8440 100644 (file)
--- a/src/oberon-type-compat.c
+++ b/src/oberon-type-compat.c
@@ -485,14 +485,9 @@ oberon_get_longer_type(oberon_context_t * ctx, oberon_type_t * a, oberon_type_t
        {
                return a;
        }
-       else if(oberon_incluses_type(b, a))
-       {
-               return b;
-       }
        else
        {
-               oberon_error(ctx, "oberon_get_longer_type: error");
-               return NULL;
+               return b;
        }
 }
 
@@ -504,13 +499,8 @@ oberon_get_longer_real_type(oberon_context_t * ctx, oberon_type_t * a, oberon_ty
        {
                return ctx -> real_type;
        }
-       else if(oberon_is_real_type(result))
-       {
-               return result;
-       }
        else
        {
-               oberon_error(ctx, "oberon_get_longer_real_type: error");
-               return NULL;
+               return result;
        }
 }