diff --git a/src/oberon.c b/src/oberon.c
index 830844a16aedb87eb17d805361346d80930d0e3a..931a30724697a03476cff779779b3385bad5f2b4 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
#include <math.h>
#include <float.h>
-#include "../include/oberon.h"
+#include <gc.h>
#include "oberon-internals.h"
#include "oberon-type-compat.h"
static oberon_type_t *
oberon_new_type_ptr(int class)
{
- oberon_type_t * x = malloc(sizeof *x);
+ oberon_type_t * x = GC_MALLOC(sizeof *x);
memset(x, 0, sizeof *x);
x -> class = class;
return x;
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);
+ operator = GC_MALLOC(sizeof *operator);
memset(operator, 0, sizeof *operator);
operator -> is_item = 0;
oberon_new_item(int mode, oberon_type_t * result, int read_only)
{
oberon_item_t * item;
- item = malloc(sizeof *item);
+ item = GC_MALLOC(sizeof *item);
memset(item, 0, sizeof *item);
item -> is_item = 1;
return expr;
}
+static oberon_expr_t *
+oberon_make_system_byte(oberon_context_t * ctx, int64_t i)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_SYSBYTE, ctx -> system_byte_type, true);
+ expr -> item.integer = i;
+ expr -> item.real = i;
+ return expr;
+}
+
static oberon_expr_t *
oberon_make_char(oberon_context_t * ctx, int64_t i)
{
return expr;
}
+static oberon_expr_t *
+oberon_make_string(oberon_context_t * ctx, char * str)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_STRING, ctx -> string_type, true);
+ expr -> item.integer = str[0];
+ expr -> item.real = str[0];
+ expr -> item.string = str;
+ return expr;
+}
+
static oberon_expr_t *
oberon_make_real_typed(oberon_context_t * ctx, double r, oberon_type_t * result)
{
static oberon_scope_t *
oberon_open_scope(oberon_context_t * ctx)
{
- oberon_scope_t * scope = calloc(1, sizeof *scope);
- oberon_object_t * list = calloc(1, sizeof *list);
+ oberon_scope_t * scope = GC_MALLOC(sizeof *scope);
+ memset(scope, 0, sizeof *scope);
+
+ oberon_object_t * list = GC_MALLOC(sizeof *list);
+ memset(list, 0, sizeof *list);
scope -> ctx = ctx;
scope -> list = list;
return result;
}
+static oberon_object_t *
+oberon_find_object_in_scope(oberon_scope_t * scope, char * name, bool check_it)
+{
+ oberon_object_t * result = NULL;
+
+ result = oberon_find_object_in_list(scope -> list, name);
+
+ if(check_it && result == NULL)
+ {
+ oberon_error(scope -> ctx, "undefined ident %s", name);
+ }
+
+ 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);
+ oberon_object_t * newvar = GC_MALLOC(sizeof *newvar);
memset(newvar, 0, sizeof *newvar);
newvar -> name = name;
newvar -> class = class;
@@ -326,16 +365,6 @@ oberon_define_object(oberon_scope_t * scope, char * name, int class, bool export
return newvar;
}
-static oberon_object_t *
-oberon_define_type(oberon_scope_t * scope, char * name, oberon_type_t * type, int export)
-{
- oberon_object_t * id;
- id = oberon_define_object(scope, name, OBERON_CLASS_TYPE, export, false, false);
- id -> type = type;
- oberon_generator_init_type(scope -> ctx, type);
- return id;
-}
-
// =======================================================================
// SCANER
// =======================================================================
if(ctx -> code[ctx -> code_index])
{
ctx -> code_index += 1;
+ ctx -> xloc.col += 1;
ctx -> c = ctx -> code[ctx -> code_index];
}
}
static void
-oberon_init_scaner(oberon_context_t * ctx, const char * code)
+oberon_init_scaner(oberon_context_t * ctx, oberon_scanner_t * s)
{
- ctx -> code = code;
+ ctx -> code = s -> code;
ctx -> code_index = 0;
+ ctx -> xloc.source = s -> source;
+ ctx -> xloc.line = 1;
+ ctx -> xloc.col = 1;
+ ctx -> loc = ctx -> xloc;
ctx -> c = ctx -> code[ctx -> code_index];
+ oberon_set_line(ctx, 1);
}
static void
oberon_read_ident(oberon_context_t * ctx)
{
- int len = 0;
- int i = ctx -> code_index;
+ int start = ctx -> code_index;
- int c = ctx -> code[i];
- while(isalnum(c))
+ oberon_get_char(ctx);
+ while(isalnum(ctx -> c) || ctx -> c == '_')
{
- i += 1;
- len += 1;
- c = ctx -> code[i];
+ oberon_get_char(ctx);
}
- char * ident = malloc(len + 1);
- memcpy(ident, &ctx->code[ctx->code_index], len);
- ident[len] = 0;
+ int end = ctx -> code_index;
+
+ char * ident = GC_MALLOC(end - start + 1);
+ memcpy(ident, &ctx -> code[start], end - start);
+ ident[end - start] = 0;
- ctx -> code_index = i;
- ctx -> c = ctx -> code[i];
ctx -> string = ident;
ctx -> token = IDENT;
}
int len = end_i - start_i;
- ident = malloc(len + 1);
+ ident = GC_MALLOC(len + 1);
memcpy(ident, &ctx -> code[start_i], len);
ident[len] = 0;
ctx -> real = real;
}
+static void
+oberon_get_lined_char(oberon_context_t * ctx)
+{
+ do
+ {
+ if(ctx -> c == 0xD)
+ {
+ oberon_get_char(ctx);
+ if(ctx -> c == 0xA)
+ {
+ oberon_get_char(ctx);
+ }
+ ctx -> xloc.line += 1;
+ ctx -> xloc.col = 1;
+ oberon_set_line(ctx, ctx -> xloc.line);
+ }
+ else if(ctx -> c == 0xA)
+ {
+ oberon_get_char(ctx);
+ ctx -> xloc.line += 1;
+ ctx -> xloc.col = 1;
+ oberon_set_line(ctx, ctx -> xloc.line);
+ }
+ else
+ {
+ oberon_get_char(ctx);
+ }
+ } while(ctx -> c == 0xD || ctx -> c == 0xA);
+}
+
static void
oberon_skip_space(oberon_context_t * ctx)
{
while(isspace(ctx -> c))
{
- oberon_get_char(ctx);
+ oberon_get_lined_char(ctx);
}
}
{
if(ctx -> c == '(')
{
- oberon_get_char(ctx);
+ oberon_get_lined_char(ctx);
if(ctx -> c == '*')
{
- oberon_get_char(ctx);
+ oberon_get_lined_char(ctx);
nesting += 1;
}
}
else if(ctx -> c == '*')
{
- oberon_get_char(ctx);
+ oberon_get_lined_char(ctx);
if(ctx -> c == ')')
{
- oberon_get_char(ctx);
+ oberon_get_lined_char(ctx);
nesting -= 1;
}
}
}
else
{
- oberon_get_char(ctx);
+ oberon_get_lined_char(ctx);
}
}
}
oberon_get_char(ctx);
- char * string = calloc(1, end - start + 1);
+ char * string = GC_MALLOC(end - start + 1);
strncpy(string, &ctx -> code[start], end - start);
+ string[end - start] = 0;
ctx -> token = STRING;
ctx -> string = string;
{
oberon_skip_space(ctx);
+ ctx -> loc = ctx -> xloc;
+
int c = ctx -> c;
- if(isalpha(c))
+ if(isalpha(c) || c == '_')
{
oberon_read_ident(ctx);
}
@@ -1041,14 +1106,30 @@ oberon_cast_expr(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * p
cast = oberon_new_item(MODE_CHAR, ctx -> char_type, true);
cast -> item.integer = expr -> item.string[0];
}
- else
+ else if(oberon_is_record_type(pref) || oberon_is_pointer_to_record(pref))
+ {
+ assert(expr -> is_item);
+ cast = oberon_new_item(MODE_AS, pref, expr -> read_only);
+ cast -> item.parent = (oberon_item_t *) expr;
+ }
+ else if(!oberon_is_some_types(expr -> result, pref))
{
cast = oberon_new_operator(OP_CAST, pref, expr, NULL);
}
+ else
+ {
+ cast = expr;
+ }
return cast;
}
+static oberon_expr_t *
+oberon_hard_cast_expr(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * pref)
+{
+ return oberon_new_operator(OP_HARDCAST, pref, expr, NULL);
+}
+
static void
oberon_check_dst(oberon_context_t * ctx, oberon_expr_t * dst)
{
{
oberon_check_compatible_var_param(ctx, param -> type, arg -> result);
}
- casted[i] = oberon_cast_expr(ctx, arg, param -> type);
+ casted[i] = arg;
+ //casted[i] = oberon_cast_expr(ctx, arg, param -> type);
}
else
{
@@ -1234,6 +1316,7 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
|| ((x) == CHAR) \
|| ((x) == STRING) \
|| ((x) == NIL) \
+ || ((x) == LBRACE) \
|| ((x) == LPAREN) \
|| ((x) == NOT))
assert(expr -> is_item);
oberon_expr_t * selector;
- selector = oberon_new_item(MODE_DEREF, expr -> result -> base, expr -> read_only);
+ selector = oberon_new_item(MODE_DEREF, expr -> result -> base, false);
selector -> item.parent = (oberon_item_t *) expr;
return selector;
oberon_assert_token(ctx, CHAR);
break;
case STRING:
- result = ctx -> string_type;
- expr = oberon_new_item(MODE_STRING, result, true);
- expr -> item.string = ctx -> string;
+ expr = oberon_make_string(ctx, ctx -> string);
oberon_assert_token(ctx, STRING);
break;
case REAL:
@@ -1691,7 +1772,7 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
oberon_expr_t * expr;
oberon_type_t * result;
- oberon_check_compatible_bin_expr_types(ctx, token, a -> result, b -> result);
+ oberon_check_compatible_bin_expr(ctx, token, a, b);
oberon_check_src(ctx, a);
if(token != IS)
{
@@ -1716,7 +1797,22 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
}
else if((token >= EQUAL && token <= GEQ) || token == OR || token == AND)
{
- result = oberon_get_longer_type(ctx, a -> result, b -> result);
+ if(oberon_is_string_of_one(a) && oberon_is_char_type(b -> result))
+ {
+ result = b -> result;
+ }
+ else if(oberon_is_string_of_one(b) && oberon_is_char_type(a -> result))
+ {
+ result = a -> result;
+ }
+ else if(oberon_is_string_of_one(a) && oberon_is_string_of_one(b))
+ {
+ result = ctx -> char_type;
+ }
+ else
+ {
+ result = oberon_get_longer_type(ctx, a -> result, b -> result);
+ }
if(oberon_is_const(a) && oberon_is_const(b)
&& (oberon_is_real_type(result) || oberon_is_integer_type(result)))
@@ -1887,7 +1983,7 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
break;
}
}
- else if(oberon_is_number_type(result))
+ else if(oberon_is_real_type(result))
{
switch(token)
{
@@ -1901,6 +1997,32 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
expr = oberon_new_operator(OP_MUL, result, a, b);
break;
default:
+ printf("token %i line %i\n", token, ctx -> loc.line);
+ assert(0);
+ break;
+ }
+ }
+ else if(oberon_is_integer_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;
+ case DIV:
+ expr = oberon_new_operator(OP_DIV, result, a, b);
+ break;
+ case MOD:
+ expr = oberon_new_operator(OP_MOD, result, a, b);
+ break;
+ default:
+ printf("token %i line %i\n", token, ctx -> loc.line);
assert(0);
break;
}
case MODE_STRING:
case MODE_SET:
case MODE_TYPE:
+ case MODE_SYSBYTE:
return true;
break;
default:
oberon_error(ctx, "procedure name not matched");
}
- if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE
- && proc -> has_return == 0)
+ if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE)
{
oberon_make_return(ctx, NULL);
}
char * name;
int export;
int read_only;
+
+ if(ctx -> token == STAR)
+ {
+ oberon_assert_token(ctx, STAR);
+ }
+
name = oberon_assert_ident(ctx);
oberon_def(ctx, &export, &read_only);
oberon_close_scope(ctx -> decl);
oberon_object_t * proc;
- proc = oberon_find_object(ctx -> decl, name, 0);
+ proc = oberon_find_object_in_scope(ctx -> decl, name, 0);
if(proc == NULL)
{
proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, export, read_only, false);
@@ -2527,9 +2655,8 @@ oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec, oberon_scope_t *
static void
oberon_type_record_body(oberon_context_t * ctx, oberon_type_t * rec)
{
- oberon_scope_t * modscope = ctx -> mod -> decl;
oberon_scope_t * oldscope = ctx -> decl;
- ctx -> decl = modscope;
+ ctx -> decl = oldscope;
if(ctx -> token == LPAREN)
{
this_scope -> parent = NULL;
this_scope -> parent_type = rec;
- oberon_field_list(ctx, rec, modscope);
+ oberon_field_list(ctx, rec, oldscope);
while(ctx -> token == SEMICOLON)
{
oberon_assert_token(ctx, SEMICOLON);
- oberon_field_list(ctx, rec, modscope);
+ oberon_field_list(ctx, rec, oldscope);
}
rec -> scope = this_scope;
@@ -2719,7 +2846,14 @@ oberon_prevent_recursive_pointer(oberon_context_t * ctx, oberon_type_t * type)
if(type -> recursive)
{
- oberon_error(ctx, "recursive pointer declaration");
+ if(type -> class == OBERON_TYPE_POINTER)
+ {
+ oberon_error(ctx, "recursive pointer declaration");
+ }
+ else
+ {
+ oberon_error(ctx, "recursive array declaration (pointer)");
+ }
}
if(type -> class == OBERON_TYPE_POINTER
@@ -2872,20 +3006,12 @@ static void oberon_initialize_type(oberon_context_t * ctx, oberon_type_t * type)
static void
oberon_initialize_record_fields(oberon_context_t * ctx, oberon_type_t * type)
{
- if(type -> class != OBERON_TYPE_RECORD)
- {
- return;
- }
+ assert(type -> class == OBERON_TYPE_RECORD);
int num_fields = type -> num_decl;
oberon_object_t * field = type -> decl;
for(int i = 0; i < num_fields; i++)
{
- if(field -> type -> class == OBERON_TYPE_POINTER)
- {
- oberon_initialize_type(ctx, field -> type);
- }
-
oberon_initialize_object(ctx, field);
field = field -> next;
}
type -> initialized = 1;
- if(type -> class == OBERON_TYPE_POINTER)
+ if(type -> class == OBERON_TYPE_POINTER || type -> class == OBERON_TYPE_ARRAY)
{
- oberon_initialize_type(ctx, type -> base);
- oberon_generator_init_type(ctx, type);
- }
- else if(type -> class == OBERON_TYPE_ARRAY)
- {
- if(type -> size != 0)
+ if(type -> class == OBERON_TYPE_ARRAY
+ && type -> size != 0
+ && type -> base -> class == OBERON_TYPE_ARRAY
+ && type -> base -> size == 0)
{
- if(type -> base -> class == OBERON_TYPE_ARRAY)
- {
- if(type -> base -> size == 0)
- {
- oberon_error(ctx, "open array not allowed as array element");
- }
- }
+ oberon_error(ctx, "open array not allowed as array element");
}
- oberon_initialize_type(ctx, type -> base);
- oberon_generator_init_type(ctx, type);
+ oberon_type_t * rec = type -> base;
+ while(rec -> class == OBERON_TYPE_ARRAY || rec -> class == OBERON_TYPE_POINTER)
+ {
+ rec = rec -> base;
+ }
+
+ if(rec -> class == OBERON_TYPE_RECORD
+ && rec -> initialized == 0)
+ {
+ rec -> initialized = 1;
+ oberon_generator_init_type(ctx, rec);
+ oberon_initialize_type(ctx, type -> base);
+ oberon_generator_init_type(ctx, type);
+ oberon_initialize_record_fields(ctx, rec);
+ }
+ else
+ {
+ oberon_initialize_type(ctx, type -> base);
+ oberon_generator_init_type(ctx, type);
+ }
}
else if(type -> class == OBERON_TYPE_RECORD)
{
+ printf("Init type: RECORD\n");
oberon_generator_init_type(ctx, type);
oberon_initialize_record_fields(ctx, type);
}
else if(type -> class == OBERON_TYPE_PROCEDURE)
{
+ printf("Init type: PROCEDURE\n");
int num_fields = type -> num_decl;
oberon_object_t * field = type -> decl;
for(int i = 0; i < num_fields; i++)
{
- oberon_initialize_object(ctx, field);
+ oberon_initialize_type(ctx, field -> type);
field = field -> next;
- }
+ }
oberon_generator_init_type(ctx, type);
}
static void
oberon_decl_seq(oberon_context_t * ctx)
{
- if(ctx -> token == CONST)
+ while(ctx -> token >= CONST && ctx -> token <= VAR)
{
- oberon_assert_token(ctx, CONST);
- while(ctx -> token == IDENT)
+ if(ctx -> token == CONST)
{
- oberon_const_decl(ctx);
- oberon_assert_token(ctx, SEMICOLON);
+ oberon_assert_token(ctx, CONST);
+ while(ctx -> token == IDENT)
+ {
+ oberon_const_decl(ctx);
+ oberon_assert_token(ctx, SEMICOLON);
+ }
}
- }
-
- if(ctx -> token == TYPE)
- {
- oberon_assert_token(ctx, TYPE);
- while(ctx -> token == IDENT)
+ else if(ctx -> token == TYPE)
{
- oberon_type_decl(ctx);
- oberon_assert_token(ctx, SEMICOLON);
+ oberon_assert_token(ctx, TYPE);
+ while(ctx -> token == IDENT)
+ {
+ oberon_type_decl(ctx);
+ oberon_assert_token(ctx, SEMICOLON);
+ }
}
- }
-
- if(ctx -> token == VAR)
- {
- oberon_assert_token(ctx, VAR);
- while(ctx -> token == IDENT)
+ else if(ctx -> token == VAR)
{
- oberon_var_decl(ctx);
- oberon_assert_token(ctx, SEMICOLON);
+ oberon_assert_token(ctx, VAR);
+ while(ctx -> token == IDENT)
+ {
+ oberon_var_decl(ctx);
+ oberon_assert_token(ctx, SEMICOLON);
+ }
}
}
oberon_expr_t * cond2;
e1 = (oberon_expr_t *) oberon_const_expr(ctx);
-
+
e2 = NULL;
if(ctx -> token == DOTDOT)
{
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_object_t * var;
+ oberon_expr_t * var_expr;
+ oberon_expr_t * type_expr;
oberon_expr_t * cond;
- oberon_expr_t * cast;
+ oberon_type_t * type;
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);
+ var_expr = oberon_qualident_expr(ctx);
oberon_assert_token(ctx, COLON);
- type = oberon_qualident_expr(ctx);
- cond = oberon_make_bin_op(ctx, IS, var, type);
+ type_expr = oberon_qualident_expr(ctx);
+ cond = oberon_make_bin_op(ctx, IS, var_expr, type_expr);
+
+ var = var_expr -> item.var;
+ type = type_expr -> result;
+ old_type = 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;
+ var -> type = type;
+ oberon_set_typecheck(var, true);
oberon_statement_seq(ctx);
+
+ var -> type = old_type;
+ oberon_set_typecheck(var, false);
+
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_error(ctx, "condition must be boolean");
}
- oberon_generate_branch(ctx, cond, true, begin);
+ oberon_generate_branch(ctx, cond, false, begin);
}
else if(ctx -> token == FOR)
{
if(m == NULL)
{
- const char * code;
- code = ctx -> import_module(name);
- if(code == NULL)
+ oberon_scanner_t * s;
+ s = ctx -> import_module(name);
+ if(s == NULL)
{
- oberon_error(ctx, "no such module");
+ oberon_error(ctx, "no such module %s", name);
}
- m = oberon_compile_module(ctx, code);
+ m = oberon_compile_module(ctx, s);
assert(m);
}
@@ -3778,7 +3911,7 @@ oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
arg = list_args;
oberon_check_src(ctx, arg);
- if(oberon_is_number_type(arg -> result))
+ if(!oberon_is_number_type(arg -> result))
{
oberon_error(ctx, "ABS accepts only numbers");
}
@@ -3812,7 +3945,7 @@ oberon_make_inc_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_error(ctx, "too few arguments");
}
- if(num_args > 1)
+ if(num_args > 2)
{
oberon_error(ctx, "too mach arguments");
}
@@ -3826,8 +3959,23 @@ oberon_make_inc_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_error(ctx, "expect integer");
}
+ oberon_expr_t * step;
+ if(num_args == 2)
+ {
+ step = list_args -> next;
+ oberon_check_src(ctx, step);
+ if(!oberon_is_integer_type(step -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+ }
+ else
+ {
+ step = oberon_make_integer(ctx, 1);
+ }
+
oberon_expr_t * expr;
- expr = oberon_make_bin_op(ctx, PLUS, dst, oberon_make_integer(ctx, 1));
+ expr = oberon_make_bin_op(ctx, PLUS, dst, step);
oberon_assign(ctx, expr, dst);
}
@@ -3911,7 +4059,7 @@ oberon_make_dec_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_error(ctx, "too few arguments");
}
- if(num_args > 1)
+ if(num_args > 2)
{
oberon_error(ctx, "too mach arguments");
}
@@ -3925,8 +4073,23 @@ oberon_make_dec_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_error(ctx, "expect integer");
}
+ oberon_expr_t * step;
+ if(num_args == 2)
+ {
+ step = list_args -> next;
+ oberon_check_src(ctx, step);
+ if(!oberon_is_integer_type(step -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+ }
+ else
+ {
+ step = oberon_make_integer(ctx, 1);
+ }
+
oberon_expr_t * expr;
- expr = oberon_make_bin_op(ctx, MINUS, dst, oberon_make_integer(ctx, 1));
+ expr = oberon_make_bin_op(ctx, MINUS, dst, step);
oberon_assign(ctx, expr, dst);
}
@@ -4151,7 +4314,8 @@ oberon_make_ash_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
{
int64_t x = arg1 -> item.integer;
int64_t y = arg2 -> item.integer;
- expr = oberon_make_integer(ctx, x * powl(2, y));
+ int64_t v = (y > 0) ? (x << y) : (x >> labs(y));
+ expr = oberon_make_integer(ctx, v);
}
else
{
@@ -4161,6 +4325,140 @@ oberon_make_ash_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
return expr;
}
+static oberon_expr_t *
+oberon_make_lsh_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 * arg1;
+ arg1 = list_args;
+ oberon_check_src(ctx, arg1);
+
+ oberon_type_t * t = arg1 -> result;
+ if(!oberon_is_integer_type(t)
+ && !oberon_is_char_type(t)
+ && !oberon_is_system_byte_type(t))
+ {
+ oberon_error(ctx, "expected integer, char, or SYSTEM.BYTE");
+ }
+
+ oberon_expr_t * arg2;
+ arg2 = list_args -> next;
+ oberon_check_src(ctx, arg2);
+ if(arg2 -> result -> class != OBERON_TYPE_INTEGER)
+ {
+ oberon_error(ctx, "expected integer");
+ }
+
+ oberon_expr_t * expr;
+ if(oberon_is_const(arg1) && oberon_is_const(arg2))
+ {
+ uint64_t x = arg1 -> item.integer;
+ int64_t y = arg2 -> item.integer;
+ uint64_t v = (y > 0) ? (x << y) : (x >> labs(y));
+
+ if(oberon_is_integer_type(t))
+ {
+ expr = oberon_make_integer(ctx, v);
+ }
+ else if(oberon_is_char_type(t))
+ {
+ expr = oberon_make_char(ctx, v);
+ }
+ else
+ {
+ expr = oberon_make_system_byte(ctx, v);
+ }
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_LSH, arg1 -> result, arg1, arg2);
+ expr = oberon_cast_expr(ctx, expr, t);
+ }
+
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_rot_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 * arg1;
+ arg1 = list_args;
+ oberon_check_src(ctx, arg1);
+
+ oberon_type_t * t = arg1 -> result;
+ if(!oberon_is_integer_type(t)
+ && !oberon_is_char_type(t)
+ && !oberon_is_system_byte_type(t))
+ {
+ oberon_error(ctx, "expected integer, char, or SYSTEM.BYTE");
+ }
+
+ oberon_expr_t * arg2;
+ arg2 = list_args -> next;
+ oberon_check_src(ctx, arg2);
+ if(arg2 -> result -> class != OBERON_TYPE_INTEGER)
+ {
+ oberon_error(ctx, "expected integer");
+ }
+
+ oberon_expr_t * expr;
+ if(oberon_is_const(arg1) && oberon_is_const(arg2))
+ {
+ uint64_t x = arg1 -> item.integer;
+ int64_t y = arg2 -> item.integer;
+
+ uint64_t v = 0;
+ if(y > 0)
+ {
+ v = (x << y) | (x >> (64 - y));
+ }
+ else
+ {
+ y = labs(y);
+ v = (x >> y) | (x << (64 - y));
+ }
+
+ if(oberon_is_integer_type(t))
+ {
+ expr = oberon_make_integer(ctx, v);
+ }
+ else if(oberon_is_char_type(t))
+ {
+ expr = oberon_make_char(ctx, v);
+ }
+ else
+ {
+ expr = oberon_make_system_byte(ctx, v);
+ }
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_ROT, arg1 -> result, arg1, arg2);
+ expr = oberon_cast_expr(ctx, expr, t);
+ }
+
+ return expr;
+}
+
static oberon_expr_t *
oberon_make_cap_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
{
@@ -4247,7 +4545,7 @@ oberon_make_ord_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
arg = list_args;
oberon_check_src(ctx, arg);
- if(!oberon_is_char_type(arg -> result))
+ if(!oberon_is_char_type(arg -> result) && !oberon_is_string_of_one(arg))
{
oberon_error(ctx, "expected char");
}
@@ -4259,7 +4557,7 @@ oberon_make_ord_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
}
else
{
- expr = oberon_cast_expr(ctx, arg, ctx -> int_type);
+ expr = oberon_cast_expr(ctx, arg, ctx -> shortint_type);
}
return expr;
}
@@ -4326,6 +4624,38 @@ oberon_make_odd_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
return expr;
}
+static oberon_expr_t *
+oberon_make_cc_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;
+ oberon_check_src(ctx, arg);
+ oberon_check_const(ctx, arg);
+
+ if(!oberon_is_integer_type(arg -> result))
+ {
+ oberon_error(ctx, "expected integer");
+ }
+
+ /* n >= 0 && n <= 15 */
+
+ oberon_expr_t * cond1;
+ oberon_expr_t * cond2;
+ cond1 = oberon_make_bin_op(ctx, GEQ, arg, oberon_make_integer(ctx, 0));
+ cond2 = oberon_make_bin_op(ctx, LEQ, arg, oberon_make_integer(ctx, 15));
+ return oberon_make_bin_op(ctx, AND, cond1, cond2);
+}
+
static oberon_expr_t *
oberon_make_short_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
{
@@ -4380,6 +4710,35 @@ oberon_make_long_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list
return expr;
}
+static oberon_expr_t *
+oberon_make_val_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 * typ;
+ typ = list_args;
+ if(!oberon_is_type_expr(typ))
+ {
+ oberon_error(ctx, "requires type");
+ }
+
+ oberon_expr_t * arg;
+ arg = list_args -> next;
+ oberon_check_src(ctx, arg);
+
+ oberon_expr_t * expr;
+ expr = oberon_hard_cast_expr(ctx, arg, typ -> result);
+ return expr;
+}
+
static oberon_expr_t *
oberon_make_len_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
{
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);
+ oberon_generator_init_type(ctx, ctx -> bool_type);
ctx -> char_type = oberon_new_type_char(1);
- oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
+ oberon_generator_init_type(ctx, ctx -> char_type);
ctx -> byte_type = oberon_new_type_integer(1);
- oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> byte_type, 1);
+ oberon_generator_init_type(ctx, ctx -> byte_type);
ctx -> shortint_type = oberon_new_type_integer(2);
- oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> shortint_type, 1);
+ oberon_generator_init_type(ctx, ctx -> shortint_type);
ctx -> int_type = oberon_new_type_integer(4);
- oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> int_type, 1);
+ oberon_generator_init_type(ctx, ctx -> int_type);
ctx -> longint_type = oberon_new_type_integer(8);
- oberon_define_type(ctx -> world_scope, "HUGEINT", ctx -> longint_type, 1);
+ oberon_generator_init_type(ctx, ctx -> longint_type);
ctx -> real_type = oberon_new_type_real(4);
- oberon_define_type(ctx -> world_scope, "REAL", ctx -> real_type, 1);
+ oberon_generator_init_type(ctx, ctx -> real_type);
ctx -> longreal_type = oberon_new_type_real(8);
- oberon_define_type(ctx -> world_scope, "LONGREAL", ctx -> longreal_type, 1);
+ oberon_generator_init_type(ctx, ctx -> longreal_type);
ctx -> set_type = oberon_new_type_set(4);
- oberon_define_type(ctx -> world_scope, "SET", ctx -> set_type, 1);
+ oberon_generator_init_type(ctx, ctx -> set_type);
+ ctx -> system_byte_type = oberon_new_type_ptr(OBERON_TYPE_SYSTEM_BYTE);
+ oberon_generator_init_type(ctx, ctx -> system_byte_type);
+ ctx -> system_ptr_type = oberon_new_type_ptr(OBERON_TYPE_SYSTEM_PTR);
+ oberon_generator_init_type(ctx, ctx -> system_ptr_type);
+ /* LONG / SHORT support */
ctx -> byte_type -> shorter = NULL;
ctx -> byte_type -> longer = ctx -> shortint_type;
@@ -4520,10 +4884,46 @@ oberon_new_intrinsic(oberon_context_t * ctx, char * name, GenerateFuncCallback f
proc -> type -> genproc = p;
}
+static void oberon_new_intrinsic_type(oberon_context_t * ctx, char * name, oberon_type_t * type)
+{
+ oberon_object_t * id;
+ id = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, true, false, false);
+ id -> type = type;
+}
+
+static void
+oberon_begin_intrinsic_module(oberon_context_t * ctx, char * name, oberon_module_t ** m)
+{
+ oberon_scope_t * module_scope;
+ module_scope = oberon_open_scope(ctx);
+
+ oberon_module_t * module;
+ module = GC_MALLOC(sizeof *module);
+ memset(module, 0, sizeof *module);
+ module -> name = name;
+ module -> intrinsic = true;
+ module -> decl = module_scope;
+ module -> next = ctx -> module_list;
+
+ ctx -> mod = module;
+ ctx -> module_list = module;
+
+ *m = module;
+}
+
+static void
+oberon_end_intrinsic_module(oberon_context_t * ctx, oberon_module_t * m)
+{
+ oberon_close_scope(m -> decl);
+ m -> ready = true;
+ ctx -> mod = NULL;
+}
+
oberon_context_t *
oberon_create_context(ModuleImportCallback import_module)
{
- oberon_context_t * ctx = calloc(1, sizeof *ctx);
+ oberon_context_t * ctx = GC_MALLOC(sizeof *ctx);
+ memset(ctx, 0, sizeof *ctx);
oberon_scope_t * world_scope;
world_scope = oberon_open_scope(ctx);
oberon_generator_init_context(ctx);
+ /* Types */
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));
+ /* Types */
+ oberon_new_intrinsic_type(ctx, "BOOLEAN", ctx -> bool_type);
+ oberon_new_intrinsic_type(ctx, "CHAR", ctx -> char_type);
+ oberon_new_intrinsic_type(ctx, "SHORTINT", ctx -> byte_type);
+ oberon_new_intrinsic_type(ctx, "INTEGER", ctx -> shortint_type);
+ oberon_new_intrinsic_type(ctx, "LONGINT", ctx -> int_type);
+ oberon_new_intrinsic_type(ctx, "HUGEINT", ctx -> longint_type);
+ oberon_new_intrinsic_type(ctx, "REAL", ctx -> real_type);
+ oberon_new_intrinsic_type(ctx, "LONGREAL", ctx -> longreal_type);
+ oberon_new_intrinsic_type(ctx, "SET", ctx -> set_type);
+
/* Functions */
oberon_new_intrinsic(ctx, "ABS", oberon_make_abs_call, NULL);
oberon_new_intrinsic(ctx, "ASH", oberon_make_ash_call, NULL);
oberon_new_intrinsic(ctx, "INCL", NULL, oberon_make_incl_call);
oberon_new_intrinsic(ctx, "NEW", NULL, oberon_make_new_call);
+ /* MODULE SYSTEM */
+ oberon_begin_intrinsic_module(ctx, "SYSTEM", &ctx -> system_module);
+
+ /* Types */
+ oberon_new_intrinsic_type(ctx, "BYTE", ctx -> system_byte_type);
+ oberon_new_intrinsic_type(ctx, "PTR", ctx -> system_ptr_type);
+ oberon_new_intrinsic_type(ctx, "INT8", ctx -> byte_type);
+ oberon_new_intrinsic_type(ctx, "INT16", ctx -> shortint_type);
+ oberon_new_intrinsic_type(ctx, "INT32", ctx -> int_type);
+ oberon_new_intrinsic_type(ctx, "INT64", ctx -> longint_type);
+ oberon_new_intrinsic_type(ctx, "SET32", ctx -> set_type);
+
+ /* Functions */
+ oberon_new_intrinsic(ctx, "CC", oberon_make_cc_call, NULL);
+ oberon_new_intrinsic(ctx, "LSH", oberon_make_lsh_call, NULL);
+ oberon_new_intrinsic(ctx, "ROT", oberon_make_rot_call, NULL);
+ oberon_new_intrinsic(ctx, "VAL", oberon_make_val_call, NULL);
+
+ oberon_end_intrinsic_module(ctx, ctx -> system_module);
+
return ctx;
}
oberon_destroy_context(oberon_context_t * ctx)
{
oberon_generator_destroy_context(ctx);
- free(ctx);
}
oberon_module_t *
-oberon_compile_module(oberon_context_t * ctx, const char * newcode)
+oberon_compile_module(oberon_context_t * ctx, oberon_scanner_t * s)
{
const char * code = ctx -> code;
int code_index = ctx -> code_index;
+ oberon_location_t loc = ctx -> loc;
+ oberon_location_t xloc = ctx -> xloc;
char c = ctx -> c;
int token = ctx -> token;
char * string = ctx -> string;
module_scope = oberon_open_scope(ctx);
oberon_module_t * module;
- module = calloc(1, sizeof *module);
+ module = GC_MALLOC(sizeof *module);
+ memset(module, 0, sizeof *module);
module -> decl = module_scope;
module -> next = ctx -> module_list;
ctx -> mod = module;
ctx -> module_list = module;
- oberon_init_scaner(ctx, newcode);
+ oberon_init_scaner(ctx, s);
oberon_parse_module(ctx);
module -> ready = 1;
ctx -> code = code;
ctx -> code_index = code_index;
+ ctx -> loc = loc;
+ ctx -> xloc = xloc;
ctx -> c = c;
ctx -> token = token;
ctx -> string = string;