diff --git a/src/oberon.c b/src/oberon.c
index 50429645b22a713480253b1fb262128dc1b97af6..e4b9157d151cafa6075c86bbc1a07ebf2e845bef 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
EXIT,
LBRACE,
RBRACE,
- DOTDOT
+ DOTDOT,
+ CASE,
+ BAR,
+ WITH
};
// =======================================================================
{
ctx -> token = EXIT;
}
+ else if(strcmp(ident, "CASE") == 0)
+ {
+ ctx -> token = CASE;
+ }
+ else if(strcmp(ident, "WITH") == 0)
+ {
+ ctx -> token = WITH;
+ }
}
static void
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 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;
+
+ expr = oberon_qualident_expr(ctx);
+
while(expr -> result -> class != OBERON_TYPE_PROCEDURE && ISSELECTOR(ctx -> token))
{
switch(ctx -> token)
@@ -1814,7 +1840,22 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
oberon_type_t * result;
bool error = false;
- if(token == IS)
+ 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)
@@ -3156,6 +3197,167 @@ oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
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_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);