diff --git a/src/oberon.c b/src/oberon.c
index f2c901433aeb49363ef01007ed8336a1e5db1919..66a3c7025056b195a204386c126024933c4ebca3 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
#include <string.h>
#include <assert.h>
#include <stdbool.h>
+#include <math.h>
#include "../include/oberon.h"
TYPE,
ARRAY,
OF,
- LBRACE,
- RBRACE,
+ LBRACK,
+ RBRACK,
RECORD,
POINTER,
TO,
STRING,
IF,
THEN,
- ELSE
+ ELSE,
+ ELSIF,
+ WHILE,
+ DO,
+ REPEAT,
+ UNTIL,
+ FOR,
+ BY,
+ LOOP,
+ EXIT,
+ LBRACE,
+ RBRACE,
+ DOTDOT,
+ CASE,
+ BAR,
+ WITH
};
// =======================================================================
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
// =======================================================================
scope -> local = scope -> up -> local;
scope -> parent = scope -> up -> parent;
scope -> parent_type = scope -> up -> parent_type;
+ scope -> exit_label = scope -> up -> exit_label;
}
ctx -> decl = scope;
return result;
}
+static oberon_object_t *
+oberon_create_object(oberon_scope_t * scope, char * name, int class, bool export, bool read_only)
+{
+ oberon_object_t * newvar = malloc(sizeof *newvar);
+ memset(newvar, 0, sizeof *newvar);
+ newvar -> name = name;
+ newvar -> class = class;
+ newvar -> export = export;
+ newvar -> read_only = read_only;
+ newvar -> local = scope -> local;
+ newvar -> parent = scope -> parent;
+ newvar -> parent_type = scope -> parent_type;
+ newvar -> module = scope -> ctx -> mod;
+ return newvar;
+}
+
static oberon_object_t *
oberon_define_object(oberon_scope_t * scope, char * name, int class, bool export, bool read_only, bool check_upscope)
{
@@ -224,17 +266,8 @@ oberon_define_object(oberon_scope_t * scope, char * name, int class, bool export
oberon_error(scope -> ctx, "already defined");
}
- oberon_object_t * newvar = malloc(sizeof *newvar);
- memset(newvar, 0, sizeof *newvar);
- newvar -> name = name;
- newvar -> class = class;
- newvar -> export = export;
- newvar -> read_only = read_only;
- newvar -> local = scope -> local;
- newvar -> parent = scope -> parent;
- newvar -> parent_type = scope -> parent_type;
- newvar -> module = scope -> ctx -> mod;
-
+ oberon_object_t * newvar;
+ newvar = oberon_create_object(scope, name, class, export, read_only);
x -> next = newvar;
return newvar;
{
ctx -> token = ELSE;
}
+ else if(strcmp(ident, "ELSIF") == 0)
+ {
+ ctx -> token = ELSIF;
+ }
+ else if(strcmp(ident, "WHILE") == 0)
+ {
+ ctx -> token = WHILE;
+ }
+ else if(strcmp(ident, "DO") == 0)
+ {
+ ctx -> token = DO;
+ }
+ else if(strcmp(ident, "REPEAT") == 0)
+ {
+ ctx -> token = REPEAT;
+ }
+ else if(strcmp(ident, "UNTIL") == 0)
+ {
+ ctx -> token = UNTIL;
+ }
+ else if(strcmp(ident, "FOR") == 0)
+ {
+ ctx -> token = FOR;
+ }
+ else if(strcmp(ident, "BY") == 0)
+ {
+ ctx -> token = BY;
+ }
+ else if(strcmp(ident, "LOOP") == 0)
+ {
+ ctx -> token = LOOP;
+ }
+ else if(strcmp(ident, "EXIT") == 0)
+ {
+ ctx -> token = EXIT;
+ }
+ else if(strcmp(ident, "CASE") == 0)
+ {
+ ctx -> token = CASE;
+ }
+ else if(strcmp(ident, "WITH") == 0)
+ {
+ ctx -> token = WITH;
+ }
}
static void
}
else if(ctx -> c == '.')
{
- mode = 2;
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;
- }
-
- oberon_get_char(ctx);
+ mode = 2;
- if(ctx -> c == '+' || ctx -> c == '-')
+ while(isdigit(ctx -> c))
{
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);
- }
- }
+ if(ctx -> c == '+' || ctx -> c == '-')
+ {
+ oberon_get_char(ctx);
+ }
+ while(isdigit(ctx -> c))
+ {
+ oberon_get_char(ctx);
+ }
+ }
+ }
end_i = ctx -> code_index;
}
case '.':
ctx -> token = DOT;
oberon_get_char(ctx);
+ if(ctx -> c == '.')
+ {
+ ctx -> token = DOTDOT;
+ oberon_get_char(ctx);
+ }
break;
case '(':
ctx -> token = LPAREN;
oberon_get_char(ctx);
break;
case '[':
- ctx -> token = LBRACE;
+ ctx -> token = LBRACK;
oberon_get_char(ctx);
break;
case ']':
- ctx -> token = RBRACE;
+ ctx -> token = RBRACK;
oberon_get_char(ctx);
break;
case '^':
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;
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");
}
-
- expr = oberon_new_operator(OP_UNARY_MINUS, result, a, NULL);
}
else if(token == NOT)
{
@@ -958,6 +1064,42 @@ 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)
+{
+ if(dst -> is_item == false)
+ {
+ oberon_error(ctx, "not variable");
+ }
+
+ switch(dst -> item.mode)
+ {
+ case MODE_VAR:
+ case MODE_CALL:
+ case MODE_INDEX:
+ case MODE_FIELD:
+ case MODE_DEREF:
+ case MODE_NEW:
+ /* accept */
+ break;
+ default:
+ oberon_error(ctx, "not variable");
+ break;
+ }
+}
+
+static void
+oberon_check_src(oberon_context_t * ctx, oberon_expr_t * src)
+{
+ if(src -> is_item)
+ {
+ if(src -> item.mode == MODE_TYPE)
+ {
+ oberon_error(ctx, "not variable");
+ }
+ }
+}
+
static oberon_expr_t *
oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * pref)
{
@@ -966,6 +1108,8 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
// Если INTEGER переводится в REAL
// Есди STRING переводится в ARRAY OF CHAR
+ oberon_check_src(ctx, expr);
+
bool error = false;
if(pref -> class != expr -> result -> class)
{
{
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");
}
+ 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;
}
@@ -1175,58 +1327,6 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
}
}
-/*
-static void
-oberon_make_call_proc(oberon_context_t * ctx, oberon_object_t * proc, int num_args, oberon_expr_t * list_args)
-{
- switch(proc -> class)
- {
- case OBERON_CLASS_PROC:
- if(proc -> class != OBERON_CLASS_PROC)
- {
- oberon_error(ctx, "not a procedure");
- }
- break;
- case OBERON_CLASS_VAR:
- case OBERON_CLASS_VAR_PARAM:
- case OBERON_CLASS_PARAM:
- if(proc -> type -> class != OBERON_TYPE_PROCEDURE)
- {
- oberon_error(ctx, "not a procedure");
- }
- break;
- default:
- oberon_error(ctx, "not a procedure");
- break;
- }
-
- if(proc -> sysproc)
- {
- if(proc -> genproc == NULL)
- {
- oberon_error(ctx, "requres non-typed procedure");
- }
-
- proc -> genproc(ctx, num_args, list_args);
- }
- else
- {
- if(proc -> type -> base -> class != OBERON_TYPE_VOID)
- {
- oberon_error(ctx, "attempt to call function as non-typed procedure");
- }
-
- oberon_expr_t * call;
- call = oberon_new_item(MODE_CALL, proc -> type -> base, 1);
- call -> item.var = proc;
- call -> item.num_args = num_args;
- call -> item.args = list_args;
- oberon_autocast_call(ctx, call);
- oberon_generate_call_proc(ctx, call);
- }
-}
-*/
-
#define ISEXPR(x) \
(((x) == PLUS) \
|| ((x) == MINUS) \
@@ -1354,7 +1454,7 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
}
#define ISSELECTOR(x) \
- (((x) == LBRACE) \
+ (((x) == LBRACK) \
|| ((x) == DOT) \
|| ((x) == UPARROW) \
|| ((x) == LPAREN))
}
static oberon_expr_t *
-oberon_designator(oberon_context_t * ctx)
+oberon_ident_item(oberon_context_t * ctx, char * name)
+{
+ bool read_only;
+ oberon_object_t * x;
+ oberon_expr_t * expr;
+
+ x = oberon_find_object(ctx -> decl, name, true);
+
+ read_only = false;
+ if(x -> class == OBERON_CLASS_CONST || x -> class == OBERON_CLASS_PROC)
+ {
+ read_only = true;
+ }
+
+ expr = oberon_new_item(MODE_VAR, x -> type, read_only);
+ expr -> item.var = x;
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_qualident_expr(oberon_context_t * ctx)
{
- char * name;
oberon_object_t * var;
oberon_expr_t * expr;
// TODO copy value
expr = (oberon_expr_t *) var -> value;
break;
+ case OBERON_CLASS_TYPE:
+ expr = oberon_new_item(MODE_TYPE, var -> type, read_only);
+ break;
case OBERON_CLASS_VAR:
case OBERON_CLASS_VAR_PARAM:
case OBERON_CLASS_PARAM:
expr = oberon_new_item(MODE_VAR, var -> type, read_only);
break;
case OBERON_CLASS_PROC:
- expr = oberon_new_item(MODE_VAR, var -> type, 1);
+ expr = oberon_new_item(MODE_VAR, var -> type, true);
break;
default:
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;
+
+ expr = oberon_qualident_expr(ctx);
+
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;
- 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);
- oberon_assert_token(ctx, RBRACE);
+ oberon_assert_token(ctx, RBRACK);
for(int i = 0; i < num_indexes; i++)
{
}
}
+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 * 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_factor(oberon_context_t * ctx)
{
expr = oberon_opt_func_parens(ctx, expr);
break;
case INTEGER:
- result = oberon_get_type_of_int_value(ctx, ctx -> integer);
- expr = oberon_new_item(MODE_INTEGER, result, true);
- expr -> item.integer = ctx -> integer;
+ expr = oberon_integer_item(ctx, ctx -> integer);
oberon_assert_token(ctx, INTEGER);
break;
case CHAR:
expr -> item.boolean = false;
oberon_assert_token(ctx, FALSE);
break;
+ case LBRACE:
+ expr = oberon_set(ctx);
+ break;
case LPAREN:
oberon_assert_token(ctx, LPAREN);
expr = oberon_expr(ctx);
@@ -1648,7 +1847,61 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
oberon_expr_t * expr;
oberon_type_t * result;
- if(ITMAKESBOOLEAN(token))
+ bool error = false;
+ if(token == IN)
+ {
+ if(a -> result -> class != OBERON_TYPE_INTEGER)
+ {
+ oberon_error(ctx, "must be integer");
+ }
+
+ if(b -> result -> class != OBERON_TYPE_SET)
+ {
+ oberon_error(ctx, "must be set");
+ }
+
+ result = ctx -> bool_type;
+ expr = oberon_new_operator(OP_IN, result, a, b);
+ }
+ else if(token == IS)
+ {
+ 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");
+ }
+
+ 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)
+ {
+ 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))
{
@@ -1715,13 +1968,24 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
}
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);
- }
- else if(token == DIV)
- {
+ 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)
+ {
if(a -> result -> class != OBERON_TYPE_INTEGER
|| b -> result -> class != OBERON_TYPE_INTEGER)
{
@@ -1734,29 +1998,58 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
else
{
oberon_autocast_binary_op(ctx, &a, &b);
-
- if(token == PLUS)
+ result = a -> result;
+ if(result -> class == OBERON_TYPE_SET)
{
- 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)
- {
- 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
{
- oberon_error(ctx, "oberon_make_bin_op: bin wat");
+ error = true;
}
}
+ if(error)
+ {
+ oberon_error(ctx, "invalid operation");
+ }
+
return expr;
}
oberon_error(ctx, "const expression are required");
}
+ switch(expr -> item.mode)
+ {
+ case MODE_INTEGER:
+ case MODE_BOOLEAN:
+ case MODE_NIL:
+ case MODE_REAL:
+ case MODE_CHAR:
+ case MODE_STRING:
+ case MODE_TYPE:
+ /* accept */
+ break;
+ default:
+ oberon_error(ctx, "const expression are required");
+ break;
+ }
+
return (oberon_item_t *) expr;
}
signature = oberon_new_type_ptr(OBERON_TYPE_VOID);
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;
oberon_prevent_undeclarated_procedures(ctx);
}
+static oberon_expr_t *
+oberon_make_temp_var_item(oberon_context_t * ctx, oberon_type_t * type)
+{
+ oberon_object_t * x;
+ oberon_expr_t * expr;
+
+ x = oberon_create_object(ctx -> decl, "TEMP", OBERON_CLASS_VAR, false, false);
+ x -> local = true;
+ x -> type = type;
+ oberon_generator_init_temp_var(ctx, x);
+
+ expr = oberon_new_item(MODE_VAR, type, false);
+ expr -> item.var = x;
+ return expr;
+}
+
static void
oberon_statement_seq(oberon_context_t * ctx);
@@ -2875,10 +3206,172 @@ oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
oberon_error(ctx, "read-only destination");
}
+ 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
oberon_statement(oberon_context_t * ctx)
{
oberon_generate_branch(ctx, cond, false, els);
oberon_statement_seq(ctx);
oberon_generate_goto(ctx, end);
-
oberon_generate_label(ctx, els);
+
+ while(ctx -> token == ELSIF)
+ {
+ els = oberon_generator_reserve_label(ctx);
+
+ oberon_assert_token(ctx, ELSIF);
+ cond = oberon_expr(ctx);
+ if(cond -> result -> class != OBERON_TYPE_BOOLEAN)
+ {
+ oberon_error(ctx, "condition must be boolean");
+ }
+ oberon_assert_token(ctx, THEN);
+ oberon_generate_branch(ctx, cond, false, els);
+ oberon_statement_seq(ctx);
+ oberon_generate_goto(ctx, end);
+ oberon_generate_label(ctx, els);
+ }
+
if(ctx -> token == ELSE)
{
oberon_assert_token(ctx, ELSE);
oberon_generate_label(ctx, end);
oberon_assert_token(ctx, END);
}
+ else if(ctx -> token == WHILE)
+ {
+ gen_label_t * begin;
+ gen_label_t * end;
+ oberon_expr_t * cond;
+
+ begin = oberon_generator_reserve_label(ctx);
+ end = oberon_generator_reserve_label(ctx);
+
+ oberon_assert_token(ctx, WHILE);
+ oberon_generate_label(ctx, begin);
+ cond = oberon_expr(ctx);
+ if(cond -> result -> class != OBERON_TYPE_BOOLEAN)
+ {
+ oberon_error(ctx, "condition must be boolean");
+ }
+ oberon_generate_branch(ctx, cond, false, end);
+
+ oberon_assert_token(ctx, DO);
+ oberon_statement_seq(ctx);
+ oberon_generate_goto(ctx, begin);
+
+ oberon_assert_token(ctx, END);
+ oberon_generate_label(ctx, end);
+ }
+ else if(ctx -> token == REPEAT)
+ {
+ gen_label_t * begin;
+ oberon_expr_t * cond;
+
+ begin = oberon_generator_reserve_label(ctx);
+ oberon_generate_label(ctx, begin);
+ oberon_assert_token(ctx, REPEAT);
+
+ oberon_statement_seq(ctx);
+
+ oberon_assert_token(ctx, UNTIL);
+
+ cond = oberon_expr(ctx);
+ if(cond -> result -> class != OBERON_TYPE_BOOLEAN)
+ {
+ oberon_error(ctx, "condition must be boolean");
+ }
+
+ oberon_generate_branch(ctx, cond, true, begin);
+ }
+ else if(ctx -> token == FOR)
+ {
+ oberon_expr_t * from;
+ oberon_expr_t * index;
+ oberon_expr_t * to;
+ oberon_expr_t * bound;
+ oberon_expr_t * by;
+ oberon_expr_t * cond;
+ oberon_expr_t * count;
+ gen_label_t * begin;
+ gen_label_t * end;
+ char * iname;
+ int op;
+
+ begin = oberon_generator_reserve_label(ctx);
+ end = oberon_generator_reserve_label(ctx);
+
+ oberon_assert_token(ctx, FOR);
+ iname = oberon_assert_ident(ctx);
+ 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);
+ if(ctx -> token == BY)
+ {
+ oberon_assert_token(ctx, BY);
+ by = (oberon_expr_t *) oberon_const_expr(ctx);
+ }
+ else
+ {
+ by = oberon_integer_item(ctx, 1);
+ }
+
+ if(by -> result -> class != OBERON_TYPE_INTEGER)
+ {
+ oberon_error(ctx, "must be integer");
+ }
+
+ if(by -> item.integer > 0)
+ {
+ op = LEQ;
+ }
+ else if(by -> item.integer < 0)
+ {
+ op = GEQ;
+ }
+ else
+ {
+ oberon_error(ctx, "zero step not allowed");
+ }
+
+ oberon_assert_token(ctx, DO);
+ oberon_generate_label(ctx, begin);
+ cond = oberon_make_bin_op(ctx, op, index, bound);
+ oberon_generate_branch(ctx, cond, false, end);
+ oberon_statement_seq(ctx);
+ count = oberon_make_bin_op(ctx, PLUS, index, by);
+ oberon_assign(ctx, count, index);
+ oberon_generate_goto(ctx, begin);
+ oberon_generate_label(ctx, end);
+ oberon_assert_token(ctx, END);
+ }
+ else if(ctx -> token == LOOP)
+ {
+ gen_label_t * begin;
+ gen_label_t * end;
+
+ begin = oberon_generator_reserve_label(ctx);
+ end = oberon_generator_reserve_label(ctx);
+
+ oberon_open_scope(ctx);
+ oberon_assert_token(ctx, LOOP);
+ oberon_generate_label(ctx, begin);
+ ctx -> decl -> exit_label = end;
+ oberon_statement_seq(ctx);
+ oberon_generate_goto(ctx, begin);
+ oberon_generate_label(ctx, end);
+ oberon_assert_token(ctx, END);
+ oberon_close_scope(ctx -> decl);
+ }
+ else if(ctx -> token == EXIT)
+ {
+ oberon_assert_token(ctx, EXIT);
+ if(ctx -> decl -> exit_label == NULL)
+ {
+ oberon_error(ctx, "not in LOOP-END");
+ }
+ 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);
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
@@ -3113,6 +3773,126 @@ oberon_new_intrinsic(oberon_context_t * ctx, char * name, GenerateFuncCallback f
proc -> type -> genproc = p;
}
+static oberon_expr_t *
+oberon_make_min_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 * arg;
+ arg = list_args;
+
+ if(!arg -> is_item || arg -> item.mode != MODE_TYPE)
+ {
+ oberon_error(ctx, "MIN accept only type");
+ }
+
+ oberon_expr_t * expr;
+ int bits = arg -> result -> size * 8;
+ switch(arg -> result -> class)
+ {
+ 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;
+ }
+
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_max_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 * arg;
+ arg = list_args;
+
+ if(!arg -> is_item || arg -> item.mode != MODE_TYPE)
+ {
+ oberon_error(ctx, "MAX accept only type");
+ }
+
+ oberon_expr_t * expr;
+ int bits = arg -> result -> size * 8;
+ switch(arg -> result -> class)
+ {
+ 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;
+ }
+
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_size_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 * arg;
+ arg = list_args;
+
+ if(!arg -> is_item || arg -> item.mode != MODE_TYPE)
+ {
+ oberon_error(ctx, "SIZE accept only type");
+ }
+
+ int size;
+ oberon_expr_t * expr;
+ oberon_type_t * type = arg -> result;
+ switch(type -> class)
+ {
+ 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:
+ oberon_error(ctx, "TODO SIZE");
+ break;
+ }
+
+ expr = oberon_integer_item(ctx, size);
+ return expr;
+}
+
static oberon_expr_t *
oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
{
@@ -3128,6 +3908,7 @@ oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_expr_t * arg;
arg = list_args;
+ oberon_check_src(ctx, arg);
oberon_type_t * result_type;
result_type = arg -> result;
@@ -3137,7 +3918,6 @@ oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_error(ctx, "ABS accepts only integers");
}
-
oberon_expr_t * expr;
expr = oberon_new_operator(OP_ABS, result_type, arg, NULL);
return expr;
@@ -3151,8 +3931,10 @@ 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);
oberon_type_t * type;
type = dst -> result;
@@ -3201,6 +3983,7 @@ oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_expr_t * arg = size_list;
for(int i = 0; i < max_args - 1; i++)
{
+ oberon_check_src(ctx, arg);
if(arg -> result -> class != OBERON_TYPE_INTEGER)
{
oberon_error(ctx, "size must be integer");
oberon_generator_init_context(ctx);
register_default_types(ctx);
+
+ /* Functions */
oberon_new_intrinsic(ctx, "ABS", oberon_make_abs_call, NULL);
+ oberon_new_intrinsic(ctx, "MIN", oberon_make_min_call, NULL);
+ oberon_new_intrinsic(ctx, "MAX", oberon_make_max_call, NULL);
+ oberon_new_intrinsic(ctx, "SIZE", oberon_make_size_call, NULL);
+
+ /* Procedures */
oberon_new_intrinsic(ctx, "NEW", NULL, oberon_make_new_call);
return ctx;