diff --git a/src/oberon.c b/src/oberon.c
index 382f4f182b2e98ca1032a7f720cc575e58ae9fc5..a2a567036598a90f005bcc1780531e18e6d54701 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"
LEQ,
GREAT,
GEQ,
+ IN,
+ IS,
PLUS,
MINUS,
OR,
UPARROW,
NIL,
IMPORT,
- REAL
+ REAL,
+ CHAR,
+ STRING,
+ IF,
+ THEN,
+ ELSE,
+ ELSIF,
+ WHILE,
+ DO,
+ REPEAT,
+ UNTIL,
+ FOR,
+ BY,
+ LOOP,
+ EXIT
};
// =======================================================================
// UTILS
// =======================================================================
-void
+static void
oberon_error(oberon_context_t * ctx, const char * fmt, ...)
{
va_list ptr;
}
static oberon_type_t *
-oberon_new_type_boolean(int size)
+oberon_new_type_boolean()
{
oberon_type_t * x;
x = oberon_new_type_ptr(OBERON_TYPE_BOOLEAN);
- x -> size = size;
return x;
}
return x;
}
+static oberon_type_t *
+oberon_new_type_char(int size)
+{
+ oberon_type_t * x;
+ x = oberon_new_type_ptr(OBERON_TYPE_CHAR);
+ x -> size = size;
+ return x;
+}
+
+static oberon_type_t *
+oberon_new_type_string(int size)
+{
+ oberon_type_t * x;
+ x = oberon_new_type_ptr(OBERON_TYPE_STRING);
+ x -> size = size;
+ return x;
+}
+
// =======================================================================
// TABLE
// =======================================================================
if(scope -> up)
{
- scope -> parent = scope -> up -> parent;
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;
ctx -> decl = scope -> up;
}
-static oberon_object_t *
-oberon_define_object(oberon_scope_t * scope, char * name, int class, int export, int read_only)
-{
- oberon_object_t * x = scope -> list;
- while(x -> next && strcmp(x -> next -> name, name) != 0)
- {
- x = x -> next;
- }
-
- if(x -> next)
- {
- 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 -> module = scope -> ctx -> mod;
-
- x -> next = newvar;
-
- return newvar;
-}
-
static oberon_object_t *
oberon_find_object_in_list(oberon_object_t * list, char * name)
{
}
static oberon_object_t *
-oberon_find_object(oberon_scope_t * scope, char * name, int check_it)
+oberon_find_object(oberon_scope_t * scope, char * name, bool check_it)
{
oberon_object_t * result = NULL;
}
static oberon_object_t *
-oberon_find_field(oberon_context_t * ctx, oberon_type_t * rec, char * name)
+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)
{
- oberon_object_t * x = rec -> decl;
- for(int i = 0; i < rec -> num_decl; i++)
+ if(check_upscope)
{
- if(strcmp(x -> name, name) == 0)
+ if(oberon_find_object(scope -> up, name, false))
{
- return x;
+ oberon_error(scope -> ctx, "already defined");
}
+ }
+
+ oberon_object_t * x = scope -> list;
+ while(x -> next && strcmp(x -> next -> name, name) != 0)
+ {
x = x -> next;
}
- oberon_error(ctx, "field not defined");
+ if(x -> next)
+ {
+ oberon_error(scope -> ctx, "already defined");
+ }
+
+ oberon_object_t * newvar;
+ newvar = oberon_create_object(scope, name, class, export, read_only);
+ x -> next = newvar;
- return NULL;
+ 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, 0);
+ id = oberon_define_object(scope, name, OBERON_CLASS_TYPE, export, false, false);
id -> type = type;
oberon_generator_init_type(scope -> ctx, type);
return id;
{
ctx -> token = IMPORT;
}
+ else if(strcmp(ident, "IN") == 0)
+ {
+ ctx -> token = IN;
+ }
+ else if(strcmp(ident, "IS") == 0)
+ {
+ ctx -> token = IS;
+ }
+ else if(strcmp(ident, "IF") == 0)
+ {
+ ctx -> token = IF;
+ }
+ else if(strcmp(ident, "THEN") == 0)
+ {
+ ctx -> token = THEN;
+ }
+ else if(strcmp(ident, "ELSE") == 0)
+ {
+ 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;
+ }
}
static void
* mode = 1 == HEX
* mode = 2 == REAL
* mode = 3 == LONGREAL
+ * mode = 4 == CHAR
*/
int mode = 0;
start_i = ctx -> code_index;
end_i = ctx -> code_index;
- if(ctx -> c != 'H')
+ if(ctx -> c == 'H')
+ {
+ mode = 1;
+ oberon_get_char(ctx);
+ }
+ else if(ctx -> c == 'X')
+ {
+ mode = 4;
+ oberon_get_char(ctx);
+ }
+ else
{
oberon_error(ctx, "invalid hex number");
}
- oberon_get_char(ctx);
}
else if(ctx -> c == '.')
{
end_i = ctx -> code_index;
}
+ if(mode == 0)
+ {
+ if(ctx -> c == 'H')
+ {
+ mode = 1;
+ oberon_get_char(ctx);
+ }
+ else if(ctx -> c == 'X')
+ {
+ mode = 4;
+ oberon_get_char(ctx);
+ }
+ }
+
int len = end_i - start_i;
ident = malloc(len + 1);
memcpy(ident, &ctx -> code[start_i], len);
ident[len] = 0;
+ ctx -> longmode = false;
if(mode == 3)
{
int i = exp_i - start_i;
ident[i] = 'E';
+ ctx -> longmode = true;
}
switch(mode)
sscanf(ident, "%lf", &real);
ctx -> token = REAL;
break;
+ case 4:
+ sscanf(ident, "%lx", &integer);
+ real = integer;
+ ctx -> token = CHAR;
+ break;
default:
oberon_error(ctx, "oberon_read_number: wat");
break;
}
}
+static void oberon_read_string(oberon_context_t * ctx)
+{
+ int c = ctx -> c;
+ oberon_get_char(ctx);
+
+ int start = ctx -> code_index;
+
+ while(ctx -> c != 0 && ctx -> c != c)
+ {
+ oberon_get_char(ctx);
+ }
+
+ if(ctx -> c == 0)
+ {
+ oberon_error(ctx, "unterminated string");
+ }
+
+ int end = ctx -> code_index;
+
+ oberon_get_char(ctx);
+
+ char * string = calloc(1, end - start + 1);
+ strncpy(string, &ctx -> code[start], end - start);
+
+ 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
ctx -> token = UPARROW;
oberon_get_char(ctx);
break;
+ case '"':
+ oberon_read_string(ctx);
+ break;
+ case '\'':
+ oberon_read_string(ctx);
+ break;
default:
oberon_error(ctx, "invalid char %c", ctx -> c);
break;
static char * oberon_assert_ident(oberon_context_t * ctx);
static void oberon_type(oberon_context_t * ctx, oberon_type_t ** type);
static oberon_item_t * oberon_const_expr(oberon_context_t * ctx);
+static oberon_expr_t * oberno_make_dereferencing(oberon_context_t * ctx, oberon_expr_t * expr);
static oberon_expr_t *
oberon_new_operator(int op, oberon_type_t * result, oberon_expr_t * left, oberon_expr_t * right)
@@ -743,7 +901,14 @@ oberon_expr_list(oberon_context_t * ctx, int * num_expr, oberon_expr_t ** first,
oberon_expr_t * last;
*num_expr = 1;
- *first = last = oberon_expr(ctx);
+ if(const_expr)
+ {
+ *first = last = (oberon_expr_t *) oberon_const_expr(ctx);
+ }
+ else
+ {
+ *first = last = oberon_expr(ctx);
+ }
while(ctx -> token == COMMA)
{
oberon_assert_token(ctx, COMMA);
@@ -764,38 +929,198 @@ oberon_expr_list(oberon_context_t * ctx, int * num_expr, oberon_expr_t ** first,
}
}
+static oberon_expr_t *
+oberon_cast_expr(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * pref)
+{
+ return oberon_new_operator(OP_CAST, pref, expr, NULL);
+}
+
+static oberon_expr_t *
+oberno_make_record_cast(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * rec)
+{
+ oberon_type_t * from = expr -> result;
+ oberon_type_t * to = rec;
+
+ printf("oberno_make_record_cast: from class %i to class %i\n", from -> class, to -> class);
+
+ if(from -> class == OBERON_TYPE_POINTER && to -> class == OBERON_TYPE_POINTER)
+ {
+ printf("oberno_make_record_cast: pointers\n");
+ from = from -> base;
+ to = to -> base;
+ }
+
+ if(from -> class != OBERON_TYPE_RECORD || to -> class != OBERON_TYPE_RECORD)
+ {
+ oberon_error(ctx, "must be record type");
+ }
+
+ return oberon_cast_expr(ctx, expr, rec);
+}
+
+static oberon_type_t *
+oberon_get_equal_expr_type(oberon_context_t * ctx, oberon_type_t * a, oberon_type_t * b)
+{
+ oberon_type_t * result;
+ if(a -> class == OBERON_TYPE_REAL && b -> class == OBERON_TYPE_INTEGER)
+ {
+ result = a;
+ }
+ else if(b -> class == OBERON_TYPE_REAL && a -> class == OBERON_TYPE_INTEGER)
+ {
+ result = b;
+ }
+ else if(a -> class != b -> class)
+ {
+ oberon_error(ctx, "oberon_get_equal_expr_type: incompatible types");
+ }
+ else if(a -> size > b -> size)
+ {
+ result = a;
+ }
+ else
+ {
+ result = b;
+ }
+
+ return result;
+}
+
+static void
+oberon_check_record_compatibility(oberon_context_t * ctx, oberon_type_t * from, oberon_type_t * to)
+{
+ if(from -> class == OBERON_TYPE_POINTER && to -> class == OBERON_TYPE_POINTER)
+ {
+ from = from -> base;
+ to = to -> base;
+ }
+
+ if(from -> class != OBERON_TYPE_RECORD || to -> class != OBERON_TYPE_RECORD)
+ {
+ oberon_error(ctx, "not a record");
+ }
+
+ oberon_type_t * t = from;
+ while(t != NULL && t != to)
+ {
+ t = t -> base;
+ }
+
+ if(t == NULL)
+ {
+ oberon_error(ctx, "incompatible record types");
+ }
+}
+
+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)
{
+ // Допускается:
+ // Если классы типов равны
+ // Если INTEGER переводится в REAL
+ // Есди STRING переводится в ARRAY OF CHAR
+
+ oberon_check_src(ctx, expr);
+
+ bool error = false;
if(pref -> class != expr -> result -> class)
{
- if(pref -> class != OBERON_TYPE_PROCEDURE)
+ printf("expr class %i\n", expr -> result -> class);
+ printf("pref class %i\n", pref -> class);
+
+ if(expr -> result -> class == OBERON_TYPE_STRING)
+ {
+ if(pref -> class == OBERON_TYPE_ARRAY)
+ {
+ if(pref -> base -> class != OBERON_TYPE_CHAR)
+ {
+ error = true;
+ }
+ }
+ else
+ {
+ error = true;
+ }
+ }
+ else if(expr -> result -> class == OBERON_TYPE_INTEGER)
{
- if(expr -> result -> class != OBERON_TYPE_POINTER)
+ if(pref -> class != OBERON_TYPE_REAL)
{
- oberon_error(ctx, "incompatible types");
+ error = true;
}
}
+ else
+ {
+ error = true;
+ }
}
- if(pref -> class == OBERON_TYPE_INTEGER)
+ if(error)
{
- if(expr -> result -> class > pref -> class)
+ oberon_error(ctx, "oberon_autocast_to: incompatible types");
+ }
+
+ if(pref -> class == OBERON_TYPE_INTEGER || pref -> class == OBERON_TYPE_REAL)
+ {
+ if(expr -> result -> size > pref -> size)
{
oberon_error(ctx, "incompatible size");
}
+ else
+ {
+ expr = oberon_cast_expr(ctx, expr, pref);
+ }
}
else if(pref -> class == OBERON_TYPE_RECORD)
{
- if(expr -> result != pref)
- {
- printf("oberon_autocast_to: rec %p != %p\n", expr -> result, pref);
- oberon_error(ctx, "incompatible record types");
- }
+ oberon_check_record_compatibility(ctx, expr -> result, pref);
+ expr = oberno_make_record_cast(ctx, expr, pref);
}
else if(pref -> class == OBERON_TYPE_POINTER)
{
- if(expr -> result -> base != pref -> base)
+ assert(pref -> base);
+ if(expr -> result -> base -> class == OBERON_TYPE_RECORD)
+ {
+ oberon_check_record_compatibility(ctx, expr -> result, pref);
+ expr = oberno_make_record_cast(ctx, expr, pref);
+ }
+ else if(expr -> result -> base != pref -> base)
{
if(expr -> result -> base -> class != OBERON_TYPE_VOID)
{
@@ -804,31 +1129,29 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
}
}
- // TODO cast
-
return expr;
}
static void
-oberon_autocast_call(oberon_context_t * ctx, oberon_expr_t * desig)
+oberon_autocast_binary_op(oberon_context_t * ctx, oberon_expr_t ** ea, oberon_expr_t ** eb)
{
- if(desig -> is_item == 0)
- {
- oberon_error(ctx, "expected item");
- }
+ oberon_type_t * a = (*ea) -> result;
+ oberon_type_t * b = (*eb) -> result;
+ oberon_type_t * preq = oberon_get_equal_expr_type(ctx, a, b);
+ *ea = oberon_autocast_to(ctx, *ea, preq);
+ *eb = oberon_autocast_to(ctx, *eb, preq);
+}
- if(desig -> item.mode != MODE_CALL)
+static void
+oberon_autocast_call(oberon_context_t * ctx, oberon_item_t * desig)
+{
+ if(desig -> mode != MODE_CALL)
{
oberon_error(ctx, "expected mode CALL");
}
- if(desig -> item.var -> type -> class != OBERON_TYPE_PROCEDURE)
- {
- oberon_error(ctx, "only procedures can be called");
- }
-
- oberon_type_t * fn = desig -> item.var -> type;
- int num_args = desig -> item.num_args;
+ oberon_type_t * fn = desig -> parent -> result;
+ int num_args = desig -> num_args;
int num_decl = fn -> num_decl;
if(num_args < num_decl)
oberon_error(ctx, "too many arguments");
}
- oberon_expr_t * arg = desig -> item.args;
+ /* Делаем проверку на запись и делаем автокаст */
+ oberon_expr_t * casted[num_args];
+ oberon_expr_t * arg = desig -> args;
oberon_object_t * param = fn -> decl;
for(int i = 0; i < num_args; i++)
{
{
oberon_error(ctx, "assign to read-only var");
}
+ }
- //if(arg -> is_item)
- //{
- // switch(arg -> item.mode)
- // {
- // case MODE_VAR:
- // case MODE_INDEX:
- // case MODE_FIELD:
- // // Допустимо разыменование?
- // //case MODE_DEREF:
- // break;
- // default:
- // oberon_error(ctx, "var-parameter accept only variables");
- // break;
- // }
- //}
- }
- oberon_autocast_to(ctx, arg, param -> type);
+ casted[i] = oberon_autocast_to(ctx, arg, param -> type);
arg = arg -> next;
param = param -> next;
}
+
+ /* Создаём новый список выражений */
+ if(num_args > 0)
+ {
+ arg = casted[0];
+ for(int i = 0; i < num_args - 1; i++)
+ {
+ casted[i] -> next = casted[i + 1];
+ }
+ desig -> args = arg;
+ }
}
static oberon_expr_t *
-oberon_make_call_func(oberon_context_t * ctx, oberon_object_t * proc, int num_args, oberon_expr_t * list_args)
+oberon_make_call_func(oberon_context_t * ctx, oberon_item_t * item, int num_args, oberon_expr_t * list_args)
{
- switch(proc -> class)
+ oberon_type_t * signature = item -> result;
+ if(signature -> class != OBERON_TYPE_PROCEDURE)
{
- 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;
+ oberon_error(ctx, "not a procedure");
}
oberon_expr_t * call;
- if(proc -> sysproc)
+ if(signature -> sysproc)
{
- if(proc -> genfunc == NULL)
+ if(signature -> genfunc == NULL)
{
oberon_error(ctx, "not a function-procedure");
}
- call = proc -> genfunc(ctx, num_args, list_args);
+ call = signature -> genfunc(ctx, num_args, list_args);
}
else
{
- if(proc -> type -> base -> class == OBERON_TYPE_VOID)
+ if(signature -> base -> class == OBERON_TYPE_VOID)
{
oberon_error(ctx, "attempt to call procedure in expression");
}
- call = oberon_new_item(MODE_CALL, proc -> type -> base, 1);
- call -> item.var = proc;
+ call = oberon_new_item(MODE_CALL, signature -> base, true);
+ call -> item.parent = item;
call -> item.num_args = num_args;
call -> item.args = list_args;
- oberon_autocast_call(ctx, call);
+ oberon_autocast_call(ctx, (oberon_item_t *) call);
}
return call;
}
static void
-oberon_make_call_proc(oberon_context_t * ctx, oberon_object_t * proc, int num_args, oberon_expr_t * list_args)
+oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args, oberon_expr_t * list_args)
{
- switch(proc -> class)
+ oberon_type_t * signature = item -> result;
+ if(signature -> class != OBERON_TYPE_PROCEDURE)
{
- 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;
+ oberon_error(ctx, "not a procedure");
}
- if(proc -> sysproc)
+ oberon_expr_t * call;
+
+ if(signature -> sysproc)
{
- if(proc -> genproc == NULL)
+ if(signature -> genproc == NULL)
{
- oberon_error(ctx, "requres non-typed procedure");
+ oberon_error(ctx, "not a procedure");
}
- proc -> genproc(ctx, num_args, list_args);
+ signature -> genproc(ctx, num_args, list_args);
}
else
{
- if(proc -> type -> base -> class != OBERON_TYPE_VOID)
+ if(signature -> 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 = oberon_new_item(MODE_CALL, signature -> base, true);
+ call -> item.parent = item;
call -> item.num_args = num_args;
call -> item.args = list_args;
- oberon_autocast_call(ctx, call);
+ oberon_autocast_call(ctx, (oberon_item_t *) call);
oberon_generate_call_proc(ctx, call);
}
}
@@ -980,14 +1272,19 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_object_t * proc, int num_ar
|| ((x) == MINUS) \
|| ((x) == IDENT) \
|| ((x) == INTEGER) \
+ || ((x) == REAL) \
+ || ((x) == CHAR) \
+ || ((x) == STRING) \
+ || ((x) == NIL) \
|| ((x) == LPAREN) \
|| ((x) == NOT) \
|| ((x) == TRUE) \
- || ((x) == FALSE))
+ || ((x) == FALSE))
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");
@@ -1059,7 +1356,7 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
expr = oberno_make_dereferencing(ctx, expr);
}
- assert(expr -> is_item == 1);
+ assert(expr -> is_item);
if(expr -> result -> class != OBERON_TYPE_RECORD)
{
@@ -1069,7 +1366,7 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
oberon_type_t * rec = expr -> result;
oberon_object_t * field;
- field = oberon_find_field(ctx, rec, name);
+ field = oberon_find_object(rec -> scope, name, true);
if(field -> export == 0)
{
@@ -1099,7 +1396,8 @@ oberon_make_record_selector(oberon_context_t * ctx, oberon_expr_t * expr, char *
#define ISSELECTOR(x) \
(((x) == LBRACE) \
|| ((x) == DOT) \
- || ((x) == UPARROW))
+ || ((x) == UPARROW) \
+ || ((x) == LPAREN))
static oberon_object_t *
oberon_qualident(oberon_context_t * ctx, char ** xname, int check)
return x;
}
+static oberon_expr_t *
+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_designator(oberon_context_t * ctx)
{
// 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");
}
expr -> item.var = var;
- while(ISSELECTOR(ctx -> token))
+ while(expr -> result -> class != OBERON_TYPE_PROCEDURE && ISSELECTOR(ctx -> token))
{
switch(ctx -> token)
{
oberon_assert_token(ctx, UPARROW);
expr = oberno_make_dereferencing(ctx, expr);
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");
+ }
+ oberon_assert_token(ctx, RPAREN);
+ expr = oberno_make_record_cast(ctx, expr, objtype -> type);
+ break;
default:
oberon_error(ctx, "oberon_designator: wat");
break;
}
}
+
return expr;
}
static oberon_expr_t *
oberon_opt_func_parens(oberon_context_t * ctx, oberon_expr_t * expr)
{
- assert(expr -> is_item == 1);
-
/* Если есть скобки - значит вызов. Если нет, то передаём указатель. */
if(ctx -> token == LPAREN)
{
oberon_expr_list(ctx, &num_args, &arguments, 0);
}
- expr = oberon_make_call_func(ctx, expr -> item.var, num_args, arguments);
+ assert(expr -> is_item == 1);
+ expr = oberon_make_call_func(ctx, (oberon_item_t *) expr, num_args, arguments);
oberon_assert_token(ctx, RPAREN);
}
static void
oberon_opt_proc_parens(oberon_context_t * ctx, oberon_expr_t * expr)
{
- assert(expr -> is_item == 1);
+ assert(expr -> is_item);
int num_args = 0;
oberon_expr_t * arguments = NULL;
}
/* Вызов происходит даже без скобок */
- oberon_make_call_proc(ctx, expr -> item.var, num_args, arguments);
+ oberon_make_call_proc(ctx, (oberon_item_t *) expr, num_args, arguments);
+}
+
+static oberon_type_t *
+oberon_get_type_of_int_value(oberon_context_t * ctx, int64_t i)
+{
+ if(i >= -128 && i <= 127)
+ {
+ return ctx -> byte_type;
+ }
+ else if(i >= -32768 && i <= 32767)
+ {
+ return ctx -> shortint_type;
+ }
+ else if(i >= -2147483648 && i <= 2147483647)
+ {
+ return ctx -> int_type;
+ }
+ else
+ {
+ return ctx -> longint_type;
+ }
+}
+
+static oberon_expr_t *
+oberon_integer_item(oberon_context_t * ctx, int64_t i)
+{
+ oberon_expr_t * expr;
+ oberon_type_t * result;
+ result = oberon_get_type_of_int_value(ctx, i);
+ expr = oberon_new_item(MODE_INTEGER, result, true);
+ expr -> item.integer = i;
+ return expr;
}
static oberon_expr_t *
oberon_factor(oberon_context_t * ctx)
{
oberon_expr_t * expr;
+ oberon_type_t * result;
switch(ctx -> token)
{
expr = oberon_opt_func_parens(ctx, expr);
break;
case INTEGER:
- expr = oberon_new_item(MODE_INTEGER, ctx -> int_type, 1);
- expr -> item.integer = ctx -> integer;
+ expr = oberon_integer_item(ctx, ctx -> integer);
oberon_assert_token(ctx, INTEGER);
break;
+ case CHAR:
+ result = ctx -> char_type;
+ expr = oberon_new_item(MODE_CHAR, result, true);
+ expr -> item.integer = ctx -> integer;
+ 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;
+ oberon_assert_token(ctx, STRING);
+ break;
case REAL:
- expr = oberon_new_item(MODE_REAL, ctx -> real_type, 1);
+ result = (ctx -> longmode) ? (ctx -> longreal_type) : (ctx -> real_type);
+ expr = oberon_new_item(MODE_REAL, result, 1);
expr -> item.real = ctx -> real;
oberon_assert_token(ctx, REAL);
break;
case TRUE:
- expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, 1);
- expr -> item.boolean = 1;
+ 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, 1);
- expr -> item.boolean = 0;
+ expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, true);
+ expr -> item.boolean = false;
oberon_assert_token(ctx, FALSE);
break;
case LPAREN:
break;
case NIL:
oberon_assert_token(ctx, NIL);
- expr = oberon_new_item(MODE_NIL, ctx -> void_ptr_type, 1);
+ expr = oberon_new_item(MODE_NIL, ctx -> void_ptr_type, true);
break;
default:
oberon_error(ctx, "invalid expression");
return expr;
}
-/*
- * oberon_autocast_binary_op автоматически переобразовывеат тип по след. правилам:
- * 1. Классы обоих типов должны быть одинаковы
- * 2. В качестве результата должен быть выбран больший тип.
- * 3. Если размер результат не должен быть меньше чем базовый int
- */
-
-static void
-oberon_autocast_binary_op(oberon_context_t * ctx, oberon_type_t * a, oberon_type_t * b, oberon_type_t ** result)
-{
- if((a -> class) != (b -> class))
- {
- oberon_error(ctx, "incompatible types");
- }
-
- if((a -> size) > (b -> size))
- {
- *result = a;
- }
- else
- {
- *result = b;
- }
-
- if(((*result) -> class) == OBERON_TYPE_INTEGER)
- {
- if(((*result) -> size) < (ctx -> int_type -> size))
- {
- *result = ctx -> int_type;
- }
- }
-
- /* TODO: cast types */
-}
-
#define ITMAKESBOOLEAN(x) \
(((x) >= EQUAL && (x) <= GEQ) || ((x) == OR) || ((x) == AND))
@@ -1352,6 +1693,27 @@ oberon_autocast_binary_op(oberon_context_t * ctx, oberon_type_t * a, oberon_type
#define ITUSEONLYBOOLEAN(x) \
(((x) == OR) || ((x) == AND))
+static void
+oberon_autocast_to_real(oberon_context_t * ctx, oberon_expr_t ** e)
+{
+ oberon_expr_t * expr = *e;
+ if(expr -> result -> class == OBERON_TYPE_INTEGER)
+ {
+ if(expr -> result -> size <= ctx -> real_type -> size)
+ {
+ *e = oberon_cast_expr(ctx, expr, ctx -> real_type);
+ }
+ else
+ {
+ *e = oberon_cast_expr(ctx, expr, ctx -> longreal_type);
+ }
+ }
+ else if(expr -> result -> class != OBERON_TYPE_REAL)
+ {
+ oberon_error(ctx, "required numeric type");
+ }
+}
+
static oberon_expr_t *
oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_expr_t * b)
{
@@ -1362,10 +1724,16 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
{
if(ITUSEONLYINTEGER(token))
{
- if(a -> result -> class != OBERON_TYPE_INTEGER
- || b -> result -> class != OBERON_TYPE_INTEGER)
+ 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)
{
- oberon_error(ctx, "used only with integer types");
+ // accept
+ }
+ else
+ {
+ oberon_error(ctx, "used only with numeric types");
}
}
else if(ITUSEONLYBOOLEAN(token))
@@ -1377,6 +1745,7 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
}
}
+ oberon_autocast_binary_op(ctx, &a, &b);
result = ctx -> bool_type;
if(token == EQUAL)
@@ -1418,32 +1787,10 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
}
else if(token == SLASH)
{
- if(a -> result -> class != OBERON_TYPE_REAL)
- {
- if(a -> result -> class == OBERON_TYPE_INTEGER)
- {
- oberon_error(ctx, "TODO cast int -> real");
- }
- else
- {
- oberon_error(ctx, "operator / requires numeric type");
- }
- }
-
- if(b -> result -> class != OBERON_TYPE_REAL)
- {
- if(b -> result -> class == OBERON_TYPE_INTEGER)
- {
- oberon_error(ctx, "TODO cast int -> real");
- }
- else
- {
- oberon_error(ctx, "operator / requires numeric type");
- }
- }
-
- oberon_autocast_binary_op(ctx, a -> result, b -> result, &result);
- expr = oberon_new_operator(OP_DIV, result, a, b);
+ 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)
{
@@ -1453,28 +1800,28 @@ oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_
oberon_error(ctx, "operator DIV requires integer type");
}
- oberon_autocast_binary_op(ctx, a -> result, b -> result, &result);
- expr = oberon_new_operator(OP_DIV, result, a, b);
+ oberon_autocast_binary_op(ctx, &a, &b);
+ expr = oberon_new_operator(OP_DIV, a -> result, a, b);
}
else
{
- oberon_autocast_binary_op(ctx, a -> result, b -> result, &result);
+ oberon_autocast_binary_op(ctx, &a, &b);
if(token == PLUS)
{
- expr = oberon_new_operator(OP_ADD, result, a, b);
+ expr = oberon_new_operator(OP_ADD, a -> result, a, b);
}
else if(token == MINUS)
{
- expr = oberon_new_operator(OP_SUB, result, a, b);
+ expr = oberon_new_operator(OP_SUB, a -> result, a, b);
}
else if(token == STAR)
{
- expr = oberon_new_operator(OP_MUL, result, a, b);
+ expr = oberon_new_operator(OP_MUL, a -> result, a, b);
}
else if(token == MOD)
{
- expr = oberon_new_operator(OP_MOD, result, a, b);
+ expr = oberon_new_operator(OP_MOD, a -> result, a, b);
}
else
{
}
expr = oberon_term_expr(ctx);
+
+ if(minus)
+ {
+ expr = oberon_make_unary_op(ctx, MINUS, expr);
+ }
+
while(ISADDOP(ctx -> token))
{
int token = ctx -> token;
expr = oberon_make_bin_op(ctx, token, expr, inter);
}
- if(minus)
- {
- expr = oberon_make_unary_op(ctx, MINUS, expr);
- }
-
return expr;
}
#define ISRELATION(x) \
- ((x) >= EQUAL && (x) <= GEQ)
+ ((x) >= EQUAL && (x) <= IS)
static oberon_expr_t *
oberon_expr(oberon_context_t * ctx)
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;
}
}
static oberon_object_t *
-oberon_ident_def(oberon_context_t * ctx, int class)
+oberon_ident_def(oberon_context_t * ctx, int class, bool check_upscope)
{
char * name;
int export;
name = oberon_assert_ident(ctx);
oberon_def(ctx, &export, &read_only);
- x = oberon_define_object(ctx -> decl, name, class, export, read_only);
+ x = oberon_define_object(ctx -> decl, name, class, export, read_only, check_upscope);
return x;
}
static void
-oberon_ident_list(oberon_context_t * ctx, int class, int * num, oberon_object_t ** list)
+oberon_ident_list(oberon_context_t * ctx, int class, bool check_upscope, int * num, oberon_object_t ** list)
{
*num = 1;
- *list = oberon_ident_def(ctx, class);
+ *list = oberon_ident_def(ctx, class, check_upscope);
while(ctx -> token == COMMA)
{
oberon_assert_token(ctx, COMMA);
- oberon_ident_def(ctx, class);
+ oberon_ident_def(ctx, class, check_upscope);
*num += 1;
}
}
oberon_type_t * type;
type = oberon_new_type_ptr(OBERON_TYPE_VOID);
- oberon_ident_list(ctx, OBERON_CLASS_VAR, &num, &list);
+ oberon_ident_list(ctx, OBERON_CLASS_VAR, false, &num, &list);
oberon_assert_token(ctx, COLON);
oberon_type(ctx, &type);
int num;
oberon_object_t * list;
- oberon_ident_list(ctx, class, &num, &list);
+ oberon_ident_list(ctx, class, false, &num, &list);
oberon_assert_token(ctx, COLON);
oberon_error(ctx, "procedure requires expression on result");
}
- oberon_autocast_to(ctx, expr, result_type);
+ expr = oberon_autocast_to(ctx, expr, result_type);
}
proc -> has_return = 1;
}
else
{
- proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, export, read_only);
+ 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);
oberon_item_t * value;
oberon_object_t * constant;
- constant = oberon_ident_def(ctx, OBERON_CLASS_CONST);
+ constant = oberon_ident_def(ctx, OBERON_CLASS_CONST, false);
oberon_assert_token(ctx, EQUAL);
value = oberon_const_expr(ctx);
constant -> value = value;
@@ -1949,41 +2313,16 @@ oberon_make_array_type(oberon_context_t * ctx, oberon_expr_t * size, oberon_type
oberon_error(ctx, "requires constant");
}
- if(size -> item.mode != MODE_INTEGER)
- {
- oberon_error(ctx, "requires integer constant");
- }
-
- oberon_type_t * arr;
- arr = *type;
- arr -> class = OBERON_TYPE_ARRAY;
- arr -> size = size -> item.integer;
- arr -> base = base;
-}
-
-static void
-oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec)
-{
- if(ctx -> token == IDENT)
- {
- int num;
- oberon_object_t * list;
- oberon_type_t * type;
- type = oberon_new_type_ptr(OBERON_TYPE_VOID);
-
- oberon_ident_list(ctx, OBERON_CLASS_FIELD, &num, &list);
- oberon_assert_token(ctx, COLON);
- oberon_type(ctx, &type);
-
- oberon_object_t * field = list;
- for(int i = 0; i < num; i++)
- {
- field -> type = type;
- field = field -> next;
- }
-
- rec -> num_decl += num;
+ if(size -> item.mode != MODE_INTEGER)
+ {
+ oberon_error(ctx, "requires integer constant");
}
+
+ oberon_type_t * arr;
+ arr = *type;
+ arr -> class = OBERON_TYPE_ARRAY;
+ arr -> size = size -> item.integer;
+ arr -> base = base;
}
static void
}
else
{
- to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, 0, 0);
+ to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, false, false, false);
to -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
}
@@ -2044,6 +2383,93 @@ oberon_make_open_array(oberon_context_t * ctx, oberon_type_t * base, oberon_type
type -> base = base;
}
+static void
+oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec, oberon_scope_t * modscope)
+{
+ if(ctx -> token == IDENT)
+ {
+ int num;
+ oberon_object_t * list;
+ oberon_type_t * type;
+ type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+
+ oberon_ident_list(ctx, OBERON_CLASS_FIELD, true, &num, &list);
+ oberon_assert_token(ctx, COLON);
+
+ oberon_scope_t * current = ctx -> decl;
+ ctx -> decl = modscope;
+ oberon_type(ctx, &type);
+ ctx -> decl = current;
+
+ oberon_object_t * field = list;
+ for(int i = 0; i < num; i++)
+ {
+ field -> type = type;
+ field = field -> next;
+ }
+
+ rec -> num_decl += num;
+ }
+}
+
+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;
+
+ if(ctx -> token == LPAREN)
+ {
+ oberon_assert_token(ctx, LPAREN);
+
+ oberon_object_t * typeobj;
+ typeobj = oberon_qualident(ctx, NULL, true);
+
+ if(typeobj -> class != OBERON_CLASS_TYPE)
+ {
+ oberon_error(ctx, "base must be type");
+ }
+
+ oberon_type_t * base = typeobj -> type;
+ if(base -> class == OBERON_TYPE_POINTER)
+ {
+ base = base -> base;
+ }
+
+ if(base -> class != OBERON_TYPE_RECORD)
+ {
+ oberon_error(ctx, "base must be record type");
+ }
+
+ rec -> base = base;
+ ctx -> decl = base -> scope;
+
+ oberon_assert_token(ctx, RPAREN);
+ }
+ else
+ {
+ ctx -> decl = NULL;
+ }
+
+ oberon_scope_t * this_scope;
+ this_scope = oberon_open_scope(ctx);
+ this_scope -> local = true;
+ this_scope -> parent = NULL;
+ this_scope -> parent_type = rec;
+
+ oberon_field_list(ctx, rec, modscope);
+ while(ctx -> token == SEMICOLON)
+ {
+ oberon_assert_token(ctx, SEMICOLON);
+ oberon_field_list(ctx, rec, modscope);
+ }
+
+ rec -> scope = this_scope;
+ rec -> decl = this_scope -> list -> next;
+ ctx -> decl = oldscope;
+}
+
static void
oberon_type(oberon_context_t * ctx, oberon_type_t ** type)
{
rec -> class = OBERON_TYPE_RECORD;
rec -> module = ctx -> mod;
- oberon_scope_t * record_scope;
- record_scope = oberon_open_scope(ctx);
- // TODO parent object
- //record_scope -> parent = NULL;
- record_scope -> local = 1;
-
oberon_assert_token(ctx, RECORD);
- oberon_field_list(ctx, rec);
- while(ctx -> token == SEMICOLON)
- {
- oberon_assert_token(ctx, SEMICOLON);
- oberon_field_list(ctx, rec);
- }
+ oberon_type_record_body(ctx, rec);
oberon_assert_token(ctx, END);
- rec -> decl = record_scope -> list -> next;
- oberon_close_scope(record_scope);
-
*type = rec;
}
else if(ctx -> token == POINTER)
newtype = oberon_find_object(ctx -> decl, name, 0);
if(newtype == NULL)
{
- newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, export, read_only);
+ newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, export, read_only, false);
newtype -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
assert(newtype -> type);
}
@@ -2198,7 +2610,8 @@ oberon_prevent_recursive_pointer(oberon_context_t * ctx, oberon_type_t * type)
oberon_error(ctx, "recursive pointer declaration");
}
- if(type -> base -> class == OBERON_TYPE_POINTER)
+ if(type -> class == OBERON_TYPE_POINTER
+ && type -> base -> class == OBERON_TYPE_POINTER)
{
oberon_error(ctx, "attempt to make pointer to pointer");
}
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);
+
static void
oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
{
@@ -2547,7 +2979,8 @@ oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
oberon_error(ctx, "read-only destination");
}
- oberon_autocast_to(ctx, src, dst -> result);
+ oberon_check_dst(ctx, dst);
+ src = oberon_autocast_to(ctx, src, dst -> result);
oberon_generate_assign(ctx, src, dst);
}
oberon_opt_proc_parens(ctx, item1);
}
}
+ else if(ctx -> token == IF)
+ {
+ gen_label_t * end;
+ gen_label_t * els;
+ oberon_expr_t * cond;
+
+ els = oberon_generator_reserve_label(ctx);
+ end = oberon_generator_reserve_label(ctx);
+
+ oberon_assert_token(ctx, IF);
+ 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);
+
+ 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_statement_seq(ctx);
+ }
+
+ 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 == RETURN)
{
oberon_assert_token(ctx, RETURN);
}
oberon_object_t * ident;
- ident = oberon_define_object(ctx -> decl, alias, OBERON_CLASS_MODULE, 0, 0);
+ ident = oberon_define_object(ctx -> decl, alias, OBERON_CLASS_MODULE, false, false, false);
ident -> module = m;
}
{
oberon_error(ctx, "module name not matched");
}
+
+ oberon_generator_fini_module(ctx -> mod);
}
// =======================================================================
ctx -> void_ptr_type -> base = ctx -> void_type;
oberon_generator_init_type(ctx, ctx -> void_ptr_type);
- ctx -> int_type = oberon_new_type_integer(sizeof(int));
- oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> int_type, 1);
+ ctx -> string_type = oberon_new_type_string(1);
+ oberon_generator_init_type(ctx, ctx -> string_type);
- ctx -> bool_type = oberon_new_type_boolean(sizeof(bool));
+ ctx -> bool_type = oberon_new_type_boolean();
oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
- ctx -> real_type = oberon_new_type_real(sizeof(float));
+ ctx -> byte_type = oberon_new_type_integer(1);
+ oberon_define_type(ctx -> world_scope, "BYTE", ctx -> byte_type, 1);
+
+ ctx -> shortint_type = oberon_new_type_integer(2);
+ oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> shortint_type, 1);
+
+ ctx -> int_type = oberon_new_type_integer(4);
+ oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> int_type, 1);
+
+ ctx -> longint_type = oberon_new_type_integer(8);
+ oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> longint_type, 1);
+
+ ctx -> real_type = oberon_new_type_real(4);
oberon_define_type(ctx -> world_scope, "REAL", ctx -> real_type, 1);
+
+ ctx -> longreal_type = oberon_new_type_real(8);
+ oberon_define_type(ctx -> world_scope, "LONGREAL", ctx -> longreal_type, 1);
+
+ ctx -> char_type = oberon_new_type_char(1);
+ oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
}
static void
oberon_new_intrinsic(oberon_context_t * ctx, char * name, GenerateFuncCallback f, GenerateProcCallback p)
{
oberon_object_t * proc;
- proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, 1, 0);
- proc -> sysproc = 1;
- proc -> genfunc = f;
- proc -> genproc = p;
+ proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, true, false, false);
proc -> type = oberon_new_type_ptr(OBERON_TYPE_PROCEDURE);
+ proc -> type -> sysproc = true;
+ proc -> type -> genfunc = 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;
+ 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;
+ 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:
+ size = type -> size;
+ break;
+ default:
+ oberon_error(ctx, "TODO SIZE");
+ break;
+ }
+
+ expr = oberon_integer_item(ctx, size);
+ return expr;
}
static oberon_expr_t *
@@ -2759,7 +3510,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;
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;
int token = ctx -> token;
char * string = ctx -> string;
int integer = ctx -> integer;
+ int real = ctx -> real;
+ bool longmode = ctx -> longmode;
oberon_scope_t * decl = ctx -> decl;
oberon_module_t * mod = ctx -> mod;
ctx -> token = token;
ctx -> string = string;
ctx -> integer = integer;
+ ctx -> real = real;
+ ctx -> longmode = longmode;
ctx -> decl = decl;
ctx -> mod = mod;