diff --git a/src/oberon.c b/src/oberon.c
index e88ff79159e28e93c010a73ebde045ee8a6c9132..1f33a03c9d82bc084e3ffb1b38777b6750bc9c2f 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
BEGIN,
ASSIGN,
INTEGER,
BEGIN,
ASSIGN,
INTEGER,
- TRUE,
- FALSE,
LPAREN,
RPAREN,
EQUAL,
LPAREN,
RPAREN,
EQUAL,
TYPE,
ARRAY,
OF,
TYPE,
ARRAY,
OF,
- LBRACE,
- RBRACE,
+ LBRACK,
+ RBRACK,
RECORD,
POINTER,
TO,
RECORD,
POINTER,
TO,
FOR,
BY,
LOOP,
FOR,
BY,
LOOP,
- EXIT
+ EXIT,
+ LBRACE,
+ RBRACE,
+ DOTDOT,
+ CASE,
+ BAR,
+ WITH
};
// =======================================================================
// UTILS
// =======================================================================
};
// =======================================================================
// UTILS
// =======================================================================
+static void
+oberon_make_copy_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args);
+
static void
oberon_error(oberon_context_t * ctx, const char * fmt, ...)
{
static void
oberon_error(oberon_context_t * ctx, const char * fmt, ...)
{
return x;
}
return x;
}
+static oberon_type_t *
+oberon_new_type_set(int size)
+{
+ oberon_type_t * x;
+ x = oberon_new_type_ptr(OBERON_TYPE_SET);
+ x -> size = size;
+ return x;
+}
+
// =======================================================================
// TABLE
// =======================================================================
// =======================================================================
// TABLE
// =======================================================================
{
ctx -> token = BEGIN;
}
{
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;
else if(strcmp(ident, "OR") == 0)
{
ctx -> token = OR;
{
ctx -> token = EXIT;
}
{
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)
{
static void
oberon_read_number(oberon_context_t * ctx)
{
end_i = ctx -> code_index;
end_i = ctx -> code_index;
- if(isxdigit(ctx -> c))
+ if(ISHEXDIGIT(ctx -> c))
{
mode = 1;
{
mode = 1;
- while(isxdigit(ctx -> c))
+ while(ISHEXDIGIT(ctx -> c))
{
oberon_get_char(ctx);
}
{
oberon_get_char(ctx);
}
}
else if(ctx -> c == '.')
{
}
else if(ctx -> c == '.')
{
- mode = 2;
oberon_get_char(ctx);
oberon_get_char(ctx);
-
- while(isdigit(ctx -> c))
+ if(ctx -> c == '.')
{
{
- oberon_get_char(ctx);
+ /* Чит: избегаем конфликта с DOTDOT */
+ ctx -> code_index -= 1;
}
}
-
- if(ctx -> c == 'E' || ctx -> c == 'D')
+ else
{
{
- exp_i = ctx -> code_index;
-
- if(ctx -> c == 'D')
- {
- mode = 3;
- }
+ mode = 2;
- oberon_get_char(ctx);
-
- if(ctx -> c == '+' || ctx -> c == '-')
+ while(isdigit(ctx -> c))
{
oberon_get_char(ctx);
}
{
oberon_get_char(ctx);
}
- while(isdigit(ctx -> c))
+ if(ctx -> c == 'E' || ctx -> c == 'D')
{
{
+ exp_i = ctx -> code_index;
+
+ if(ctx -> c == 'D')
+ {
+ mode = 3;
+ }
+
oberon_get_char(ctx);
oberon_get_char(ctx);
- }
- }
+ if(ctx -> c == '+' || ctx -> c == '-')
+ {
+ oberon_get_char(ctx);
+ }
+ while(isdigit(ctx -> c))
+ {
+ oberon_get_char(ctx);
+ }
+ }
+ }
end_i = ctx -> code_index;
}
end_i = ctx -> code_index;
}
ctx -> token = STRING;
ctx -> string = string;
ctx -> token = STRING;
ctx -> string = string;
-
- printf("oberon_read_string: string ((%s))\n", string);
}
static void oberon_read_token(oberon_context_t * ctx);
}
static void oberon_read_token(oberon_context_t * ctx);
case '.':
ctx -> token = DOT;
oberon_get_char(ctx);
case '.':
ctx -> token = DOT;
oberon_get_char(ctx);
+ if(ctx -> c == '.')
+ {
+ ctx -> token = DOTDOT;
+ oberon_get_char(ctx);
+ }
break;
case '(':
ctx -> token = LPAREN;
break;
case '(':
ctx -> token = LPAREN;
oberon_get_char(ctx);
break;
case '[':
oberon_get_char(ctx);
break;
case '[':
- ctx -> token = LBRACE;
+ ctx -> token = LBRACK;
oberon_get_char(ctx);
break;
case ']':
oberon_get_char(ctx);
break;
case ']':
- ctx -> token = RBRACE;
+ ctx -> token = RBRACK;
oberon_get_char(ctx);
break;
case '^':
oberon_get_char(ctx);
break;
case '^':
case '\'':
oberon_read_string(ctx);
break;
case '\'':
oberon_read_string(ctx);
break;
+ case '{':
+ ctx -> token = LBRACE;
+ oberon_get_char(ctx);
+ break;
+ case '}':
+ 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;
default:
oberon_error(ctx, "invalid char %c", ctx -> c);
break;
if(token == MINUS)
{
if(token == MINUS)
{
- if(result -> class != OBERON_TYPE_INTEGER)
+ if(result -> class == OBERON_TYPE_SET)
+ {
+ 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);
+ }
+ else
{
oberon_error(ctx, "incompatible operator type");
}
{
oberon_error(ctx, "incompatible operator type");
}
-
- expr = oberon_new_operator(OP_UNARY_MINUS, result, a, NULL);
}
else if(token == NOT)
{
}
else if(token == NOT)
{
@@ -941,11 +987,8 @@ oberno_make_record_cast(oberon_context_t * ctx, oberon_expr_t * expr, oberon_typ
oberon_type_t * from = expr -> result;
oberon_type_t * to = 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)
{
if(from -> class == OBERON_TYPE_POINTER && to -> class == OBERON_TYPE_POINTER)
{
- printf("oberno_make_record_cast: pointers\n");
from = from -> base;
to = to -> base;
}
from = from -> base;
to = to -> base;
}
@@ -1015,6 +1058,11 @@ oberon_check_record_compatibility(oberon_context_t * ctx, oberon_type_t * from,
static void
oberon_check_dst(oberon_context_t * ctx, oberon_expr_t * dst)
{
static void
oberon_check_dst(oberon_context_t * ctx, oberon_expr_t * dst)
{
+ if(dst -> read_only)
+ {
+ oberon_error(ctx, "read-only destination");
+ }
+
if(dst -> is_item == false)
{
oberon_error(ctx, "not variable");
if(dst -> is_item == false)
{
oberon_error(ctx, "not variable");
@@ -1054,19 +1102,41 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
// Допускается:
// Если классы типов равны
// Если INTEGER переводится в REAL
// Допускается:
// Если классы типов равны
// Если INTEGER переводится в REAL
- // Есди STRING переводится в ARRAY OF CHAR
+ // Если STRING переводится в CHAR
+ // Если STRING переводится в ARRAY OF CHAR
+ // Если NIL переводится в POINTER
+ // Если NIL переводится в PROCEDURE
oberon_check_src(ctx, expr);
bool error = false;
if(pref -> class != expr -> result -> class)
{
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(expr -> result -> class == OBERON_TYPE_NIL)
{
{
- if(pref -> class == OBERON_TYPE_ARRAY)
+ if(pref -> class != OBERON_TYPE_POINTER
+ && pref -> class != OBERON_TYPE_PROCEDURE)
+ {
+ error = true;
+ }
+ }
+ else if(expr -> result -> class == OBERON_TYPE_STRING)
+ {
+ if(pref -> class == OBERON_TYPE_CHAR)
+ {
+ if(expr -> is_item && expr -> item.mode == MODE_STRING)
+ {
+ if(strlen(expr -> item.string) != 1)
+ {
+ error = true;
+ }
+ }
+ else
+ {
+ error = true;
+ }
+ }
+ else if(pref -> class == OBERON_TYPE_ARRAY)
{
if(pref -> base -> class != OBERON_TYPE_CHAR)
{
{
if(pref -> base -> class != OBERON_TYPE_CHAR)
{
@@ -1096,7 +1166,16 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
oberon_error(ctx, "oberon_autocast_to: incompatible types");
}
oberon_error(ctx, "oberon_autocast_to: incompatible types");
}
- if(pref -> class == OBERON_TYPE_INTEGER || pref -> class == OBERON_TYPE_REAL)
+ if(pref -> class == OBERON_TYPE_CHAR)
+ {
+ if(expr -> result -> class == OBERON_TYPE_STRING)
+ {
+ int c = expr -> item.string[0];
+ expr = oberon_new_item(MODE_CHAR, ctx -> char_type, true);
+ expr -> item.integer = c;
+ }
+ }
+ else if(pref -> class == OBERON_TYPE_INTEGER || pref -> class == OBERON_TYPE_REAL)
{
if(expr -> result -> size > pref -> size)
{
{
if(expr -> result -> size > pref -> size)
{
@@ -1115,17 +1194,18 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
else if(pref -> class == OBERON_TYPE_POINTER)
{
assert(pref -> base);
else if(pref -> class == OBERON_TYPE_POINTER)
{
assert(pref -> base);
- if(expr -> result -> base -> class == OBERON_TYPE_RECORD)
+ if(expr -> result -> class == OBERON_TYPE_NIL)
+ {
+ // do nothing
+ }
+ else 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)
{
{
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");
- }
+ oberon_error(ctx, "incompatible pointer types");
}
}
}
}
{
if(param -> class == OBERON_CLASS_VAR_PARAM)
{
{
if(param -> class == OBERON_CLASS_VAR_PARAM)
{
+ if(arg -> result != param -> type)
+ {
+ oberon_error(ctx, "incompatible type");
+ }
if(arg -> read_only)
{
oberon_error(ctx, "assign to read-only var");
}
if(arg -> read_only)
{
oberon_error(ctx, "assign to read-only var");
}
+ casted[i] = arg;
+ }
+ else
+ {
+ casted[i] = oberon_autocast_to(ctx, arg, param -> type);
}
}
- casted[i] = oberon_autocast_to(ctx, arg, param -> type);
arg = arg -> next;
param = param -> next;
}
arg = arg -> next;
param = param -> next;
}
@@ -1216,7 +1304,7 @@ oberon_make_call_func(oberon_context_t * ctx, oberon_item_t * item, int num_args
}
else
{
}
else
{
- if(signature -> base -> class == OBERON_TYPE_VOID)
+ if(signature -> base -> class == OBERON_TYPE_NOTYPE)
{
oberon_error(ctx, "attempt to call procedure in expression");
}
{
oberon_error(ctx, "attempt to call procedure in expression");
}
@@ -1253,7 +1341,7 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
}
else
{
}
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");
}
{
oberon_error(ctx, "attempt to call function as non-typed procedure");
}
@@ -1277,14 +1365,11 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
|| ((x) == STRING) \
|| ((x) == NIL) \
|| ((x) == LPAREN) \
|| ((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)
{
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");
if(expr -> result -> class != OBERON_TYPE_POINTER)
{
oberon_error(ctx, "not a pointer");
@@ -1376,7 +1461,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)
if(field -> read_only)
{
if(field -> module != ctx -> mod)
@@ -1394,7 +1479,7 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
}
#define ISSELECTOR(x) \
}
#define ISSELECTOR(x) \
- (((x) == LBRACE) \
+ (((x) == LBRACK) \
|| ((x) == DOT) \
|| ((x) == UPARROW) \
|| ((x) == LPAREN))
|| ((x) == DOT) \
|| ((x) == UPARROW) \
|| ((x) == LPAREN))
}
static oberon_expr_t *
}
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_object_t * var;
oberon_expr_t * expr;
oberon_error(ctx, "invalid designator");
break;
}
oberon_error(ctx, "invalid designator");
break;
}
+
expr -> item.var = var;
expr -> item.var = var;
+ return expr;
+}
+
+static void
+oberon_check_type_guard(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * type)
+{
+ /* Охрана типа применима, если */
+ /* 1. v - параметр-переменная типа запись, или v - указатель, и если */
+ /* 2. T - расширение статического типа v */
+
+ if(expr -> is_item
+ && expr -> item.mode == MODE_VAR
+ && expr -> item.var -> class == OBERON_CLASS_VAR_PARAM)
+ {
+ // accept
+ }
+ else if(expr -> result -> class == OBERON_TYPE_POINTER
+ || expr -> result -> class == OBERON_TYPE_RECORD)
+ {
+ // accept
+ }
+ else
+ {
+ oberon_error(ctx, "guard type used only with var-param or pointers");
+ }
+
+ oberon_check_record_compatibility(ctx, type, expr -> result);
+}
+
+static oberon_expr_t *
+oberon_make_type_guard(oberon_context_t * ctx, oberon_expr_t * expr, oberon_object_t * objtype)
+{
+ oberon_type_t * type;
+
+ if(objtype -> class != OBERON_CLASS_TYPE)
+ {
+ oberon_error(ctx, "must be type");
+ }
+ type = objtype -> type;
+
+ oberon_check_type_guard(ctx, expr, type);
+ return oberno_make_record_cast(ctx, expr, objtype -> type);
+}
+
+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)
while(expr -> result -> class != OBERON_TYPE_PROCEDURE && ISSELECTOR(ctx -> token))
{
switch(ctx -> token)
name = oberon_assert_ident(ctx);
expr = oberon_make_record_selector(ctx, expr, name);
break;
name = oberon_assert_ident(ctx);
expr = oberon_make_record_selector(ctx, expr, name);
break;
- case LBRACE:
- oberon_assert_token(ctx, LBRACE);
+ case LBRACK:
+ oberon_assert_token(ctx, LBRACK);
int num_indexes = 0;
oberon_expr_t * indexes = NULL;
oberon_expr_list(ctx, &num_indexes, &indexes, 0);
int num_indexes = 0;
oberon_expr_t * indexes = NULL;
oberon_expr_list(ctx, &num_indexes, &indexes, 0);
- oberon_assert_token(ctx, RBRACE);
+ oberon_assert_token(ctx, RBRACK);
for(int i = 0; i < num_indexes; i++)
{
for(int i = 0; i < num_indexes; i++)
{
break;
case LPAREN:
oberon_assert_token(ctx, LPAREN);
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);
oberon_assert_token(ctx, RPAREN);
- expr = oberno_make_record_cast(ctx, expr, objtype -> type);
+ expr = oberon_make_type_guard(ctx, expr, objtype);
break;
default:
oberon_error(ctx, "oberon_designator: wat");
break;
default:
oberon_error(ctx, "oberon_designator: wat");
return expr;
}
return expr;
}
+static oberon_expr_t *
+oberon_element(oberon_context_t * ctx)
+{
+ oberon_expr_t * e1;
+ oberon_expr_t * e2;
+
+ e1 = oberon_expr(ctx);
+ if(e1 -> result -> class != OBERON_TYPE_INTEGER)
+ {
+ oberon_error(ctx, "expected integer");
+ }
+
+ e2 = NULL;
+ if(ctx -> token == DOTDOT)
+ {
+ oberon_assert_token(ctx, DOTDOT);
+ e2 = oberon_expr(ctx);
+ 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);
+ return set;
+}
+
+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;
+
+ oberon_assert_token(ctx, LBRACE);
+ if(ISEXPR(ctx -> token))
+ {
+ elements = oberon_element(ctx);
+ set = oberon_new_operator(OP_UNION, ctx -> set_type, 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);
+ }
+ }
+ oberon_assert_token(ctx, RBRACE);
+
+ return set;
+}
+
+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;
+ return expr;
+}
+
static oberon_expr_t *
oberon_factor(oberon_context_t * ctx)
{
static oberon_expr_t *
oberon_factor(oberon_context_t * ctx)
{
expr -> item.real = ctx -> real;
oberon_assert_token(ctx, REAL);
break;
expr -> item.real = ctx -> real;
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);
+ case LBRACE:
+ expr = oberon_set(ctx);
break;
case LPAREN:
oberon_assert_token(ctx, LPAREN);
break;
case LPAREN:
oberon_assert_token(ctx, LPAREN);
break;
case NIL:
oberon_assert_token(ctx, NIL);
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");
break;
default:
oberon_error(ctx, "invalid expression");
return expr;
}
return expr;
}
-#define ITMAKESBOOLEAN(x) \
- (((x) >= EQUAL && (x) <= GEQ) || ((x) == OR) || ((x) == AND))
-
-#define ITUSEONLYINTEGER(x) \
- ((x) >= LESS && (x) <= GEQ)
-
-#define ITUSEONLYBOOLEAN(x) \
- (((x) == OR) || ((x) == AND))
-
static void
oberon_autocast_to_real(oberon_context_t * ctx, oberon_expr_t ** e)
{
static void
oberon_autocast_to_real(oberon_context_t * ctx, oberon_expr_t ** e)
{
}
}
}
}
+static bool
+oberon_is_numeric_type(oberon_type_t * t)
+{
+ return (t -> class == OBERON_TYPE_INTEGER) || (t -> class == OBERON_TYPE_REAL);
+}
+
+static bool
+oberon_is_char_type(oberon_type_t * t)
+{
+ return (t -> class == OBERON_TYPE_CHAR);
+}
+
+static bool
+oberon_is_string_type(oberon_type_t * t)
+{
+ return (t -> class == OBERON_TYPE_STRING)
+ || (t -> class == OBERON_TYPE_ARRAY && t -> base -> class == OBERON_TYPE_CHAR);
+}
+
+static bool
+oberon_is_boolean_type(oberon_type_t * t)
+{
+ return (t -> class == OBERON_TYPE_BOOLEAN);
+}
+
+static bool
+oberon_is_set_type(oberon_type_t * t)
+{
+ return (t -> class == OBERON_TYPE_SET);
+}
+
+static bool
+oberon_is_pointer_type(oberon_type_t * t)
+{
+ return (t -> class == OBERON_TYPE_POINTER) || (t -> class == OBERON_TYPE_NIL);
+}
+
+static bool
+oberon_is_procedure_type(oberon_type_t * t)
+{
+ return (t -> class == OBERON_TYPE_POINTER) || (t -> class == OBERON_TYPE_NIL);
+}
+
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;
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;
- if(token == IS)
+ bool error = false;
+ if(token == IN)
{
{
- oberon_type_t * v = a -> result;
- if(v -> class == OBERON_TYPE_POINTER)
+ if(a -> result -> class != OBERON_TYPE_INTEGER)
{
{
- v = v -> base;
- if(v -> class != OBERON_TYPE_RECORD)
- {
- oberon_error(ctx, "must be record");
- }
+ oberon_error(ctx, "must be integer");
}
}
- else if(v -> class != OBERON_TYPE_RECORD)
- {
- oberon_error(ctx, "must be record");
- }
- if(b -> is_item == false || b -> item.mode != MODE_TYPE)
+ if(b -> result -> class != OBERON_TYPE_SET)
{
{
- oberon_error(ctx, "requires type");
+ oberon_error(ctx, "must be set");
}
}
- oberon_type_t * t = b -> result;
- if(t -> class == OBERON_TYPE_POINTER)
- {
- t = t -> base;
- if(t -> class != OBERON_TYPE_RECORD)
- {
- oberon_error(ctx, "must be record");
- }
- }
- else if(t -> class != OBERON_TYPE_RECORD)
+ result = ctx -> bool_type;
+ expr = oberon_new_operator(OP_IN, result, a, b);
+ }
+ else if(token == IS)
+ {
+ if(b -> is_item == false || b -> item.mode != MODE_TYPE)
{
{
- oberon_error(ctx, "must be record");
+ oberon_error(ctx, "requires type");
}
result = ctx -> bool_type;
}
result = ctx -> bool_type;
+ oberon_check_type_guard(ctx, a, b -> result);
expr = oberon_new_operator(OP_IS, result, a, b);
}
expr = oberon_new_operator(OP_IS, result, a, b);
}
- else if(ITMAKESBOOLEAN(token))
+ else if((token >= EQUAL && token <= GEQ) || token == OR || token == AND)
{
{
- if(ITUSEONLYINTEGER(token))
+ if(token >= LESS && token <= GEQ)
+ {
+ if(oberon_is_numeric_type(a -> result) && oberon_is_numeric_type(b -> result))
+ {
+ // accept
+ }
+ else if(oberon_is_char_type(a -> result) && oberon_is_char_type(b -> result))
+ {
+ // accept
+ }
+ else if(oberon_is_string_type(a -> result) && oberon_is_string_type(b -> result))
+ {
+ // accept
+ }
+ else
+ {
+ oberon_error(ctx, "invalid comparation");
+ }
+ }
+ else if(token == EQUAL || token == NEQ)
{
{
- 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)
+ if(oberon_is_numeric_type(a -> result) && oberon_is_numeric_type(b -> result))
+ {
+ // accept
+ }
+ else if(oberon_is_char_type(a -> result) && oberon_is_char_type(b -> result))
+ {
+ // accept
+ }
+ else if(oberon_is_string_type(a -> result) && oberon_is_string_type(b -> result))
+ {
+ // accept
+ }
+ else if(oberon_is_boolean_type(a -> result) && oberon_is_boolean_type(b -> result))
+ {
+ // accept
+ }
+ else if(oberon_is_set_type(a -> result) && oberon_is_set_type(b -> result))
+ {
+ // accept
+ }
+ else if(oberon_is_pointer_type(a -> result) && oberon_is_pointer_type(b -> result))
+ {
+ // accept
+ }
+ else if(oberon_is_procedure_type(a -> result) && oberon_is_procedure_type(b -> result))
{
// accept
}
else
{
{
// accept
}
else
{
- oberon_error(ctx, "used only with numeric types");
+ oberon_error(ctx, "invalid comparation");
}
}
}
}
- else if(ITUSEONLYBOOLEAN(token))
+ else if(token == AND || token == OR)
{
{
- if(a -> result -> class != OBERON_TYPE_BOOLEAN
- || b -> result -> class != OBERON_TYPE_BOOLEAN)
+ if(!oberon_is_boolean_type(a -> result) || !oberon_is_boolean_type(b -> result))
{
{
- oberon_error(ctx, "used only with boolean type");
+ oberon_error(ctx, "invalid comparation");
}
}
}
}
+ else
+ {
+ oberon_error(ctx, "wat");
+ }
oberon_autocast_binary_op(ctx, &a, &b);
result = ctx -> bool_type;
oberon_autocast_binary_op(ctx, &a, &b);
result = ctx -> bool_type;
@@ -1825,10 +2080,21 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
}
else if(token == SLASH)
{
}
else if(token == SLASH)
{
- oberon_autocast_to_real(ctx, &a);
- oberon_autocast_to_real(ctx, &b);
- oberon_autocast_binary_op(ctx, &a, &b);
- expr = oberon_new_operator(OP_DIV, a -> result, a, b);
+ if(a -> result -> class == OBERON_TYPE_SET
+ || b -> result -> class == OBERON_TYPE_SET)
+ {
+ oberon_autocast_binary_op(ctx, &a, &b);
+ result = a -> 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)
{
}
else if(token == DIV)
{
@@ -1844,29 +2110,58 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
else
{
oberon_autocast_binary_op(ctx, &a, &b);
else
{
oberon_autocast_binary_op(ctx, &a, &b);
-
- if(token == PLUS)
- {
- expr = oberon_new_operator(OP_ADD, a -> result, a, b);
- }
- else if(token == MINUS)
- {
- expr = oberon_new_operator(OP_SUB, a -> result, a, b);
- }
- else if(token == STAR)
+ result = a -> result;
+ if(result -> class == OBERON_TYPE_SET)
{
{
- expr = oberon_new_operator(OP_MUL, a -> result, a, b);
+ 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:
+ error = true;
+ break;
+ }
}
}
- else if(token == MOD)
+ else if(result -> class == OBERON_TYPE_INTEGER
+ || result -> class == OBERON_TYPE_REAL)
{
{
- expr = oberon_new_operator(OP_MOD, a -> result, a, b);
+ 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;
+ case MOD:
+ expr = oberon_new_operator(OP_MOD, result, a, b);
+ break;
+ default:
+ error = true;
+ break;
+ }
}
else
{
}
else
{
- oberon_error(ctx, "oberon_make_bin_op: bin wat");
+ error = true;
}
}
}
}
+ if(error)
+ {
+ oberon_error(ctx, "invalid operation");
+ }
+
return expr;
}
return expr;
}
return expr;
}
return expr;
}
-static oberon_item_t *
-oberon_const_expr(oberon_context_t * ctx)
+static void
+oberon_check_const(oberon_context_t * ctx, oberon_expr_t * expr)
{
{
- oberon_expr_t * expr;
- expr = oberon_expr(ctx);
-
if(expr -> is_item == 0)
{
oberon_error(ctx, "const expression are required");
if(expr -> is_item == 0)
{
oberon_error(ctx, "const expression are required");
oberon_error(ctx, "const expression are required");
break;
}
oberon_error(ctx, "const expression are required");
break;
}
+}
+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;
}
return (oberon_item_t *) expr;
}
int num;
oberon_object_t * list;
oberon_type_t * type;
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_ident_list(ctx, OBERON_CLASS_VAR, false, &num, &list);
oberon_assert_token(ctx, COLON);
oberon_assert_token(ctx, COLON);
oberon_type_t * type;
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_type(ctx, &type);
oberon_object_t * param = list;
signature = *type;
signature -> class = OBERON_TYPE_PROCEDURE;
signature -> num_decl = 0;
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)
signature -> decl = NULL;
if(ctx -> token == LPAREN)
oberon_object_t * proc = ctx -> decl -> parent;
oberon_type_t * result_type = proc -> type -> base;
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)
{
{
if(expr != NULL)
{
oberon_error(ctx, "procedure name not matched");
}
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);
&& proc -> has_return == 0)
{
oberon_make_return(ctx, NULL);
ctx -> decl -> local = 1;
oberon_type_t * signature;
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_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);
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)
{
{
if(proc -> class != OBERON_CLASS_PROC)
{
oberon_compare_signatures(ctx, proc -> type, signature);
}
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;
if(forward == 0)
{
proc -> linked = 1;
else
{
to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, false, false, false);
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;
}
*type = to -> type;
@@ -2406,7 +2711,7 @@ oberon_make_multiarray(oberon_context_t * ctx, oberon_expr_t * sizes, oberon_typ
}
oberon_type_t * dim;
}
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);
oberon_make_multiarray(ctx, sizes -> next, base, &dim);
@@ -2429,7 +2734,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;
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_ident_list(ctx, OBERON_CLASS_FIELD, true, &num, &list);
oberon_assert_token(ctx, COLON);
oberon_assert_token(ctx, OF);
oberon_type_t * base;
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_type(ctx, &base);
if(num_sizes == 0)
oberon_assert_token(ctx, TO);
oberon_type_t * base;
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;
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);
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
assert(newtype -> type);
}
else
type = newtype -> type;
oberon_type(ctx, &type);
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");
}
{
oberon_error(ctx, "recursive alias declaration");
}
@@ -2676,6 +2981,11 @@ oberon_prevent_recursive_record(oberon_context_t * ctx, oberon_type_t * type)
type -> recursive = 1;
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++)
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)
{
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");
}
{
oberon_error(ctx, "undeclarated type");
}
static void
oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
{
static void
oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
{
- if(dst -> read_only)
+ if(src -> is_item
+ && src -> item.mode == MODE_STRING
+ && src -> result -> class == OBERON_TYPE_STRING
+ && dst -> result -> class == OBERON_TYPE_ARRAY
+ && dst -> result -> base -> class == OBERON_TYPE_CHAR
+ && dst -> result -> size > 0)
{
{
- oberon_error(ctx, "read-only destination");
+
+ if(strlen(src -> item.string) < dst -> result -> size)
+ {
+ src -> next = dst;
+ oberon_make_copy_call(ctx, 2, src);
+ }
+ else
+ {
+ oberon_error(ctx, "string too long for destination");
+ }
}
}
+ else
+ {
+ oberon_check_dst(ctx, dst);
+ src = oberon_autocast_to(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);
+ oberon_autocast_to(ctx, e1, val -> result);
+
+ e2 = NULL;
+ if(ctx -> token == DOTDOT)
+ {
+ oberon_assert_token(ctx, DOTDOT);
+ e2 = (oberon_expr_t *) oberon_const_expr(ctx);
+ oberon_autocast_to(ctx, e2, val -> result);
+ }
+
+ 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);
+ }
+
+ 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);
+ 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);
+ }
+
+ oberon_generate_label(ctx, end);
+ oberon_assert_token(ctx, END);
}
static void
}
static void
}
oberon_generate_goto(ctx, ctx -> decl -> exit_label);
}
}
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);
else if(ctx -> token == RETURN)
{
oberon_assert_token(ctx, RETURN);
oberon_assert_token(ctx, END);
name2 = oberon_assert_ident(ctx);
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)
{
if(strcmp(name1, name2) != 0)
{
static void
register_default_types(oberon_context_t * ctx)
{
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 -> 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 -> 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);
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);
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);
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);
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 -> 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 -> 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);
}
static void
}
static void
@@ -3440,6 +3937,9 @@ oberon_make_min_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
case OBERON_TYPE_INTEGER:
expr = oberon_integer_item(ctx, -powl(2, bits - 1));
break;
case OBERON_TYPE_INTEGER:
expr = oberon_integer_item(ctx, -powl(2, bits - 1));
break;
+ case OBERON_TYPE_SET:
+ expr = oberon_integer_item(ctx, 0);
+ break;
default:
oberon_error(ctx, "allowed only basic types");
break;
default:
oberon_error(ctx, "allowed only basic types");
break;
@@ -3476,6 +3976,9 @@ oberon_make_max_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
case OBERON_TYPE_INTEGER:
expr = oberon_integer_item(ctx, powl(2, bits - 1) - 1);
break;
case OBERON_TYPE_INTEGER:
expr = oberon_integer_item(ctx, powl(2, bits - 1) - 1);
break;
+ case OBERON_TYPE_SET:
+ expr = oberon_integer_item(ctx, bits);
+ break;
default:
oberon_error(ctx, "allowed only basic types");
break;
default:
oberon_error(ctx, "allowed only basic types");
break;
@@ -3513,6 +4016,8 @@ oberon_make_size_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list
case OBERON_TYPE_INTEGER:
case OBERON_TYPE_BOOLEAN:
case OBERON_TYPE_REAL:
case OBERON_TYPE_INTEGER:
case OBERON_TYPE_BOOLEAN:
case OBERON_TYPE_REAL:
+ case OBERON_TYPE_CHAR:
+ case OBERON_TYPE_SET:
size = type -> size;
break;
default:
size = type -> size;
break;
default:
@@ -3562,7 +4067,6 @@ oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_error(ctx, "too few arguments");
}
oberon_error(ctx, "too few arguments");
}
-
oberon_expr_t * dst;
dst = list_args;
oberon_check_dst(ctx, dst);
oberon_expr_t * dst;
dst = list_args;
oberon_check_dst(ctx, dst);
@@ -3638,6 +4142,119 @@ oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_assign(ctx, src, dst);
}
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_error(ctx, "source must be string or array of char");
+ }
+
+ if(!oberon_is_string_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)
{
oberon_context_t *
oberon_create_context(ModuleImportCallback import_module)
{
register_default_types(ctx);
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);
/* 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);
/* 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;
}
return ctx;
}