diff --git a/src/oberon.c b/src/oberon.c
index 50429645b22a713480253b1fb262128dc1b97af6..30f10ec49af929465b3dfa31885ae7bb3b150fbb 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
#include "../include/oberon.h"
#include "oberon-internals.h"
+#include "oberon-type-compat.h"
+#include "oberon-common.h"
#include "generator.h"
-enum {
- EOF_ = 0,
- IDENT,
- MODULE,
- SEMICOLON,
- END,
- DOT,
- VAR,
- COLON,
- BEGIN,
- ASSIGN,
- INTEGER,
- TRUE,
- FALSE,
- LPAREN,
- RPAREN,
- EQUAL,
- NEQ,
- LESS,
- LEQ,
- GREAT,
- GEQ,
- IN,
- IS,
- PLUS,
- MINUS,
- OR,
- STAR,
- SLASH,
- DIV,
- MOD,
- AND,
- NOT,
- PROCEDURE,
- COMMA,
- RETURN,
- CONST,
- TYPE,
- ARRAY,
- OF,
- LBRACK,
- RBRACK,
- RECORD,
- POINTER,
- TO,
- UPARROW,
- NIL,
- IMPORT,
- REAL,
- CHAR,
- STRING,
- IF,
- THEN,
- ELSE,
- ELSIF,
- WHILE,
- DO,
- REPEAT,
- UNTIL,
- FOR,
- BY,
- LOOP,
- EXIT,
- LBRACE,
- RBRACE,
- DOTDOT
-};
-
// =======================================================================
// UTILS
// =======================================================================
static void
-oberon_error(oberon_context_t * ctx, const char * fmt, ...)
-{
- va_list ptr;
- va_start(ptr, fmt);
- fprintf(stderr, "error: ");
- vfprintf(stderr, fmt, ptr);
- fprintf(stderr, "\n");
- fprintf(stderr, " code_index = %i\n", ctx -> code_index);
- fprintf(stderr, " c = %c\n", ctx -> c);
- fprintf(stderr, " token = %i\n", ctx -> token);
- va_end(ptr);
- exit(1);
-}
+oberon_make_copy_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args);
static oberon_type_t *
oberon_new_type_ptr(int class)
return x;
}
+static oberon_expr_t *
+oberon_new_operator(int op, oberon_type_t * result, oberon_expr_t * left, oberon_expr_t * right)
+{
+ oberon_oper_t * operator;
+ operator = malloc(sizeof *operator);
+ memset(operator, 0, sizeof *operator);
+
+ operator -> is_item = 0;
+ operator -> result = result;
+ operator -> read_only = 1;
+ operator -> op = op;
+ operator -> left = left;
+ operator -> right = right;
+
+ return (oberon_expr_t *) operator;
+}
+
+static oberon_expr_t *
+oberon_new_item(int mode, oberon_type_t * result, int read_only)
+{
+ oberon_item_t * item;
+ item = malloc(sizeof *item);
+ memset(item, 0, sizeof *item);
+
+ item -> is_item = 1;
+ item -> result = result;
+ item -> read_only = read_only;
+ item -> mode = mode;
+
+ return (oberon_expr_t *)item;
+}
+
+static oberon_type_t *
+oberon_get_type_of_int_value(oberon_context_t * ctx, int64_t i)
+{
+ if(i >= -128 && i <= 127)
+ {
+ return ctx -> byte_type;
+ }
+ else if(i >= -32768 && i <= 32767)
+ {
+ return ctx -> shortint_type;
+ }
+ else if(i >= -2147483648 && i <= 2147483647)
+ {
+ return ctx -> int_type;
+ }
+ else
+ {
+ return ctx -> longint_type;
+ }
+}
+
+static oberon_expr_t *
+oberon_make_integer(oberon_context_t * ctx, int64_t i)
+{
+ oberon_expr_t * expr;
+ oberon_type_t * result;
+ result = oberon_get_type_of_int_value(ctx, i);
+ expr = oberon_new_item(MODE_INTEGER, result, true);
+ expr -> item.integer = i;
+ expr -> item.real = i;
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_real_typed(oberon_context_t * ctx, double r, oberon_type_t * result)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_REAL, result, true);
+ expr -> item.integer = r;
+ expr -> item.real = r;
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_real(oberon_context_t * ctx, double r, bool longmode)
+{
+ oberon_type_t * result;
+ result = (longmode) ? (ctx -> longreal_type) : (ctx -> real_type);
+ return oberon_make_real_typed(ctx, r, result);
+}
+
+static oberon_expr_t *
+oberon_make_boolean(oberon_context_t * ctx, bool cond)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, true);
+ expr -> item.integer = cond;
+ expr -> item.real = cond;
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_set(oberon_context_t * ctx, int64_t i)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_SET, ctx -> set_type, true);
+ expr -> item.integer = i;
+ expr -> item.real = i;
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_set_range(oberon_context_t * ctx, int64_t x, int64_t y)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_SET, ctx -> set_type, true);
+ expr -> item.integer = (x <= y) ? ((2 << y) - (1 << x)) : (0);
+ expr -> item.real = expr -> item.integer;
+ return expr;
+}
+
// =======================================================================
// TABLE
// =======================================================================
{
ctx -> token = BEGIN;
}
- else if(strcmp(ident, "TRUE") == 0)
- {
- ctx -> token = TRUE;
- }
- else if(strcmp(ident, "FALSE") == 0)
- {
- ctx -> token = FALSE;
- }
else if(strcmp(ident, "OR") == 0)
{
ctx -> token = OR;
{
ctx -> token = EXIT;
}
+ else if(strcmp(ident, "CASE") == 0)
+ {
+ ctx -> token = CASE;
+ }
+ else if(strcmp(ident, "WITH") == 0)
+ {
+ ctx -> token = WITH;
+ }
}
+#define ISHEXDIGIT(x) \
+ (((x) >= '0' && (x) <= '9') || ((x) >= 'A' && (x) <= 'F'))
+
static void
oberon_read_number(oberon_context_t * ctx)
{
end_i = ctx -> code_index;
- if(isxdigit(ctx -> c))
+ if(ISHEXDIGIT(ctx -> c))
{
mode = 1;
- while(isxdigit(ctx -> c))
+ while(ISHEXDIGIT(ctx -> c))
{
oberon_get_char(ctx);
}
case 2:
case 3:
sscanf(ident, "%lf", &real);
+ integer = real;
ctx -> token = REAL;
break;
case 4:
ctx -> token = STRING;
ctx -> string = string;
-
- printf("oberon_read_string: string ((%s))\n", string);
+ ctx -> integer = string[0];
}
static void oberon_read_token(oberon_context_t * ctx);
ctx -> token = RBRACE;
oberon_get_char(ctx);
break;
+ case '|':
+ ctx -> token = BAR;
+ oberon_get_char(ctx);
+ break;
default:
oberon_error(ctx, "invalid char %c", ctx -> c);
break;
static void oberon_type(oberon_context_t * ctx, oberon_type_t ** type);
static oberon_item_t * oberon_const_expr(oberon_context_t * ctx);
static oberon_expr_t * oberno_make_dereferencing(oberon_context_t * ctx, oberon_expr_t * expr);
-
-static oberon_expr_t *
-oberon_new_operator(int op, oberon_type_t * result, oberon_expr_t * left, oberon_expr_t * right)
-{
- oberon_oper_t * operator;
- operator = malloc(sizeof *operator);
- memset(operator, 0, sizeof *operator);
-
- operator -> is_item = 0;
- operator -> result = result;
- operator -> read_only = 1;
- operator -> op = op;
- operator -> left = left;
- operator -> right = right;
-
- return (oberon_expr_t *) operator;
-}
-
-static oberon_expr_t *
-oberon_new_item(int mode, oberon_type_t * result, int read_only)
-{
- oberon_item_t * item;
- item = malloc(sizeof *item);
- memset(item, 0, sizeof *item);
-
- item -> is_item = 1;
- item -> result = result;
- item -> read_only = read_only;
- item -> mode = mode;
-
- return (oberon_expr_t *)item;
-}
+static bool oberon_is_const(oberon_expr_t * expr);
static oberon_expr_t *
oberon_make_unary_op(oberon_context_t * ctx, int token, oberon_expr_t * a)
{
if(result -> class == OBERON_TYPE_SET)
{
- expr = oberon_new_operator(OP_COMPLEMENTATION, result, a, NULL);
+ if(oberon_is_const(a))
+ {
+ expr = oberon_make_set(ctx, ~(a -> item.integer));
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_COMPLEMENTATION, result, a, NULL);
+ }
}
else if(result -> class == OBERON_TYPE_INTEGER)
{
- expr = oberon_new_operator(OP_UNARY_MINUS, result, a, NULL);
+ if(oberon_is_const(a))
+ {
+ expr = oberon_make_integer(ctx, -(a -> item.integer));
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_UNARY_MINUS, result, a, NULL);
+ }
+ }
+ else if(result -> class == OBERON_TYPE_REAL)
+ {
+ if(oberon_is_const(a))
+ {
+ expr = oberon_make_real_typed(ctx, -(a -> item.real), result);
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_UNARY_MINUS, result, a, NULL);
+ }
}
else
{
oberon_error(ctx, "incompatible operator type");
}
- expr = oberon_new_operator(OP_LOGIC_NOT, result, a, NULL);
+ if(oberon_is_const(a))
+ {
+ expr = oberon_make_boolean(ctx, !(a -> item.integer));
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_LOGIC_NOT, result, a, NULL);
+ }
}
else
{
@@ -969,89 +1012,30 @@ oberon_expr_list(oberon_context_t * ctx, int * num_expr, oberon_expr_t ** first,
static oberon_expr_t *
oberon_cast_expr(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * pref)
{
- return oberon_new_operator(OP_CAST, pref, expr, NULL);
-}
-
-static oberon_expr_t *
-oberno_make_record_cast(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * rec)
-{
- oberon_type_t * from = expr -> result;
- oberon_type_t * to = rec;
-
- printf("oberno_make_record_cast: from class %i to class %i\n", from -> class, to -> class);
-
- if(from -> class == OBERON_TYPE_POINTER && to -> class == OBERON_TYPE_POINTER)
- {
- printf("oberno_make_record_cast: pointers\n");
- from = from -> base;
- to = to -> base;
- }
+ oberon_expr_t * cast;
- if(from -> class != OBERON_TYPE_RECORD || to -> class != OBERON_TYPE_RECORD)
+ if((oberon_is_char_type(pref) && oberon_is_const_string(expr) && strlen(expr -> item.string) == 1))
{
- oberon_error(ctx, "must be record type");
- }
-
- return oberon_cast_expr(ctx, expr, rec);
-}
-
-static oberon_type_t *
-oberon_get_equal_expr_type(oberon_context_t * ctx, oberon_type_t * a, oberon_type_t * b)
-{
- oberon_type_t * result;
- if(a -> class == OBERON_TYPE_REAL && b -> class == OBERON_TYPE_INTEGER)
- {
- result = a;
- }
- else if(b -> class == OBERON_TYPE_REAL && a -> class == OBERON_TYPE_INTEGER)
- {
- result = b;
- }
- else if(a -> class != b -> class)
- {
- oberon_error(ctx, "oberon_get_equal_expr_type: incompatible types");
- }
- else if(a -> size > b -> size)
- {
- result = a;
+ /* Автоматически преобразуем строку единичного размера в символ */
+ cast = oberon_new_item(MODE_CHAR, ctx -> char_type, true);
+ cast -> item.integer = expr -> item.string[0];
}
else
{
- result = b;
+ cast = oberon_new_operator(OP_CAST, pref, expr, NULL);
}
- return result;
+ return cast;
}
static void
-oberon_check_record_compatibility(oberon_context_t * ctx, oberon_type_t * from, oberon_type_t * to)
+oberon_check_dst(oberon_context_t * ctx, oberon_expr_t * dst)
{
- if(from -> class == OBERON_TYPE_POINTER && to -> class == OBERON_TYPE_POINTER)
- {
- from = from -> base;
- to = to -> base;
- }
-
- if(from -> class != OBERON_TYPE_RECORD || to -> class != OBERON_TYPE_RECORD)
- {
- oberon_error(ctx, "not a record");
- }
-
- oberon_type_t * t = from;
- while(t != NULL && t != to)
- {
- t = t -> base;
- }
-
- if(t == NULL)
+ if(dst -> read_only)
{
- oberon_error(ctx, "incompatible record types");
+ oberon_error(ctx, "read-only destination");
}
-}
-static void
-oberon_check_dst(oberon_context_t * ctx, oberon_expr_t * dst)
-{
if(dst -> is_item == false)
{
oberon_error(ctx, "not variable");
}
}
-static oberon_expr_t *
-oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * pref)
-{
- // Допускается:
- // Если классы типов равны
- // Если INTEGER переводится в REAL
- // Есди STRING переводится в ARRAY OF CHAR
-
- oberon_check_src(ctx, expr);
-
- bool error = false;
- if(pref -> class != expr -> result -> class)
- {
- printf("expr class %i\n", expr -> result -> class);
- printf("pref class %i\n", pref -> class);
-
- if(expr -> result -> class == OBERON_TYPE_STRING)
- {
- if(pref -> class == OBERON_TYPE_ARRAY)
- {
- if(pref -> base -> class != OBERON_TYPE_CHAR)
- {
- error = true;
- }
- }
- else
- {
- error = true;
- }
- }
- else if(expr -> result -> class == OBERON_TYPE_INTEGER)
- {
- if(pref -> class != OBERON_TYPE_REAL)
- {
- error = true;
- }
- }
- else
- {
- error = true;
- }
- }
-
- if(error)
- {
- oberon_error(ctx, "oberon_autocast_to: incompatible types");
- }
-
- if(pref -> class == OBERON_TYPE_INTEGER || pref -> class == OBERON_TYPE_REAL)
- {
- if(expr -> result -> size > pref -> size)
- {
- oberon_error(ctx, "incompatible size");
- }
- else
- {
- expr = oberon_cast_expr(ctx, expr, pref);
- }
- }
- else if(pref -> class == OBERON_TYPE_RECORD)
- {
- oberon_check_record_compatibility(ctx, expr -> result, pref);
- expr = oberno_make_record_cast(ctx, expr, pref);
- }
- else if(pref -> class == OBERON_TYPE_POINTER)
- {
- assert(pref -> base);
- if(expr -> result -> base -> class == OBERON_TYPE_RECORD)
- {
- oberon_check_record_compatibility(ctx, expr -> result, pref);
- expr = oberno_make_record_cast(ctx, expr, pref);
- }
- else if(expr -> result -> base != pref -> base)
- {
- if(expr -> result -> base -> class != OBERON_TYPE_VOID)
- {
- oberon_error(ctx, "incompatible pointer types");
- }
- }
- }
-
- return expr;
-}
-
-static void
-oberon_autocast_binary_op(oberon_context_t * ctx, oberon_expr_t ** ea, oberon_expr_t ** eb)
-{
- oberon_type_t * a = (*ea) -> result;
- oberon_type_t * b = (*eb) -> result;
- oberon_type_t * preq = oberon_get_equal_expr_type(ctx, a, b);
- *ea = oberon_autocast_to(ctx, *ea, preq);
- *eb = oberon_autocast_to(ctx, *eb, preq);
-}
-
static void
oberon_autocast_call(oberon_context_t * ctx, oberon_item_t * desig)
{
{
if(param -> class == OBERON_CLASS_VAR_PARAM)
{
- if(arg -> read_only)
+ oberon_check_dst(ctx, arg);
+ if(!oberon_is_compatible_arrays(param, arg))
{
- oberon_error(ctx, "assign to read-only var");
+ oberon_check_compatible_var_param(ctx, param -> type, arg -> result);
}
+ casted[i] = oberon_cast_expr(ctx, arg, param -> type);
+ }
+ else
+ {
+ oberon_check_src(ctx, arg);
+ if(!oberon_is_compatible_arrays(param, arg))
+ {
+ oberon_check_assignment_compatible(ctx, arg, param -> type);
+ }
+ casted[i] = oberon_cast_expr(ctx, arg, param -> type);
}
- casted[i] = oberon_autocast_to(ctx, arg, param -> type);
arg = arg -> next;
param = param -> next;
}
@@ -1253,7 +1153,7 @@ oberon_make_call_func(oberon_context_t * ctx, oberon_item_t * item, int num_args
}
else
{
- if(signature -> base -> class == OBERON_TYPE_VOID)
+ if(signature -> base -> class == OBERON_TYPE_NOTYPE)
{
oberon_error(ctx, "attempt to call procedure in expression");
}
@@ -1290,7 +1190,7 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
}
else
{
- if(signature -> base -> class != OBERON_TYPE_VOID)
+ if(signature -> base -> class != OBERON_TYPE_NOTYPE)
{
oberon_error(ctx, "attempt to call function as non-typed procedure");
}
@@ -1314,14 +1214,11 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
|| ((x) == STRING) \
|| ((x) == NIL) \
|| ((x) == LPAREN) \
- || ((x) == NOT) \
- || ((x) == TRUE) \
- || ((x) == FALSE))
+ || ((x) == NOT))
static oberon_expr_t *
oberno_make_dereferencing(oberon_context_t * ctx, oberon_expr_t * expr)
{
- printf("oberno_make_dereferencing\n");
if(expr -> result -> class != OBERON_TYPE_POINTER)
{
oberon_error(ctx, "not a pointer");
@@ -1413,7 +1310,7 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
}
}
- int read_only = 0;
+ int read_only = expr -> read_only;
if(field -> read_only)
{
if(field -> module != ctx -> mod)
}
static oberon_expr_t *
-oberon_designator(oberon_context_t * ctx)
+oberon_qualident_expr(oberon_context_t * ctx)
{
- char * name;
oberon_object_t * var;
oberon_expr_t * expr;
oberon_error(ctx, "invalid designator");
break;
}
+
expr -> item.var = var;
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_designator(oberon_context_t * ctx)
+{
+ char * name;
+ oberon_expr_t * expr;
+ oberon_object_t * objtype;
+
+ expr = oberon_qualident_expr(ctx);
+
while(expr -> result -> class != OBERON_TYPE_PROCEDURE && ISSELECTOR(ctx -> token))
{
switch(ctx -> token)
break;
case LPAREN:
oberon_assert_token(ctx, LPAREN);
- oberon_object_t * objtype = oberon_qualident(ctx, NULL, 1);
- if(objtype -> class != OBERON_CLASS_TYPE)
- {
- oberon_error(ctx, "must be type");
- }
+ objtype = oberon_qualident(ctx, NULL, true);
oberon_assert_token(ctx, RPAREN);
- expr = oberno_make_record_cast(ctx, expr, objtype -> type);
+ oberon_check_extension_of(ctx, expr -> result, objtype -> type);
+ expr = oberon_cast_expr(ctx, expr, objtype -> type);
break;
default:
oberon_error(ctx, "oberon_designator: wat");
oberon_make_call_proc(ctx, (oberon_item_t *) expr, num_args, arguments);
}
-static oberon_type_t *
-oberon_get_type_of_int_value(oberon_context_t * ctx, int64_t i)
-{
- if(i >= -128 && i <= 127)
- {
- return ctx -> byte_type;
- }
- else if(i >= -32768 && i <= 32767)
- {
- return ctx -> shortint_type;
- }
- else if(i >= -2147483648 && i <= 2147483647)
- {
- return ctx -> int_type;
- }
- else
- {
- return ctx -> longint_type;
- }
-}
-
-static oberon_expr_t *
-oberon_integer_item(oberon_context_t * ctx, int64_t i)
-{
- oberon_expr_t * expr;
- oberon_type_t * result;
- result = oberon_get_type_of_int_value(ctx, i);
- expr = oberon_new_item(MODE_INTEGER, result, true);
- expr -> item.integer = i;
- return expr;
-}
-
static oberon_expr_t *
oberon_element(oberon_context_t * ctx)
{
oberon_expr_t * e2;
e1 = oberon_expr(ctx);
+ oberon_check_src(ctx, e1);
if(e1 -> result -> class != OBERON_TYPE_INTEGER)
{
oberon_error(ctx, "expected integer");
{
oberon_assert_token(ctx, DOTDOT);
e2 = oberon_expr(ctx);
+ oberon_check_src(ctx, e2);
if(e2 -> result -> class != OBERON_TYPE_INTEGER)
{
oberon_error(ctx, "expected integer");
}
oberon_expr_t * set;
- set = oberon_new_operator(OP_RANGE, ctx -> set_type, e1, e2);
+ if(e2 == NULL && oberon_is_const(e1))
+ {
+ set = oberon_make_set(ctx, e1 -> item.integer);
+ }
+ else if(e2 != NULL && oberon_is_const(e1) && oberon_is_const(e2))
+ {
+ set = oberon_make_set_range(ctx, e1 -> item.integer, e2 -> item.integer);
+ }
+ else
+ {
+ set = oberon_new_operator(OP_RANGE, ctx -> set_type, e1, e2);
+ }
return set;
}
+static oberon_expr_t *
+oberon_make_set_union(oberon_context_t * ctx, oberon_expr_t * a, oberon_expr_t * b)
+{
+ if(oberon_is_const(a) && oberon_is_const(b))
+ {
+ return oberon_make_set(ctx, (a -> item.integer | b -> item.integer));
+ }
+ else
+ {
+ return oberon_new_operator(OP_UNION, ctx -> set_type, a, b);
+ }
+}
+
static oberon_expr_t *
oberon_set(oberon_context_t * ctx)
{
oberon_expr_t * set;
oberon_expr_t * elements;
- set = oberon_new_item(MODE_SET, ctx -> set_type, true);
- set -> item.integer = 0;
+ set = oberon_make_set(ctx, 0);
oberon_assert_token(ctx, LBRACE);
if(ISEXPR(ctx -> token))
{
elements = oberon_element(ctx);
- set = oberon_new_operator(OP_UNION, ctx -> set_type, set, elements);
+ set = oberon_make_set_union(ctx, set, elements);
while(ctx -> token == COMMA)
{
oberon_assert_token(ctx, COMMA);
elements = oberon_element(ctx);
- set = oberon_new_operator(OP_UNION, ctx -> set_type, set, elements);
+ set = oberon_make_set_union(ctx, set, elements);
}
}
oberon_assert_token(ctx, RBRACE);
expr = oberon_opt_func_parens(ctx, expr);
break;
case INTEGER:
- expr = oberon_integer_item(ctx, ctx -> integer);
+ expr = oberon_make_integer(ctx, ctx -> integer);
oberon_assert_token(ctx, INTEGER);
break;
case CHAR:
oberon_assert_token(ctx, STRING);
break;
case REAL:
- result = (ctx -> longmode) ? (ctx -> longreal_type) : (ctx -> real_type);
- expr = oberon_new_item(MODE_REAL, result, 1);
- expr -> item.real = ctx -> real;
+ expr = oberon_make_real(ctx, ctx -> real, ctx -> longmode);
oberon_assert_token(ctx, REAL);
break;
- case TRUE:
- expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, true);
- expr -> item.boolean = true;
- oberon_assert_token(ctx, TRUE);
- break;
- case FALSE:
- expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, true);
- expr -> item.boolean = false;
- oberon_assert_token(ctx, FALSE);
- break;
case LBRACE:
expr = oberon_set(ctx);
break;
break;
case NIL:
oberon_assert_token(ctx, NIL);
- expr = oberon_new_item(MODE_NIL, ctx -> void_ptr_type, true);
+ expr = oberon_new_item(MODE_NIL, ctx -> nil_type, true);
break;
default:
oberon_error(ctx, "invalid expression");
return expr;
}
-#define ITMAKESBOOLEAN(x) \
- (((x) >= EQUAL && (x) <= GEQ) || ((x) == OR) || ((x) == AND))
-
-#define ITUSEONLYINTEGER(x) \
- ((x) >= LESS && (x) <= GEQ)
+static oberon_expr_t *
+oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_expr_t * b)
+{
+ oberon_expr_t * expr;
+ oberon_type_t * result;
-#define ITUSEONLYBOOLEAN(x) \
- (((x) == OR) || ((x) == AND))
+ oberon_check_compatible_bin_expr_types(ctx, token, a -> result, b -> result);
+ oberon_check_src(ctx, a);
+ if(token != IS)
+ {
+ oberon_check_src(ctx, b);
+ }
-static void
-oberon_autocast_to_real(oberon_context_t * ctx, oberon_expr_t ** e)
-{
- oberon_expr_t * expr = *e;
- if(expr -> result -> class == OBERON_TYPE_INTEGER)
+ if(token == IN)
{
- if(expr -> result -> size <= ctx -> real_type -> size)
+ if(oberon_is_const(a) && oberon_is_const(b))
{
- *e = oberon_cast_expr(ctx, expr, ctx -> real_type);
+ expr = oberon_make_boolean(ctx, (1 << a -> item.integer) & b -> item.integer);
}
else
{
- *e = oberon_cast_expr(ctx, expr, ctx -> longreal_type);
+ expr = oberon_new_operator(OP_IN, ctx -> bool_type, a, b);
}
}
- else if(expr -> result -> class != OBERON_TYPE_REAL)
+ else if(token == IS)
{
- oberon_error(ctx, "required numeric type");
+ oberon_check_type_expr(ctx, b);
+ expr = oberon_new_operator(OP_IS, ctx -> bool_type, a, b);
}
-}
-
-static oberon_expr_t *
-oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_expr_t * b)
-{
- oberon_expr_t * expr;
- oberon_type_t * result;
-
- bool error = false;
- if(token == IS)
+ else if((token >= EQUAL && token <= GEQ) || token == OR || token == AND)
{
- oberon_type_t * v = a -> result;
- if(v -> class == OBERON_TYPE_POINTER)
- {
- v = v -> base;
- if(v -> class != OBERON_TYPE_RECORD)
- {
- oberon_error(ctx, "must be record");
- }
- }
- else if(v -> class != OBERON_TYPE_RECORD)
- {
- oberon_error(ctx, "must be record");
- }
-
- if(b -> is_item == false || b -> item.mode != MODE_TYPE)
- {
- oberon_error(ctx, "requires type");
- }
+ result = oberon_get_longer_type(ctx, a -> result, b -> result);
- oberon_type_t * t = b -> result;
- if(t -> class == OBERON_TYPE_POINTER)
+ if(oberon_is_const(a) && oberon_is_const(b)
+ && (oberon_is_real_type(result) || oberon_is_integer_type(result)))
{
- t = t -> base;
- if(t -> class != OBERON_TYPE_RECORD)
+ if(oberon_is_real_type(result))
{
- oberon_error(ctx, "must be record");
+ double x = a -> item.real;
+ double y = b -> item.real;
+ switch(token)
+ {
+ case EQUAL: expr = oberon_make_boolean(ctx, x == y); break;
+ case NEQ: expr = oberon_make_boolean(ctx, x != y); break;
+ case LESS: expr = oberon_make_boolean(ctx, x < y); break;
+ case LEQ: expr = oberon_make_boolean(ctx, x <= y); break;
+ case GREAT: expr = oberon_make_boolean(ctx, x > y); break;
+ case GEQ: expr = oberon_make_boolean(ctx, x >= y); break;
+ case OR: expr = oberon_make_boolean(ctx, x || y); break;
+ case AND: expr = oberon_make_boolean(ctx, x && y); break;
+ default: assert(0); break;
+ }
}
- }
- else if(t -> class != OBERON_TYPE_RECORD)
- {
- oberon_error(ctx, "must be record");
- }
-
- result = ctx -> bool_type;
- expr = oberon_new_operator(OP_IS, result, a, b);
- }
- else if(ITMAKESBOOLEAN(token))
- {
- if(ITUSEONLYINTEGER(token))
- {
- if(a -> result -> class == OBERON_TYPE_INTEGER
- || b -> result -> class == OBERON_TYPE_INTEGER
- || a -> result -> class == OBERON_TYPE_REAL
- || b -> result -> class == OBERON_TYPE_REAL)
+ else if(oberon_is_integer_type(result))
{
- // accept
+ int64_t x = a -> item.integer;
+ int64_t y = b -> item.integer;
+ switch(token)
+ {
+ case EQUAL: expr = oberon_make_boolean(ctx, x == y); break;
+ case NEQ: expr = oberon_make_boolean(ctx, x != y); break;
+ case LESS: expr = oberon_make_boolean(ctx, x < y); break;
+ case LEQ: expr = oberon_make_boolean(ctx, x <= y); break;
+ case GREAT: expr = oberon_make_boolean(ctx, x > y); break;
+ case GEQ: expr = oberon_make_boolean(ctx, x >= y); break;
+ case OR: expr = oberon_make_boolean(ctx, x || y); break;
+ case AND: expr = oberon_make_boolean(ctx, x && y); break;
+ default: assert(0); break;
+ }
}
else
{
- oberon_error(ctx, "used only with numeric types");
+ assert(0);
}
}
- else if(ITUSEONLYBOOLEAN(token))
+ else
{
- if(a -> result -> class != OBERON_TYPE_BOOLEAN
- || b -> result -> class != OBERON_TYPE_BOOLEAN)
+ a = oberon_cast_expr(ctx, a, result);
+ b = oberon_cast_expr(ctx, b, result);
+ result = ctx -> bool_type;
+ switch(token)
{
- oberon_error(ctx, "used only with boolean type");
+ case EQUAL: expr = oberon_new_operator(OP_EQ, result, a, b); break;
+ case NEQ: expr = oberon_new_operator(OP_NEQ, result, a, b); break;
+ case LESS: expr = oberon_new_operator(OP_LSS, result, a, b); break;
+ case LEQ: expr = oberon_new_operator(OP_LEQ, result, a, b); break;
+ case GREAT: expr = oberon_new_operator(OP_GRT, result, a, b); break;
+ case GEQ: expr = oberon_new_operator(OP_GEQ, result, a, b); break;
+ case OR: expr = oberon_new_operator(OP_LOGIC_OR, result, a, b); break;
+ case AND: expr = oberon_new_operator(OP_LOGIC_AND, result, a, b); break;
+ default: assert(0); break;
}
}
-
- oberon_autocast_binary_op(ctx, &a, &b);
- result = ctx -> bool_type;
-
- if(token == EQUAL)
- {
- expr = oberon_new_operator(OP_EQ, result, a, b);
- }
- else if(token == NEQ)
- {
- expr = oberon_new_operator(OP_NEQ, result, a, b);
- }
- else if(token == LESS)
- {
- expr = oberon_new_operator(OP_LSS, result, a, b);
- }
- else if(token == LEQ)
- {
- expr = oberon_new_operator(OP_LEQ, result, a, b);
- }
- else if(token == GREAT)
- {
- expr = oberon_new_operator(OP_GRT, result, a, b);
- }
- else if(token == GEQ)
- {
- expr = oberon_new_operator(OP_GEQ, result, a, b);
- }
- else if(token == OR)
- {
- expr = oberon_new_operator(OP_LOGIC_OR, result, a, b);
- }
- else if(token == AND)
- {
- expr = oberon_new_operator(OP_LOGIC_AND, result, a, b);
- }
- else
- {
- oberon_error(ctx, "oberon_make_bin_op: bool wat");
- }
}
else if(token == SLASH)
{
- if(a -> result -> class == OBERON_TYPE_SET
- || b -> result -> class == OBERON_TYPE_SET)
+ if(oberon_is_set_type(a -> result) && oberon_is_set_type(b -> result))
{
- oberon_autocast_binary_op(ctx, &a, &b);
- result = a -> result;
- expr = oberon_new_operator(OP_SYM_DIFFERENCE, result, a, b);
+ if(oberon_is_const(a) && oberon_is_const(b))
+ {
+ int64_t x = a -> item.integer;
+ int64_t y = b -> item.integer;
+ expr = oberon_make_set(ctx, x ^ y);
+ }
+ else
+ {
+ result = oberon_get_longer_type(ctx, a -> result, b -> result);
+ a = oberon_cast_expr(ctx, a, result);
+ b = oberon_cast_expr(ctx, b, result);
+ expr = oberon_new_operator(OP_SYM_DIFFERENCE, result, a, b);
+ }
}
else
{
- oberon_autocast_to_real(ctx, &a);
- oberon_autocast_to_real(ctx, &b);
- oberon_autocast_binary_op(ctx, &a, &b);
- result = a -> result;
- expr = oberon_new_operator(OP_DIV, result, a, b);
- }
- }
- else if(token == DIV)
- {
- if(a -> result -> class != OBERON_TYPE_INTEGER
- || b -> result -> class != OBERON_TYPE_INTEGER)
- {
- oberon_error(ctx, "operator DIV requires integer type");
+ result = oberon_get_longer_real_type(ctx, a -> result, b -> result);
+ if(oberon_is_const(a) && oberon_is_const(b))
+ {
+ double x = a -> item.real;
+ double y = b -> item.real;
+ expr = oberon_make_real_typed(ctx, x / y, result);
+ }
+ else
+ {
+ a = oberon_cast_expr(ctx, a, result);
+ b = oberon_cast_expr(ctx, b, result);
+ expr = oberon_new_operator(OP_DIV, result, a, b);
+ }
}
-
- oberon_autocast_binary_op(ctx, &a, &b);
- expr = oberon_new_operator(OP_DIV, a -> result, a, b);
}
else
{
- oberon_autocast_binary_op(ctx, &a, &b);
- result = a -> result;
- if(result -> class == OBERON_TYPE_SET)
+ result = oberon_get_longer_type(ctx, a -> result, b -> result);
+
+ if(oberon_is_const(a) && oberon_is_const(b))
{
- switch(token)
+ if(oberon_is_set_type(result))
+ {
+ int64_t x = a -> item.integer;
+ int64_t y = b -> item.integer;
+ switch(token)
+ {
+ case PLUS: expr = oberon_make_set(ctx, x | y); break;
+ case MINUS: expr = oberon_make_set(ctx, x & ~y); break;
+ case STAR: expr = oberon_make_set(ctx, x & y); break;
+ default: assert(0); break;
+ }
+ }
+ if(oberon_is_real_type(result))
{
- case PLUS:
- expr = oberon_new_operator(OP_UNION, result, a, b);
- break;
- case MINUS:
- expr = oberon_new_operator(OP_DIFFERENCE, result, a, b);
- break;
- case STAR:
- expr = oberon_new_operator(OP_INTERSECTION, result, a, b);
- break;
- default:
- error = true;
- break;
+ double x = a -> item.real;
+ double y = b -> item.real;
+ switch(token)
+ {
+ case PLUS: expr = oberon_make_real_typed(ctx, x + y, result); break;
+ case MINUS: expr = oberon_make_real_typed(ctx, x - y, result); break;
+ case STAR: expr = oberon_make_real_typed(ctx, x * y, result); break;
+ default: assert(0); break;
+ }
}
- }
- else if(result -> class == OBERON_TYPE_INTEGER
- || result -> class == OBERON_TYPE_REAL)
- {
- switch(token)
+ else if(oberon_is_integer_type(result))
{
- case PLUS:
- expr = oberon_new_operator(OP_ADD, result, a, b);
- break;
- case MINUS:
- expr = oberon_new_operator(OP_SUB, result, a, b);
- break;
- case STAR:
- expr = oberon_new_operator(OP_MUL, result, a, b);
- break;
- case MOD:
- expr = oberon_new_operator(OP_MOD, result, a, b);
- break;
- default:
- error = true;
- break;
+ int64_t x = a -> item.integer;
+ int64_t y = b -> item.integer;
+ switch(token)
+ {
+ case PLUS: expr = oberon_make_integer(ctx, x + y); break;
+ case MINUS: expr = oberon_make_integer(ctx, x - y); break;
+ case STAR: expr = oberon_make_integer(ctx, x * y); break;
+ case DIV: expr = oberon_make_integer(ctx, x / y); break;
+ case MOD: expr = oberon_make_integer(ctx, x % y); break;
+ default: assert(0); break;
+ }
+ }
+ else
+ {
+ assert(0);
}
}
else
{
- error = true;
+ a = oberon_cast_expr(ctx, a, result);
+ b = oberon_cast_expr(ctx, b, result);
+
+
+ if(oberon_is_set_type(result))
+ {
+ switch(token)
+ {
+ case PLUS:
+ expr = oberon_new_operator(OP_UNION, result, a, b);
+ break;
+ case MINUS:
+ expr = oberon_new_operator(OP_DIFFERENCE, result, a, b);
+ break;
+ case STAR:
+ expr = oberon_new_operator(OP_INTERSECTION, result, a, b);
+ break;
+ default:
+ assert(0);
+ break;
+ }
+ }
+ else if(oberon_is_number_type(result))
+ {
+ switch(token)
+ {
+ case PLUS:
+ expr = oberon_new_operator(OP_ADD, result, a, b);
+ break;
+ case MINUS:
+ expr = oberon_new_operator(OP_SUB, result, a, b);
+ break;
+ case STAR:
+ expr = oberon_new_operator(OP_MUL, result, a, b);
+ break;
+ default:
+ assert(0);
+ break;
+ }
+ }
+ else
+ {
+ assert(0);
+ }
}
}
- if(error)
- {
- oberon_error(ctx, "invalid operation");
- }
-
return expr;
}
return expr;
}
-static oberon_item_t *
-oberon_const_expr(oberon_context_t * ctx)
+static bool
+oberon_is_const(oberon_expr_t * expr)
{
- oberon_expr_t * expr;
- expr = oberon_expr(ctx);
-
- if(expr -> is_item == 0)
+ if(expr -> is_item == false)
{
- oberon_error(ctx, "const expression are required");
+ return false;
}
switch(expr -> item.mode)
case MODE_REAL:
case MODE_CHAR:
case MODE_STRING:
+ case MODE_SET:
case MODE_TYPE:
- /* accept */
+ return true;
break;
default:
- oberon_error(ctx, "const expression are required");
+ return false;
break;
}
+ return false;
+}
+
+static void
+oberon_check_const(oberon_context_t * ctx, oberon_expr_t * expr)
+{
+ if(!oberon_is_const(expr))
+ {
+ oberon_error(ctx, "const expression are required");
+ }
+}
+
+static oberon_item_t *
+oberon_const_expr(oberon_context_t * ctx)
+{
+ oberon_expr_t * expr;
+ expr = oberon_expr(ctx);
+ oberon_check_const(ctx, expr);
return (oberon_item_t *) expr;
}
int num;
oberon_object_t * list;
oberon_type_t * type;
- type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_ident_list(ctx, OBERON_CLASS_VAR, false, &num, &list);
oberon_assert_token(ctx, COLON);
oberon_assert_token(ctx, COLON);
oberon_type_t * type;
- type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_type(ctx, &type);
oberon_object_t * param = list;
{
oberon_error(ctx, "function result is not type");
}
+ if(typeobj -> type -> class == OBERON_TYPE_RECORD
+ || typeobj -> type -> class == OBERON_TYPE_ARRAY)
+ {
+ oberon_error(ctx, "records or arrays could not be result of function");
+ }
signature -> base = typeobj -> type;
}
}
signature = *type;
signature -> class = OBERON_TYPE_PROCEDURE;
signature -> num_decl = 0;
- signature -> base = ctx -> void_type;
+ signature -> base = ctx -> notype_type;
signature -> decl = NULL;
if(ctx -> token == LPAREN)
oberon_object_t * proc = ctx -> decl -> parent;
oberon_type_t * result_type = proc -> type -> base;
- if(result_type -> class == OBERON_TYPE_VOID)
+ if(result_type -> class == OBERON_TYPE_NOTYPE)
{
if(expr != NULL)
{
oberon_error(ctx, "procedure requires expression on result");
}
- expr = oberon_autocast_to(ctx, expr, result_type);
+ oberon_check_src(ctx, expr);
+ oberon_check_assignment_compatible(ctx, expr, result_type);
+ expr = oberon_cast_expr(ctx, expr, result_type);
}
proc -> has_return = 1;
oberon_error(ctx, "procedure name not matched");
}
- if(proc -> type -> base -> class == OBERON_TYPE_VOID
+ if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE
&& proc -> has_return == 0)
{
oberon_make_return(ctx, NULL);
ctx -> decl -> local = 1;
oberon_type_t * signature;
- signature = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ signature = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_opt_formal_pars(ctx, &signature);
- oberon_initialize_decl(ctx);
+ //oberon_initialize_decl(ctx);
oberon_generator_init_type(ctx, signature);
oberon_close_scope(ctx -> decl);
oberon_object_t * proc;
proc = oberon_find_object(ctx -> decl, name, 0);
- if(proc != NULL)
+ if(proc == NULL)
+ {
+ proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, export, read_only, false);
+ proc -> type = signature;
+ proc -> scope = proc_scope;
+ oberon_generator_init_proc(ctx, proc);
+ }
+ else
{
if(proc -> class != OBERON_CLASS_PROC)
{
oberon_compare_signatures(ctx, proc -> type, signature);
}
- else
+
+ proc_scope -> parent = proc;
+ oberon_object_t * param = proc_scope -> list -> next;
+ while(param)
{
- proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, export, read_only, false);
- proc -> type = signature;
- proc -> scope = proc_scope;
- oberon_generator_init_proc(ctx, proc);
+ param -> parent = proc;
+ param = param -> next;
}
- proc -> scope -> parent = proc;
-
if(forward == 0)
{
proc -> linked = 1;
else
{
to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, false, false, false);
- to -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ to -> type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
}
*type = to -> type;
@@ -2540,7 +2459,7 @@ oberon_make_multiarray(oberon_context_t * ctx, oberon_expr_t * sizes, oberon_typ
}
oberon_type_t * dim;
- dim = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ dim = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_make_multiarray(ctx, sizes -> next, base, &dim);
@@ -2563,7 +2482,7 @@ oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec, oberon_scope_t *
int num;
oberon_object_t * list;
oberon_type_t * type;
- type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_ident_list(ctx, OBERON_CLASS_FIELD, true, &num, &list);
oberon_assert_token(ctx, COLON);
oberon_assert_token(ctx, OF);
oberon_type_t * base;
- base = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ base = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_type(ctx, &base);
if(num_sizes == 0)
oberon_assert_token(ctx, TO);
oberon_type_t * base;
- base = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ base = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_type(ctx, &base);
oberon_type_t * ptr;
if(newtype == NULL)
{
newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, export, read_only, false);
- newtype -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ newtype -> type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
assert(newtype -> type);
}
else
type = newtype -> type;
oberon_type(ctx, &type);
- if(type -> class == OBERON_TYPE_VOID)
+ if(type -> class == OBERON_TYPE_NOTYPE)
{
oberon_error(ctx, "recursive alias declaration");
}
@@ -2810,6 +2729,11 @@ oberon_prevent_recursive_record(oberon_context_t * ctx, oberon_type_t * type)
type -> recursive = 1;
+ if(type -> base)
+ {
+ oberon_prevent_recursive_record(ctx, type -> base);
+ }
+
int num_fields = type -> num_decl;
oberon_object_t * field = type -> decl;
for(int i = 0; i < num_fields; i++)
static void
oberon_initialize_type(oberon_context_t * ctx, oberon_type_t * type)
{
- if(type -> class == OBERON_TYPE_VOID)
+ if(type -> class == OBERON_TYPE_NOTYPE)
{
oberon_error(ctx, "undeclarated type");
}
static void
oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
{
- if(dst -> read_only)
+ oberon_check_dst(ctx, dst);
+ oberon_check_assignment_compatible(ctx, src, dst -> result);
+
+ if(oberon_is_string_type(src -> result))
{
- oberon_error(ctx, "read-only destination");
+ src -> next = dst;
+ oberon_make_copy_call(ctx, 2, src);
+ }
+ else
+ {
+ src = oberon_cast_expr(ctx, src, dst -> result);
+ oberon_generate_assign(ctx, src, dst);
}
+}
- oberon_check_dst(ctx, dst);
- src = oberon_autocast_to(ctx, src, dst -> result);
- oberon_generate_assign(ctx, src, dst);
+static oberon_expr_t *
+oberon_case_labels(oberon_context_t * ctx, oberon_expr_t * val)
+{
+ oberon_expr_t * e1;
+ oberon_expr_t * e2;
+ oberon_expr_t * cond;
+ oberon_expr_t * cond2;
+
+ e1 = (oberon_expr_t *) oberon_const_expr(ctx);
+
+ e2 = NULL;
+ if(ctx -> token == DOTDOT)
+ {
+ oberon_assert_token(ctx, DOTDOT);
+ e2 = (oberon_expr_t *) oberon_const_expr(ctx);
+ }
+
+ if(e2 == NULL)
+ {
+ /* val == e1 */
+ cond = oberon_make_bin_op(ctx, EQUAL, val, e1);
+ }
+ else
+ {
+ /* val >= e1 && val <= e2 */
+ cond = oberon_make_bin_op(ctx, GEQ, val, e1);
+ cond2 = oberon_make_bin_op(ctx, LEQ, val, e2);
+ cond = oberon_make_bin_op(ctx, AND, cond, cond2);
+ }
+
+ return cond;
+}
+
+static void
+oberon_case(oberon_context_t * ctx, oberon_expr_t * val, gen_label_t * end)
+{
+ oberon_expr_t * cond;
+ oberon_expr_t * cond2;
+ gen_label_t * this_end;
+
+ if(ISEXPR(ctx -> token))
+ {
+ this_end = oberon_generator_reserve_label(ctx);
+
+ cond = oberon_case_labels(ctx, val);
+ while(ctx -> token == COMMA)
+ {
+ oberon_assert_token(ctx, COMMA);
+ /* cond || cond2 */
+ cond2 = oberon_case_labels(ctx, val);
+ cond = oberon_make_bin_op(ctx, OR, cond, cond2);
+ }
+ oberon_assert_token(ctx, COLON);
+
+ oberon_generate_branch(ctx, cond, false, this_end);
+ oberon_statement_seq(ctx);
+ oberon_generate_goto(ctx, end);
+
+ oberon_generate_label(ctx, this_end);
+ }
+}
+
+static void
+oberon_case_statement(oberon_context_t * ctx)
+{
+ oberon_expr_t * val;
+ oberon_expr_t * expr;
+ gen_label_t * end;
+
+ end = oberon_generator_reserve_label(ctx);
+
+ oberon_assert_token(ctx, CASE);
+ expr = oberon_expr(ctx);
+ val = oberon_make_temp_var_item(ctx, expr -> result);
+ oberon_assign(ctx, expr, val);
+ oberon_assert_token(ctx, OF);
+ oberon_case(ctx, val, end);
+ while(ctx -> token == BAR)
+ {
+ oberon_assert_token(ctx, BAR);
+ oberon_case(ctx, val, end);
+ }
+
+ if(ctx -> token == ELSE)
+ {
+ oberon_assert_token(ctx, ELSE);
+ oberon_statement_seq(ctx);
+ }
+ else
+ {
+ oberon_generate_trap(ctx, -1);
+ }
+
+ oberon_generate_label(ctx, end);
+ oberon_assert_token(ctx, END);
+}
+
+static void
+oberon_with_guard_do(oberon_context_t * ctx, gen_label_t * end)
+{
+ oberon_expr_t * val;
+ oberon_expr_t * var;
+ oberon_expr_t * type;
+ oberon_expr_t * cond;
+ oberon_expr_t * cast;
+ oberon_type_t * old_type;
+ gen_var_t * old_var;
+ gen_label_t * this_end;
+
+ this_end = oberon_generator_reserve_label(ctx);
+
+ var = oberon_qualident_expr(ctx);
+ oberon_assert_token(ctx, COLON);
+ type = oberon_qualident_expr(ctx);
+ cond = oberon_make_bin_op(ctx, IS, var, type);
+
+ oberon_assert_token(ctx, DO);
+ oberon_generate_branch(ctx, cond, false, this_end);
+
+ /* Сохраняем ссылку во временной переменной */
+ val = oberon_make_temp_var_item(ctx, type -> result);
+ //cast = oberno_make_record_cast(ctx, var, type -> result);
+ cast = oberon_cast_expr(ctx, var, type -> result);
+ oberon_assign(ctx, cast, val);
+ /* Подменяем тип у оригинальной переменной */
+ old_type = var -> item.var -> type;
+ var -> item.var -> type = type -> result;
+ /* Подменяем ссылку на переменную */
+ old_var = var -> item.var -> gen_var;
+ var -> item.var -> gen_var = val -> item.var -> gen_var;
+
+ oberon_statement_seq(ctx);
+ oberon_generate_goto(ctx, end);
+ oberon_generate_label(ctx, this_end);
+
+ /* Возвращаем исходное состояние */
+ var -> item.var -> gen_var = old_var;
+ var -> item.var -> type = old_type;
+}
+
+static void
+oberon_with_statement(oberon_context_t * ctx)
+{
+ gen_label_t * end;
+ end = oberon_generator_reserve_label(ctx);
+
+ oberon_assert_token(ctx, WITH);
+ oberon_with_guard_do(ctx, end);
+ while(ctx -> token == BAR)
+ {
+ oberon_assert_token(ctx, BAR);
+ oberon_with_guard_do(ctx, end);
+ }
+
+ if(ctx -> token == ELSE)
+ {
+ oberon_assert_token(ctx, ELSE);
+ oberon_statement_seq(ctx);
+ }
+ else
+ {
+ oberon_generate_trap(ctx, -2);
+ }
+
+ oberon_generate_label(ctx, end);
+ oberon_assert_token(ctx, END);
}
static void
index = oberon_ident_item(ctx, iname);
oberon_assert_token(ctx, ASSIGN);
from = oberon_expr(ctx);
- oberon_assign(ctx, from, index);
oberon_assert_token(ctx, TO);
bound = oberon_make_temp_var_item(ctx, index -> result);
to = oberon_expr(ctx);
- oberon_assign(ctx, to, bound);
+ oberon_assign(ctx, to, bound); // сначала temp
+ oberon_assign(ctx, from, index); // потом i
if(ctx -> token == BY)
{
oberon_assert_token(ctx, BY);
}
else
{
- by = oberon_integer_item(ctx, 1);
+ by = oberon_make_integer(ctx, 1);
}
if(by -> result -> class != OBERON_TYPE_INTEGER)
}
oberon_generate_goto(ctx, ctx -> decl -> exit_label);
}
+ else if(ctx -> token == CASE)
+ {
+ oberon_case_statement(ctx);
+ }
+ else if(ctx -> token == WITH)
+ {
+ oberon_with_statement(ctx);
+ }
else if(ctx -> token == RETURN)
{
oberon_assert_token(ctx, RETURN);
oberon_assert_token(ctx, END);
name2 = oberon_assert_ident(ctx);
- oberon_assert_token(ctx, DOT);
+ oberon_expect_token(ctx, DOT);
if(strcmp(name1, name2) != 0)
{
static void
register_default_types(oberon_context_t * ctx)
{
- ctx -> void_type = oberon_new_type_ptr(OBERON_TYPE_VOID);
- oberon_generator_init_type(ctx, ctx -> void_type);
+ ctx -> notype_type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
+ oberon_generator_init_type(ctx, ctx -> notype_type);
- ctx -> void_ptr_type = oberon_new_type_ptr(OBERON_TYPE_POINTER);
- ctx -> void_ptr_type -> base = ctx -> void_type;
- oberon_generator_init_type(ctx, ctx -> void_ptr_type);
+ ctx -> nil_type = oberon_new_type_ptr(OBERON_TYPE_NIL);
+ oberon_generator_init_type(ctx, ctx -> nil_type);
ctx -> string_type = oberon_new_type_string(1);
oberon_generator_init_type(ctx, ctx -> string_type);
ctx -> bool_type = oberon_new_type_boolean();
oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
+ ctx -> char_type = oberon_new_type_char(1);
+ oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
+
ctx -> byte_type = oberon_new_type_integer(1);
- oberon_define_type(ctx -> world_scope, "BYTE", ctx -> byte_type, 1);
+ oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> byte_type, 1);
ctx -> shortint_type = oberon_new_type_integer(2);
- oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> shortint_type, 1);
+ oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> shortint_type, 1);
ctx -> int_type = oberon_new_type_integer(4);
- oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> int_type, 1);
+ oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> int_type, 1);
ctx -> longint_type = oberon_new_type_integer(8);
- oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> longint_type, 1);
+ oberon_define_type(ctx -> world_scope, "HUGEINT", ctx -> longint_type, 1);
ctx -> real_type = oberon_new_type_real(4);
oberon_define_type(ctx -> world_scope, "REAL", ctx -> real_type, 1);
ctx -> longreal_type = oberon_new_type_real(8);
oberon_define_type(ctx -> world_scope, "LONGREAL", ctx -> longreal_type, 1);
- ctx -> char_type = oberon_new_type_char(1);
- oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
-
ctx -> set_type = oberon_new_type_set(4);
oberon_define_type(ctx -> world_scope, "SET", ctx -> set_type, 1);
}
@@ -3575,10 +3679,10 @@ oberon_make_min_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
switch(arg -> result -> class)
{
case OBERON_TYPE_INTEGER:
- expr = oberon_integer_item(ctx, -powl(2, bits - 1));
+ expr = oberon_make_integer(ctx, -powl(2, bits - 1));
break;
case OBERON_TYPE_SET:
- expr = oberon_integer_item(ctx, 0);
+ expr = oberon_make_integer(ctx, 0);
break;
default:
oberon_error(ctx, "allowed only basic types");
@@ -3614,10 +3718,10 @@ oberon_make_max_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
switch(arg -> result -> class)
{
case OBERON_TYPE_INTEGER:
- expr = oberon_integer_item(ctx, powl(2, bits - 1) - 1);
+ expr = oberon_make_integer(ctx, powl(2, bits - 1) - 1);
break;
case OBERON_TYPE_SET:
- expr = oberon_integer_item(ctx, bits);
+ expr = oberon_make_integer(ctx, bits);
break;
default:
oberon_error(ctx, "allowed only basic types");
@@ -3665,7 +3769,7 @@ oberon_make_size_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list
break;
}
- expr = oberon_integer_item(ctx, size);
+ expr = oberon_make_integer(ctx, size);
return expr;
}
@@ -3707,7 +3811,6 @@ oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_error(ctx, "too few arguments");
}
-
oberon_expr_t * dst;
dst = list_args;
oberon_check_dst(ctx, dst);
@@ -3783,6 +3886,119 @@ oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_assign(ctx, src, dst);
}
+static void
+oberon_make_copy_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 2)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 2)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * src;
+ src = list_args;
+ oberon_check_src(ctx, src);
+
+ oberon_expr_t * dst;
+ dst = list_args -> next;
+ oberon_check_dst(ctx, dst);
+
+ if(!oberon_is_string_type(src -> result) && !oberon_is_array_of_char_type(src -> result))
+ {
+ oberon_error(ctx, "source must be string or array of char");
+ }
+
+ if(!oberon_is_array_of_char_type(dst -> result))
+ {
+ oberon_error(ctx, "dst must be array of char");
+ }
+
+ oberon_generate_copy(ctx, src, dst);
+}
+
+static void
+oberon_make_assert_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 1)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 2)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * cond;
+ cond = list_args;
+ oberon_check_src(ctx, cond);
+
+ if(cond -> result -> class != OBERON_TYPE_BOOLEAN)
+ {
+ oberon_error(ctx, "expected boolean");
+ }
+
+ if(num_args == 1)
+ {
+ oberon_generate_assert(ctx, cond);
+ }
+ else
+ {
+ oberon_expr_t * num;
+ num = list_args -> next;
+ oberon_check_src(ctx, num);
+
+ if(num -> result -> class != OBERON_TYPE_INTEGER)
+ {
+ oberon_error(ctx, "expected integer");
+ }
+
+ oberon_check_const(ctx, num);
+
+ oberon_generate_assert_n(ctx, cond, num -> item.integer);
+ }
+}
+
+static void
+oberon_make_halt_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 1)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 1)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * num;
+ num = list_args;
+ oberon_check_src(ctx, num);
+
+ if(num -> result -> class != OBERON_TYPE_INTEGER)
+ {
+ oberon_error(ctx, "expected integer");
+ }
+
+ oberon_check_const(ctx, num);
+
+ oberon_generate_halt(ctx, num -> item.integer);
+}
+
+static void
+oberon_new_const(oberon_context_t * ctx, char * name, oberon_expr_t * expr)
+{
+ oberon_object_t * constant;
+ constant = oberon_define_object(ctx -> decl, name, OBERON_CLASS_CONST, true, false, false);
+ oberon_check_const(ctx, expr);
+ constant -> value = (oberon_item_t *) expr;
+}
+
oberon_context_t *
oberon_create_context(ModuleImportCallback import_module)
{
register_default_types(ctx);
+ /* Constants */
+ oberon_new_const(ctx, "TRUE", oberon_make_boolean(ctx, true));
+ oberon_new_const(ctx, "FALSE", oberon_make_boolean(ctx, false));
+
/* Functions */
oberon_new_intrinsic(ctx, "ABS", oberon_make_abs_call, NULL);
oberon_new_intrinsic(ctx, "MIN", oberon_make_min_call, NULL);
/* Procedures */
oberon_new_intrinsic(ctx, "NEW", NULL, oberon_make_new_call);
+ oberon_new_intrinsic(ctx, "COPY", NULL, oberon_make_copy_call);
+ oberon_new_intrinsic(ctx, "ASSERT", NULL, oberon_make_assert_call);
+ oberon_new_intrinsic(ctx, "HALT", NULL, oberon_make_halt_call);
return ctx;
}