diff --git a/src/oberon.c b/src/oberon.c
index f67d3927dfdb0d72cbd620aeea0f4f606901376b..931a30724697a03476cff779779b3385bad5f2b4 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
#include <assert.h>
#include <stdbool.h>
#include <math.h>
+#include <float.h>
-#include "../include/oberon.h"
+#include <gc.h>
#include "oberon-internals.h"
+#include "oberon-type-compat.h"
+#include "oberon-common.h"
#include "generator.h"
-enum {
- EOF_ = 0,
- IDENT,
- MODULE,
- SEMICOLON,
- END,
- DOT,
- VAR,
- COLON,
- BEGIN,
- ASSIGN,
- INTEGER,
- LPAREN,
- RPAREN,
- EQUAL,
- NEQ,
- LESS,
- LEQ,
- GREAT,
- GEQ,
- IN,
- IS,
- PLUS,
- MINUS,
- OR,
- STAR,
- SLASH,
- DIV,
- MOD,
- AND,
- NOT,
- PROCEDURE,
- COMMA,
- RETURN,
- CONST,
- TYPE,
- ARRAY,
- OF,
- LBRACK,
- RBRACK,
- RECORD,
- POINTER,
- TO,
- UPARROW,
- NIL,
- IMPORT,
- REAL,
- CHAR,
- STRING,
- IF,
- THEN,
- ELSE,
- ELSIF,
- WHILE,
- DO,
- REPEAT,
- UNTIL,
- FOR,
- BY,
- LOOP,
- EXIT,
- LBRACE,
- RBRACE,
- DOTDOT,
- CASE,
- BAR,
- WITH
-};
-
// =======================================================================
// UTILS
// =======================================================================
static void
oberon_make_copy_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args);
-static void
-oberon_error(oberon_context_t * ctx, const char * fmt, ...)
-{
- va_list ptr;
- va_start(ptr, fmt);
- fprintf(stderr, "error: ");
- vfprintf(stderr, fmt, ptr);
- fprintf(stderr, "\n");
- fprintf(stderr, " code_index = %i\n", ctx -> code_index);
- fprintf(stderr, " c = %c\n", ctx -> c);
- fprintf(stderr, " token = %i\n", ctx -> token);
- va_end(ptr);
- exit(1);
-}
-
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;
return x;
}
+static oberon_expr_t *
+oberon_new_operator(int op, oberon_type_t * result, oberon_expr_t * left, oberon_expr_t * right)
+{
+ oberon_oper_t * operator;
+ operator = GC_MALLOC(sizeof *operator);
+ memset(operator, 0, sizeof *operator);
+
+ operator -> is_item = 0;
+ operator -> result = result;
+ operator -> read_only = 1;
+ operator -> op = op;
+ operator -> left = left;
+ operator -> right = right;
+
+ return (oberon_expr_t *) operator;
+}
+
+static oberon_expr_t *
+oberon_new_item(int mode, oberon_type_t * result, int read_only)
+{
+ oberon_item_t * item;
+ item = GC_MALLOC(sizeof *item);
+ memset(item, 0, sizeof *item);
+
+ item -> is_item = 1;
+ item -> result = result;
+ item -> read_only = read_only;
+ item -> mode = mode;
+
+ return (oberon_expr_t *)item;
+}
+
+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_make_integer(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;
+ expr -> item.real = i;
+ 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)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_CHAR, ctx -> char_type, true);
+ expr -> item.integer = i;
+ expr -> item.real = 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)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_REAL, result, true);
+ expr -> item.integer = r;
+ expr -> item.real = r;
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_real(oberon_context_t * ctx, double r, bool longmode)
+{
+ oberon_type_t * result;
+ result = (longmode) ? (ctx -> longreal_type) : (ctx -> real_type);
+ return oberon_make_real_typed(ctx, r, result);
+}
+
+static oberon_expr_t *
+oberon_make_boolean(oberon_context_t * ctx, bool cond)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, true);
+ expr -> item.integer = cond;
+ expr -> item.real = cond;
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_set(oberon_context_t * ctx, int64_t i)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_SET, ctx -> set_type, true);
+ expr -> item.integer = i;
+ expr -> item.real = i;
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_set_index(oberon_context_t * ctx, int64_t i)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_SET, ctx -> set_type, true);
+ expr -> item.integer = 1 << i;
+ expr -> item.real = 1 << i;
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_set_range(oberon_context_t * ctx, int64_t x, int64_t y)
+{
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_SET, ctx -> set_type, true);
+ expr -> item.integer = (x <= y) ? ((2 << y) - (1 << x)) : (0);
+ expr -> item.real = expr -> item.integer;
+ return expr;
+}
+
// =======================================================================
// TABLE
// =======================================================================
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;
@@ -274,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;
case 2:
case 3:
sscanf(ident, "%lf", &real);
+ integer = real;
ctx -> token = REAL;
break;
case 4:
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;
+ ctx -> integer = string[0];
}
static void oberon_read_token(oberon_context_t * ctx);
{
oberon_skip_space(ctx);
+ ctx -> loc = ctx -> xloc;
+
int c = ctx -> c;
- if(isalpha(c))
+ if(isalpha(c) || c == '_')
{
oberon_read_ident(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)
-{
- oberon_oper_t * operator;
- operator = malloc(sizeof *operator);
- memset(operator, 0, sizeof *operator);
-
- operator -> is_item = 0;
- operator -> result = result;
- operator -> read_only = 1;
- operator -> op = op;
- operator -> left = left;
- operator -> right = right;
-
- return (oberon_expr_t *) operator;
-}
-
-static oberon_expr_t *
-oberon_new_item(int mode, oberon_type_t * result, int read_only)
-{
- oberon_item_t * item;
- item = malloc(sizeof *item);
- memset(item, 0, sizeof *item);
-
- item -> is_item = 1;
- item -> result = result;
- item -> read_only = read_only;
- item -> mode = mode;
-
- return (oberon_expr_t *)item;
-}
+static bool oberon_is_const(oberon_expr_t * expr);
static oberon_expr_t *
oberon_make_unary_op(oberon_context_t * ctx, int token, oberon_expr_t * a)
{
if(result -> class == OBERON_TYPE_SET)
{
- expr = oberon_new_operator(OP_COMPLEMENTATION, result, a, NULL);
+ if(oberon_is_const(a))
+ {
+ expr = oberon_make_set(ctx, ~(a -> item.integer));
+ }
+ else
+ {
+ 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);
+ if(oberon_is_const(a))
+ {
+ expr = oberon_make_integer(ctx, -(a -> item.integer));
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_UNARY_MINUS, result, a, NULL);
+ }
+ }
+ else if(result -> class == OBERON_TYPE_REAL)
+ {
+ if(oberon_is_const(a))
+ {
+ expr = oberon_make_real_typed(ctx, -(a -> item.real), result);
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_UNARY_MINUS, result, a, NULL);
+ }
}
else
{
oberon_error(ctx, "incompatible operator type");
}
- expr = oberon_new_operator(OP_LOGIC_NOT, result, a, NULL);
+ if(oberon_is_const(a))
+ {
+ expr = oberon_make_boolean(ctx, !(a -> item.integer));
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_LOGIC_NOT, result, a, NULL);
+ }
}
else
{
@@ -978,92 +1098,47 @@ 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;
-
- 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, "must be record type");
- }
-
- return oberon_cast_expr(ctx, expr, rec);
-}
+ oberon_expr_t * cast;
-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)
+ if((oberon_is_char_type(pref) && oberon_is_const_string(expr) && strlen(expr -> item.string) == 1))
{
- result = b;
+ /* Автоматически преобразуем строку единичного размера в символ */
+ cast = oberon_new_item(MODE_CHAR, ctx -> char_type, true);
+ cast -> item.integer = expr -> item.string[0];
}
- else if(a -> class != b -> class)
+ else if(oberon_is_record_type(pref) || oberon_is_pointer_to_record(pref))
{
- oberon_error(ctx, "oberon_get_equal_expr_type: incompatible types");
+ assert(expr -> is_item);
+ cast = oberon_new_item(MODE_AS, pref, expr -> read_only);
+ cast -> item.parent = (oberon_item_t *) expr;
}
- else if(a -> size > b -> size)
+ else if(!oberon_is_some_types(expr -> result, pref))
{
- result = a;
+ cast = oberon_new_operator(OP_CAST, pref, expr, NULL);
}
else
{
- result = b;
+ cast = expr;
}
- return result;
+ 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_record_compatibility(oberon_context_t * ctx, oberon_type_t * from, oberon_type_t * to)
+oberon_check_dst(oberon_context_t * ctx, oberon_expr_t * dst)
{
- if(from -> class == OBERON_TYPE_POINTER && to -> class == OBERON_TYPE_POINTER)
+ if(dst -> read_only)
{
- from = from -> base;
- to = to -> base;
+ oberon_error(ctx, "read-only destination");
}
- 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 -> read_only)
- {
- oberon_error(ctx, "read-only destination");
- }
-
- if(dst -> is_item == false)
+ if(dst -> is_item == false)
{
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 переводится в CHAR
- // Если STRING переводится в ARRAY OF CHAR
- // Если NIL переводится в POINTER
- // Если NIL переводится в PROCEDURE
-
- oberon_check_src(ctx, expr);
-
- bool error = false;
- if(pref -> class != expr -> result -> class)
- {
- if(expr -> result -> class == OBERON_TYPE_NIL)
- {
- if(pref -> class != OBERON_TYPE_POINTER
- && pref -> class != OBERON_TYPE_PROCEDURE)
- {
- error = true;
- }
- }
- else if(expr -> result -> class == OBERON_TYPE_STRING)
- {
- if(pref -> class == OBERON_TYPE_CHAR)
- {
- if(expr -> is_item && expr -> item.mode == MODE_STRING)
- {
- if(strlen(expr -> item.string) != 1)
- {
- error = true;
- }
- }
- else
- {
- error = true;
- }
- }
- else if(pref -> class == OBERON_TYPE_ARRAY)
- {
- if(pref -> base -> class != OBERON_TYPE_CHAR)
- {
- error = true;
- }
- }
- else
- {
- error = true;
- }
- }
- else if(expr -> result -> class == OBERON_TYPE_INTEGER)
- {
- if(pref -> class != OBERON_TYPE_REAL)
- {
- error = true;
- }
- }
- else
- {
- error = true;
- }
- }
-
- if(error)
- {
- oberon_error(ctx, "oberon_autocast_to: incompatible types");
- }
-
- if(pref -> class == OBERON_TYPE_CHAR)
- {
- if(expr -> result -> class == OBERON_TYPE_STRING)
- {
- int c = expr -> item.string[0];
- expr = oberon_new_item(MODE_CHAR, ctx -> char_type, true);
- expr -> item.integer = c;
- }
- }
- else if(pref -> class == OBERON_TYPE_INTEGER || pref -> class == OBERON_TYPE_REAL)
- {
- if(expr -> result -> size > pref -> size)
- {
- oberon_error(ctx, "incompatible size");
- }
- else
- {
- expr = oberon_cast_expr(ctx, expr, pref);
- }
- }
- else if(pref -> class == OBERON_TYPE_RECORD)
- {
- oberon_check_record_compatibility(ctx, expr -> result, pref);
- expr = oberno_make_record_cast(ctx, expr, pref);
- }
- else if(pref -> class == OBERON_TYPE_POINTER)
- {
- assert(pref -> base);
- if(expr -> result -> class == OBERON_TYPE_NIL)
- {
- // do nothing
- }
- else if(expr -> result -> base -> class == OBERON_TYPE_RECORD)
- {
- oberon_check_record_compatibility(ctx, expr -> result, pref);
- expr = oberno_make_record_cast(ctx, expr, pref);
- }
- else if(expr -> result -> base != pref -> base)
- {
- oberon_error(ctx, "incompatible pointer types");
- }
- }
-
- return expr;
-}
-
-static void
-oberon_autocast_binary_op(oberon_context_t * ctx, oberon_expr_t ** ea, oberon_expr_t ** eb)
-{
- 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);
-}
-
static void
oberon_autocast_call(oberon_context_t * ctx, oberon_item_t * desig)
{
{
if(param -> class == OBERON_CLASS_VAR_PARAM)
{
- if(arg -> result != param -> type)
+ oberon_check_dst(ctx, arg);
+ if(!oberon_is_compatible_arrays(param, arg))
{
- oberon_error(ctx, "incompatible type");
- }
- if(arg -> read_only)
- {
- oberon_error(ctx, "assign to read-only var");
+ oberon_check_compatible_var_param(ctx, param -> type, arg -> result);
}
casted[i] = arg;
+ //casted[i] = oberon_cast_expr(ctx, arg, param -> type);
}
else
{
- casted[i] = oberon_autocast_to(ctx, arg, param -> type);
+ oberon_check_src(ctx, arg);
+ if(!oberon_is_compatible_arrays(param, arg))
+ {
+ oberon_check_assignment_compatible(ctx, arg, param -> type);
+ }
+ casted[i] = oberon_cast_expr(ctx, arg, param -> type);
}
arg = arg -> next;
@@ -1364,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;
return expr;
}
-static void
-oberon_check_type_guard(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t * type)
-{
- /* Охрана типа применима, если */
- /* 1. v - параметр-переменная типа запись, или v - указатель, и если */
- /* 2. T - расширение статического типа v */
-
- if(expr -> is_item
- && expr -> item.mode == MODE_VAR
- && expr -> item.var -> class == OBERON_CLASS_VAR_PARAM)
- {
- // accept
- }
- else if(expr -> result -> class == OBERON_TYPE_POINTER
- || expr -> result -> class == OBERON_TYPE_RECORD)
- {
- // accept
- }
- else
- {
- oberon_error(ctx, "guard type used only with var-param or pointers");
- }
-
- oberon_check_record_compatibility(ctx, type, expr -> result);
-}
-
-static oberon_expr_t *
-oberon_make_type_guard(oberon_context_t * ctx, oberon_expr_t * expr, oberon_object_t * objtype)
-{
- oberon_type_t * type;
-
- if(objtype -> class != OBERON_CLASS_TYPE)
- {
- oberon_error(ctx, "must be type");
- }
- type = objtype -> type;
-
- oberon_check_type_guard(ctx, expr, type);
- return oberno_make_record_cast(ctx, expr, objtype -> type);
-}
-
static oberon_expr_t *
oberon_designator(oberon_context_t * ctx)
{
oberon_assert_token(ctx, LPAREN);
objtype = oberon_qualident(ctx, NULL, true);
oberon_assert_token(ctx, RPAREN);
- expr = oberon_make_type_guard(ctx, expr, objtype);
+ oberon_check_extension_of(ctx, expr -> result, objtype -> type);
+ expr = oberon_cast_expr(ctx, expr, objtype -> type);
break;
default:
oberon_error(ctx, "oberon_designator: wat");
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_element(oberon_context_t * ctx)
{
oberon_expr_t * e2;
e1 = oberon_expr(ctx);
+ oberon_check_src(ctx, e1);
if(e1 -> result -> class != OBERON_TYPE_INTEGER)
{
oberon_error(ctx, "expected integer");
{
oberon_assert_token(ctx, DOTDOT);
e2 = oberon_expr(ctx);
+ oberon_check_src(ctx, e2);
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);
+ if(e2 == NULL && oberon_is_const(e1))
+ {
+ set = oberon_make_set_index(ctx, e1 -> item.integer);
+ }
+ else if(e2 != NULL && oberon_is_const(e1) && oberon_is_const(e2))
+ {
+ set = oberon_make_set_range(ctx, e1 -> item.integer, e2 -> item.integer);
+ }
+ else
+ {
+ set = oberon_new_operator(OP_RANGE, ctx -> set_type, e1, e2);
+ }
return set;
}
+static oberon_expr_t *
+oberon_make_set_union(oberon_context_t * ctx, oberon_expr_t * a, oberon_expr_t * b)
+{
+ if(oberon_is_const(a) && oberon_is_const(b))
+ {
+ return oberon_make_set(ctx, (a -> item.integer | b -> item.integer));
+ }
+ else
+ {
+ return oberon_new_operator(OP_UNION, ctx -> set_type, a, b);
+ }
+}
+
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;
+ set = oberon_make_set(ctx, 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);
+ set = oberon_make_set_union(ctx, 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);
+ set = oberon_make_set_union(ctx, set, elements);
}
}
oberon_assert_token(ctx, RBRACE);
return set;
}
-static oberon_expr_t *
-oberon_make_boolean(oberon_context_t * ctx, bool cond)
-{
- oberon_expr_t * expr;
- expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, true);
- expr -> item.integer = cond;
- return expr;
-}
-
static oberon_expr_t *
oberon_factor(oberon_context_t * ctx)
{
expr = oberon_opt_func_parens(ctx, expr);
break;
case INTEGER:
- expr = oberon_integer_item(ctx, ctx -> integer);
+ expr = oberon_make_integer(ctx, ctx -> integer);
oberon_assert_token(ctx, INTEGER);
break;
case CHAR:
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:
- result = (ctx -> longmode) ? (ctx -> longreal_type) : (ctx -> real_type);
- expr = oberon_new_item(MODE_REAL, result, 1);
- expr -> item.real = ctx -> real;
+ expr = oberon_make_real(ctx, ctx -> real, ctx -> longmode);
oberon_assert_token(ctx, REAL);
break;
case LBRACE:
return expr;
}
-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 bool
-oberon_is_numeric_type(oberon_type_t * t)
-{
- return (t -> class == OBERON_TYPE_INTEGER) || (t -> class == OBERON_TYPE_REAL);
-}
-
-static bool
-oberon_is_char_type(oberon_type_t * t)
-{
- return (t -> class == OBERON_TYPE_CHAR);
-}
-
-static bool
-oberon_is_string_type(oberon_type_t * t)
-{
- return (t -> class == OBERON_TYPE_STRING)
- || (t -> class == OBERON_TYPE_ARRAY && t -> base -> class == OBERON_TYPE_CHAR);
-}
-
-static bool
-oberon_is_boolean_type(oberon_type_t * t)
-{
- return (t -> class == OBERON_TYPE_BOOLEAN);
-}
-
-static bool
-oberon_is_set_type(oberon_type_t * t)
-{
- return (t -> class == OBERON_TYPE_SET);
-}
-
-static bool
-oberon_is_pointer_type(oberon_type_t * t)
-{
- return (t -> class == OBERON_TYPE_POINTER) || (t -> class == OBERON_TYPE_NIL);
-}
-
-static bool
-oberon_is_procedure_type(oberon_type_t * t)
-{
- return (t -> class == OBERON_TYPE_POINTER) || (t -> class == OBERON_TYPE_NIL);
-}
-
static oberon_expr_t *
oberon_make_bin_op(oberon_context_t * ctx, int token, oberon_expr_t * a, oberon_expr_t * b)
{
oberon_expr_t * expr;
oberon_type_t * result;
- bool error = false;
+ oberon_check_compatible_bin_expr(ctx, token, a, b);
+ oberon_check_src(ctx, a);
+ if(token != IS)
+ {
+ oberon_check_src(ctx, b);
+ }
+
if(token == IN)
{
- if(a -> result -> class != OBERON_TYPE_INTEGER)
+ if(oberon_is_const(a) && oberon_is_const(b))
{
- oberon_error(ctx, "must be integer");
+ expr = oberon_make_boolean(ctx, (1 << a -> item.integer) & b -> item.integer);
}
-
- if(b -> result -> class != OBERON_TYPE_SET)
+ else
{
- oberon_error(ctx, "must be set");
+ expr = oberon_new_operator(OP_IN, ctx -> bool_type, a, b);
}
-
- result = ctx -> bool_type;
- expr = oberon_new_operator(OP_IN, result, a, b);
}
else if(token == IS)
{
- if(b -> is_item == false || b -> item.mode != MODE_TYPE)
- {
- oberon_error(ctx, "requires type");
- }
-
- result = ctx -> bool_type;
- oberon_check_type_guard(ctx, a, b -> result);
- expr = oberon_new_operator(OP_IS, result, a, b);
+ oberon_check_type_expr(ctx, b);
+ expr = oberon_new_operator(OP_IS, ctx -> bool_type, a, b);
}
else if((token >= EQUAL && token <= GEQ) || token == OR || token == AND)
{
- if(token >= LESS && token <= GEQ)
+ if(oberon_is_string_of_one(a) && oberon_is_char_type(b -> result))
{
- if(oberon_is_numeric_type(a -> result) && oberon_is_numeric_type(b -> result))
- {
- // accept
- }
- else if(oberon_is_char_type(a -> result) && oberon_is_char_type(b -> result))
+ 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)))
+ {
+ if(oberon_is_real_type(result))
{
- // accept
+ double x = a -> item.real;
+ double y = b -> item.real;
+ switch(token)
+ {
+ case EQUAL: expr = oberon_make_boolean(ctx, x == y); break;
+ case NEQ: expr = oberon_make_boolean(ctx, x != y); break;
+ case LESS: expr = oberon_make_boolean(ctx, x < y); break;
+ case LEQ: expr = oberon_make_boolean(ctx, x <= y); break;
+ case GREAT: expr = oberon_make_boolean(ctx, x > y); break;
+ case GEQ: expr = oberon_make_boolean(ctx, x >= y); break;
+ case OR: expr = oberon_make_boolean(ctx, x || y); break;
+ case AND: expr = oberon_make_boolean(ctx, x && y); break;
+ default: assert(0); break;
+ }
}
- else if(oberon_is_string_type(a -> result) && oberon_is_string_type(b -> result))
+ else if(oberon_is_integer_type(result))
{
- // accept
+ int64_t x = a -> item.integer;
+ int64_t y = b -> item.integer;
+ switch(token)
+ {
+ case EQUAL: expr = oberon_make_boolean(ctx, x == y); break;
+ case NEQ: expr = oberon_make_boolean(ctx, x != y); break;
+ case LESS: expr = oberon_make_boolean(ctx, x < y); break;
+ case LEQ: expr = oberon_make_boolean(ctx, x <= y); break;
+ case GREAT: expr = oberon_make_boolean(ctx, x > y); break;
+ case GEQ: expr = oberon_make_boolean(ctx, x >= y); break;
+ case OR: expr = oberon_make_boolean(ctx, x || y); break;
+ case AND: expr = oberon_make_boolean(ctx, x && y); break;
+ default: assert(0); break;
+ }
}
else
{
- oberon_error(ctx, "invalid comparation");
+ assert(0);
}
}
- else if(token == EQUAL || token == NEQ)
+ else
{
- if(oberon_is_numeric_type(a -> result) && oberon_is_numeric_type(b -> result))
+ a = oberon_cast_expr(ctx, a, result);
+ b = oberon_cast_expr(ctx, b, result);
+ result = ctx -> bool_type;
+ switch(token)
{
- // accept
+ case EQUAL: expr = oberon_new_operator(OP_EQ, result, a, b); break;
+ case NEQ: expr = oberon_new_operator(OP_NEQ, result, a, b); break;
+ case LESS: expr = oberon_new_operator(OP_LSS, result, a, b); break;
+ case LEQ: expr = oberon_new_operator(OP_LEQ, result, a, b); break;
+ case GREAT: expr = oberon_new_operator(OP_GRT, result, a, b); break;
+ case GEQ: expr = oberon_new_operator(OP_GEQ, result, a, b); break;
+ case OR: expr = oberon_new_operator(OP_LOGIC_OR, result, a, b); break;
+ case AND: expr = oberon_new_operator(OP_LOGIC_AND, result, a, b); break;
+ default: assert(0); break;
}
- else if(oberon_is_char_type(a -> result) && oberon_is_char_type(b -> result))
+ }
+ }
+ else if(token == SLASH)
+ {
+ if(oberon_is_set_type(a -> result) && oberon_is_set_type(b -> result))
+ {
+ if(oberon_is_const(a) && oberon_is_const(b))
{
- // accept
+ int64_t x = a -> item.integer;
+ int64_t y = b -> item.integer;
+ expr = oberon_make_set(ctx, x ^ y);
}
- else if(oberon_is_string_type(a -> result) && oberon_is_string_type(b -> result))
+ else
{
- // accept
+ result = oberon_get_longer_type(ctx, a -> result, b -> result);
+ a = oberon_cast_expr(ctx, a, result);
+ b = oberon_cast_expr(ctx, b, result);
+ expr = oberon_new_operator(OP_SYM_DIFFERENCE, result, a, b);
}
- else if(oberon_is_boolean_type(a -> result) && oberon_is_boolean_type(b -> result))
+ }
+ else
+ {
+ result = oberon_get_longer_real_type(ctx, a -> result, b -> result);
+ if(oberon_is_const(a) && oberon_is_const(b))
{
- // accept
+ double x = a -> item.real;
+ double y = b -> item.real;
+ expr = oberon_make_real_typed(ctx, x / y, result);
}
- else if(oberon_is_set_type(a -> result) && oberon_is_set_type(b -> result))
+ else
{
- // accept
+ a = oberon_cast_expr(ctx, a, result);
+ b = oberon_cast_expr(ctx, b, result);
+ expr = oberon_new_operator(OP_DIV, result, a, b);
}
- else if(oberon_is_pointer_type(a -> result) && oberon_is_pointer_type(b -> result))
+ }
+ }
+ else
+ {
+ result = oberon_get_longer_type(ctx, a -> result, b -> result);
+
+ if(oberon_is_const(a) && oberon_is_const(b))
+ {
+ if(oberon_is_set_type(result))
{
- // accept
+ int64_t x = a -> item.integer;
+ int64_t y = b -> item.integer;
+ switch(token)
+ {
+ case PLUS: expr = oberon_make_set(ctx, x | y); break;
+ case MINUS: expr = oberon_make_set(ctx, x & ~y); break;
+ case STAR: expr = oberon_make_set(ctx, x & y); break;
+ default: assert(0); break;
+ }
}
- else if(oberon_is_procedure_type(a -> result) && oberon_is_procedure_type(b -> result))
+ if(oberon_is_real_type(result))
{
- // accept
+ double x = a -> item.real;
+ double y = b -> item.real;
+ switch(token)
+ {
+ case PLUS: expr = oberon_make_real_typed(ctx, x + y, result); break;
+ case MINUS: expr = oberon_make_real_typed(ctx, x - y, result); break;
+ case STAR: expr = oberon_make_real_typed(ctx, x * y, result); break;
+ default: assert(0); break;
+ }
}
- else
+ else if(oberon_is_integer_type(result))
{
- oberon_error(ctx, "invalid comparation");
+ int64_t x = a -> item.integer;
+ int64_t y = b -> item.integer;
+ switch(token)
+ {
+ case PLUS: expr = oberon_make_integer(ctx, x + y); break;
+ case MINUS: expr = oberon_make_integer(ctx, x - y); break;
+ case STAR: expr = oberon_make_integer(ctx, x * y); break;
+ case DIV: expr = oberon_make_integer(ctx, x / y); break;
+ case MOD: expr = oberon_make_integer(ctx, x % y); break;
+ default: assert(0); break;
+ }
}
- }
- else if(token == AND || token == OR)
- {
- if(!oberon_is_boolean_type(a -> result) || !oberon_is_boolean_type(b -> result))
+ else
{
- oberon_error(ctx, "invalid comparation");
+ assert(0);
}
}
else
{
- oberon_error(ctx, "wat");
- }
-
- oberon_autocast_binary_op(ctx, &a, &b);
- result = ctx -> bool_type;
-
- if(token == EQUAL)
- {
- expr = oberon_new_operator(OP_EQ, result, a, b);
- }
- else if(token == NEQ)
- {
- expr = oberon_new_operator(OP_NEQ, result, a, b);
- }
- else if(token == LESS)
- {
- expr = oberon_new_operator(OP_LSS, result, a, b);
- }
- else if(token == LEQ)
- {
- expr = oberon_new_operator(OP_LEQ, result, a, b);
- }
- else if(token == GREAT)
- {
- expr = oberon_new_operator(OP_GRT, result, a, b);
- }
- else if(token == GEQ)
- {
- expr = oberon_new_operator(OP_GEQ, result, a, b);
- }
- else if(token == OR)
- {
- expr = oberon_new_operator(OP_LOGIC_OR, result, a, b);
- }
- else if(token == AND)
- {
- expr = oberon_new_operator(OP_LOGIC_AND, result, a, b);
- }
- else
- {
- oberon_error(ctx, "oberon_make_bin_op: bool wat");
- }
- }
- else if(token == SLASH)
- {
- 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)
- {
- oberon_error(ctx, "operator DIV requires integer type");
- }
-
- oberon_autocast_binary_op(ctx, &a, &b);
- expr = oberon_new_operator(OP_DIV, a -> result, a, b);
- }
- else
- {
- oberon_autocast_binary_op(ctx, &a, &b);
- result = a -> result;
- if(result -> class == OBERON_TYPE_SET)
- {
- switch(token)
+ a = oberon_cast_expr(ctx, a, result);
+ b = oberon_cast_expr(ctx, b, result);
+
+
+ if(oberon_is_set_type(result))
{
- 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;
+ 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:
+ assert(0);
+ break;
+ }
}
- }
- else if(result -> class == OBERON_TYPE_INTEGER
- || result -> class == OBERON_TYPE_REAL)
- {
- switch(token)
+ else if(oberon_is_real_type(result))
{
- 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;
+ 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;
+ 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;
+ }
+ }
+ else
+ {
+ assert(0);
}
- }
- else
- {
- error = true;
}
}
- if(error)
- {
- oberon_error(ctx, "invalid operation");
- }
-
return expr;
}
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;
}
return expr;
}
-static void
-oberon_check_const(oberon_context_t * ctx, oberon_expr_t * expr)
+static bool
+oberon_is_const(oberon_expr_t * expr)
{
- if(expr -> is_item == 0)
+ if(expr -> is_item == false)
{
- oberon_error(ctx, "const expression are required");
+ return false;
}
switch(expr -> item.mode)
case MODE_REAL:
case MODE_CHAR:
case MODE_STRING:
+ case MODE_SET:
case MODE_TYPE:
- /* accept */
+ case MODE_SYSBYTE:
+ return true;
break;
default:
- oberon_error(ctx, "const expression are required");
+ return false;
break;
}
+
+ return false;
+}
+
+static void
+oberon_check_const(oberon_context_t * ctx, oberon_expr_t * expr)
+{
+ if(!oberon_is_const(expr))
+ {
+ oberon_error(ctx, "const expression are required");
+ }
}
static oberon_item_t *
oberon_error(ctx, "procedure requires expression on result");
}
- expr = oberon_autocast_to(ctx, expr, result_type);
+ oberon_check_src(ctx, expr);
+ oberon_check_assignment_compatible(ctx, expr, result_type);
+ expr = oberon_cast_expr(ctx, expr, result_type);
}
proc -> has_return = 1;
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);
@@ -2763,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;
@@ -2955,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
@@ -3108,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)
- {
- oberon_initialize_type(ctx, type -> base);
- oberon_generator_init_type(ctx, type);
- }
- else if(type -> class == OBERON_TYPE_ARRAY)
+ if(type -> class == OBERON_TYPE_POINTER || 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);
+ }
}
}
static void
oberon_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_t * dst)
{
- if(src -> is_item
- && src -> item.mode == MODE_STRING
- && src -> result -> class == OBERON_TYPE_STRING
- && dst -> result -> class == OBERON_TYPE_ARRAY
- && dst -> result -> base -> class == OBERON_TYPE_CHAR
- && dst -> result -> size > 0)
- {
+ oberon_check_dst(ctx, dst);
+ oberon_check_assignment_compatible(ctx, src, dst -> result);
- if(strlen(src -> item.string) < dst -> result -> size)
- {
- src -> next = dst;
- oberon_make_copy_call(ctx, 2, src);
- }
- else
- {
- oberon_error(ctx, "string too long for destination");
- }
+ if(oberon_is_array_of_char_type(dst -> result)
+ && oberon_is_string_type(src -> result))
+ {
+ src -> next = dst;
+ oberon_make_copy_call(ctx, 2, src);
}
else
{
- oberon_check_dst(ctx, dst);
- src = oberon_autocast_to(ctx, src, dst -> result);
+ src = oberon_cast_expr(ctx, src, dst -> result);
oberon_generate_assign(ctx, src, dst);
}
}
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)
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);
- 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)
{
}
else
{
- by = oberon_integer_item(ctx, 1);
+ by = oberon_make_integer(ctx, 1);
}
if(by -> result -> class != OBERON_TYPE_INTEGER)
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);
}
// LIBRARY
// =======================================================================
-static void
-register_default_types(oberon_context_t * ctx)
-{
- ctx -> notype_type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
- oberon_generator_init_type(ctx, ctx -> notype_type);
-
- ctx -> nil_type = oberon_new_type_ptr(OBERON_TYPE_NIL);
- oberon_generator_init_type(ctx, ctx -> nil_type);
-
- ctx -> string_type = oberon_new_type_string(1);
- oberon_generator_init_type(ctx, ctx -> string_type);
-
- ctx -> bool_type = oberon_new_type_boolean();
- oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
-
- ctx -> char_type = oberon_new_type_char(1);
- oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
-
- ctx -> byte_type = oberon_new_type_integer(1);
- oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> byte_type, 1);
-
- ctx -> shortint_type = oberon_new_type_integer(2);
- oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> shortint_type, 1);
-
- ctx -> int_type = oberon_new_type_integer(4);
- oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> int_type, 1);
-
- ctx -> longint_type = oberon_new_type_integer(8);
- oberon_define_type(ctx -> world_scope, "HUGEINT", ctx -> longint_type, 1);
-
- ctx -> real_type = oberon_new_type_real(4);
- oberon_define_type(ctx -> world_scope, "REAL", ctx -> real_type, 1);
-
- ctx -> longreal_type = oberon_new_type_real(8);
- oberon_define_type(ctx -> world_scope, "LONGREAL", ctx -> longreal_type, 1);
-
- ctx -> set_type = oberon_new_type_set(4);
- oberon_define_type(ctx -> world_scope, "SET", ctx -> set_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, 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)
{
@@ -3938,7 +3773,7 @@ oberon_make_min_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_expr_t * arg;
arg = list_args;
- if(!arg -> is_item || arg -> item.mode != MODE_TYPE)
+ if(!oberon_is_type_expr(arg))
{
oberon_error(ctx, "MIN accept only type");
}
@@ -3948,10 +3783,19 @@ oberon_make_min_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
switch(arg -> result -> class)
{
case OBERON_TYPE_INTEGER:
- expr = oberon_integer_item(ctx, -powl(2, bits - 1));
+ expr = oberon_make_integer(ctx, -powl(2, bits - 1));
+ break;
+ case OBERON_TYPE_BOOLEAN:
+ expr = oberon_make_boolean(ctx, false);
+ break;
+ case OBERON_TYPE_CHAR:
+ expr = oberon_make_char(ctx, 0);
+ break;
+ case OBERON_TYPE_REAL:
+ expr = oberon_make_real_typed(ctx, (bits <= 32) ? (-FLT_MAX) : (-DBL_MAX), arg -> result);
break;
case OBERON_TYPE_SET:
- expr = oberon_integer_item(ctx, 0);
+ expr = oberon_make_integer(ctx, 0);
break;
default:
oberon_error(ctx, "allowed only basic types");
@@ -3977,7 +3821,7 @@ oberon_make_max_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
oberon_expr_t * arg;
arg = list_args;
- if(!arg -> is_item || arg -> item.mode != MODE_TYPE)
+ if(!oberon_is_type_expr(arg))
{
oberon_error(ctx, "MAX accept only type");
}
@@ -3987,10 +3831,19 @@ oberon_make_max_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
switch(arg -> result -> class)
{
case OBERON_TYPE_INTEGER:
- expr = oberon_integer_item(ctx, powl(2, bits - 1) - 1);
+ expr = oberon_make_integer(ctx, powl(2, bits - 1) - 1);
+ break;
+ case OBERON_TYPE_BOOLEAN:
+ expr = oberon_make_boolean(ctx, true);
+ break;
+ case OBERON_TYPE_CHAR:
+ expr = oberon_make_char(ctx, powl(2, bits) - 1);
+ break;
+ case OBERON_TYPE_REAL:
+ expr = oberon_make_real_typed(ctx, (bits <= 32) ? (FLT_MAX) : (DBL_MAX), arg -> result);
break;
case OBERON_TYPE_SET:
- expr = oberon_integer_item(ctx, bits);
+ expr = oberon_make_integer(ctx, bits);
break;
default:
oberon_error(ctx, "allowed only basic types");
@@ -4015,8 +3868,7 @@ oberon_make_size_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list
oberon_expr_t * arg;
arg = list_args;
-
- if(!arg -> is_item || arg -> item.mode != MODE_TYPE)
+ if(!oberon_is_type_expr(arg))
{
oberon_error(ctx, "SIZE accept only type");
}
@@ -4038,7 +3890,7 @@ oberon_make_size_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list
break;
}
- expr = oberon_integer_item(ctx, size);
+ expr = oberon_make_integer(ctx, size);
return expr;
}
@@ -4059,53 +3911,222 @@ oberon_make_abs_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_
arg = list_args;
oberon_check_src(ctx, arg);
- oberon_type_t * result_type;
- result_type = arg -> result;
-
- if(result_type -> class != OBERON_TYPE_INTEGER)
+ if(!oberon_is_number_type(arg -> result))
{
- oberon_error(ctx, "ABS accepts only integers");
+ oberon_error(ctx, "ABS accepts only numbers");
}
oberon_expr_t * expr;
- expr = oberon_new_operator(OP_ABS, result_type, arg, NULL);
+ if(oberon_is_const(arg))
+ {
+ if(oberon_is_real_type(arg -> result))
+ {
+ double x = arg -> item.real;
+ expr = oberon_make_real(ctx, fabsl(x), arg -> result);
+ }
+ else
+ {
+ int64_t x = arg -> item.integer;
+ expr = oberon_make_integer(ctx, llabs(x));
+ }
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_ABS, arg -> result, arg, NULL);
+ }
return expr;
}
static void
-oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+oberon_make_inc_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
{
if(num_args < 1)
{
oberon_error(ctx, "too few arguments");
}
+ if(num_args > 2)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
oberon_expr_t * dst;
dst = list_args;
oberon_check_dst(ctx, dst);
- oberon_type_t * type;
- type = dst -> result;
-
- if(type -> class != OBERON_TYPE_POINTER)
+ if(!oberon_is_integer_type(dst -> result))
{
- oberon_error(ctx, "not a pointer");
+ oberon_error(ctx, "expect integer");
}
- type = type -> base;
-
- oberon_expr_t * src;
- src = oberon_new_item(MODE_NEW, dst -> result, 0);
- src -> item.num_args = 0;
- src -> item.args = NULL;
-
- int max_args = 1;
- if(type -> class == OBERON_TYPE_ARRAY)
+ oberon_expr_t * step;
+ if(num_args == 2)
{
- if(type -> size == 0)
+ step = list_args -> next;
+ oberon_check_src(ctx, step);
+ if(!oberon_is_integer_type(step -> result))
{
- oberon_type_t * x = type;
- while(x -> class == OBERON_TYPE_ARRAY)
+ oberon_error(ctx, "expect integer");
+ }
+ }
+ else
+ {
+ step = oberon_make_integer(ctx, 1);
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_make_bin_op(ctx, PLUS, dst, step);
+ oberon_assign(ctx, expr, dst);
+}
+
+static void
+oberon_make_incl_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 * dst;
+ dst = list_args;
+ oberon_check_dst(ctx, dst);
+
+ if(!oberon_is_set_type(dst -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+
+ oberon_expr_t * x;
+ x = list_args -> next;
+ oberon_check_src(ctx, x);
+
+ if(!oberon_is_integer_type(x -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_make_bin_op(ctx, PLUS, dst, oberon_new_operator(OP_RANGE, dst -> result, x, NULL));
+ oberon_assign(ctx, expr, dst);
+}
+
+static void
+oberon_make_excl_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 * dst;
+ dst = list_args;
+ oberon_check_dst(ctx, dst);
+
+ if(!oberon_is_set_type(dst -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+
+ oberon_expr_t * x;
+ x = list_args -> next;
+ oberon_check_src(ctx, x);
+
+ if(!oberon_is_integer_type(x -> result))
+ {
+ oberon_error(ctx, "expect integer");
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_make_bin_op(ctx, MINUS, dst, oberon_new_operator(OP_RANGE, dst -> result, x, NULL));
+ oberon_assign(ctx, expr, dst);
+}
+
+static void
+oberon_make_dec_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 1)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 2)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * dst;
+ dst = list_args;
+ oberon_check_dst(ctx, dst);
+
+ if(!oberon_is_integer_type(dst -> result))
+ {
+ 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, step);
+ oberon_assign(ctx, expr, dst);
+}
+
+static void
+oberon_make_new_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
+{
+ if(num_args < 1)
+ {
+ 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;
+
+ if(type -> class != OBERON_TYPE_POINTER)
+ {
+ oberon_error(ctx, "not a pointer");
+ }
+
+ type = type -> base;
+
+ oberon_expr_t * src;
+ src = oberon_new_item(MODE_NEW, dst -> result, 0);
+ src -> item.num_args = 0;
+ src -> item.args = NULL;
+
+ int max_args = 1;
+ if(type -> class == OBERON_TYPE_ARRAY)
+ {
+ if(type -> size == 0)
+ {
+ oberon_type_t * x = type;
+ while(x -> class == OBERON_TYPE_ARRAY)
{
if(x -> size == 0)
{
@@ -4176,12 +4197,12 @@ oberon_make_copy_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list
dst = list_args -> next;
oberon_check_dst(ctx, dst);
- if(!oberon_is_string_type(src -> result))
+ if(!oberon_is_string_type(src -> result) && !oberon_is_array_of_char_type(src -> result))
{
oberon_error(ctx, "source must be string or array of char");
}
- if(!oberon_is_string_type(dst -> result))
+ if(!oberon_is_array_of_char_type(dst -> result))
{
oberon_error(ctx, "dst must be array of char");
}
@@ -4206,7 +4227,7 @@ oberon_make_assert_call(oberon_context_t * ctx, int num_args, oberon_expr_t * li
cond = list_args;
oberon_check_src(ctx, cond);
- if(cond -> result -> class != OBERON_TYPE_BOOLEAN)
+ if(!oberon_is_boolean_type(cond -> result))
{
oberon_error(ctx, "expected boolean");
}
@@ -4221,7 +4242,7 @@ oberon_make_assert_call(oberon_context_t * ctx, int num_args, oberon_expr_t * li
num = list_args -> next;
oberon_check_src(ctx, num);
- if(num -> result -> class != OBERON_TYPE_INTEGER)
+ if(!oberon_is_integer_type(num -> result))
{
oberon_error(ctx, "expected integer");
}
@@ -4259,45 +4280,721 @@ oberon_make_halt_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list
oberon_generate_halt(ctx, num -> item.integer);
}
-static void
-oberon_new_const(oberon_context_t * ctx, char * name, oberon_expr_t * expr)
+static oberon_expr_t *
+oberon_make_ash_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
{
- oberon_object_t * constant;
- constant = oberon_define_object(ctx -> decl, name, OBERON_CLASS_CONST, true, false, false);
- oberon_check_const(ctx, expr);
- constant -> value = (oberon_item_t *) expr;
+ 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);
+ if(arg1 -> result -> class != OBERON_TYPE_INTEGER)
+ {
+ oberon_error(ctx, "expected integer");
+ }
+
+ 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))
+ {
+ int64_t x = arg1 -> item.integer;
+ int64_t y = arg2 -> item.integer;
+ int64_t v = (y > 0) ? (x << y) : (x >> labs(y));
+ expr = oberon_make_integer(ctx, v);
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_ASH, arg1 -> result, arg1, arg2);
+ }
+
+ return expr;
}
-oberon_context_t *
-oberon_create_context(ModuleImportCallback import_module)
+static oberon_expr_t *
+oberon_make_lsh_call(oberon_context_t * ctx, int num_args, oberon_expr_t * list_args)
{
- oberon_context_t * ctx = calloc(1, sizeof *ctx);
+ if(num_args < 2)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
- oberon_scope_t * world_scope;
- world_scope = oberon_open_scope(ctx);
- ctx -> world_scope = world_scope;
+ if(num_args > 2)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
- ctx -> import_module = import_module;
+ oberon_expr_t * arg1;
+ arg1 = list_args;
+ oberon_check_src(ctx, arg1);
- oberon_generator_init_context(ctx);
+ 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");
+ }
- register_default_types(ctx);
+ 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");
+ }
- /* Constants */
- oberon_new_const(ctx, "TRUE", oberon_make_boolean(ctx, true));
- oberon_new_const(ctx, "FALSE", oberon_make_boolean(ctx, false));
+ 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));
- /* 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);
+ 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);
+ }
- /* Procedures */
- oberon_new_intrinsic(ctx, "NEW", NULL, oberon_make_new_call);
- oberon_new_intrinsic(ctx, "COPY", NULL, oberon_make_copy_call);
- oberon_new_intrinsic(ctx, "ASSERT", NULL, oberon_make_assert_call);
- oberon_new_intrinsic(ctx, "HALT", NULL, oberon_make_halt_call);
+ return 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)
+{
+ 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);
+
+ if(!oberon_is_char_type(arg -> result))
+ {
+ oberon_error(ctx, "expected char");
+ }
+
+ oberon_expr_t * expr;
+ if(oberon_is_const(arg))
+ {
+ expr = oberon_make_char(ctx, toupper(arg -> item.integer));
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_CAP, arg -> result, arg, NULL);
+ }
+
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_chr_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);
+
+ if(!oberon_is_integer_type(arg -> result))
+ {
+ oberon_error(ctx, "expected integer");
+ }
+
+ oberon_expr_t * expr;
+ if(oberon_is_const(arg))
+ {
+ expr = oberon_make_char(ctx, arg -> item.integer);
+ }
+ else
+ {
+ expr = oberon_cast_expr(ctx, arg, ctx -> char_type);
+ }
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_ord_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);
+
+ if(!oberon_is_char_type(arg -> result) && !oberon_is_string_of_one(arg))
+ {
+ oberon_error(ctx, "expected char");
+ }
+
+ oberon_expr_t * expr;
+ if(oberon_is_const(arg))
+ {
+ expr = oberon_make_integer(ctx, arg -> item.integer);
+ }
+ else
+ {
+ expr = oberon_cast_expr(ctx, arg, ctx -> shortint_type);
+ }
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_entier_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);
+
+ if(!oberon_is_real_type(arg -> result))
+ {
+ oberon_error(ctx, "expected real");
+ }
+
+ oberon_expr_t * expr;
+ if(oberon_is_const(arg))
+ {
+ expr = oberon_make_integer(ctx, floor(arg -> item.real));
+ }
+ else
+ {
+ expr = oberon_new_operator(OP_ENTIER, ctx -> int_type, arg, NULL);
+ }
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_odd_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);
+
+ if(!oberon_is_integer_type(arg -> result))
+ {
+ oberon_error(ctx, "expected integer");
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_make_bin_op(ctx, MOD, arg, oberon_make_integer(ctx, 2));
+ expr = oberon_make_bin_op(ctx, EQUAL, expr, oberon_make_integer(ctx, 1));
+ 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)
+{
+ 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);
+
+ if(arg -> result -> shorter == NULL)
+ {
+ oberon_error(ctx, "already shorter");
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_cast_expr(ctx, arg, arg -> result -> shorter);
+ return expr;
+}
+
+static oberon_expr_t *
+oberon_make_long_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);
+
+ if(arg -> result -> longer == NULL)
+ {
+ oberon_error(ctx, "already longer");
+ }
+
+ oberon_expr_t * expr;
+ expr = oberon_cast_expr(ctx, arg, arg -> result -> longer);
+ 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)
+{
+ if(num_args < 1)
+ {
+ oberon_error(ctx, "too few arguments");
+ }
+
+ if(num_args > 2)
+ {
+ oberon_error(ctx, "too mach arguments");
+ }
+
+ oberon_expr_t * v;
+ v = list_args;
+ oberon_check_src(ctx, v);
+
+ if(!oberon_is_array_type(v -> result))
+ {
+ oberon_error(ctx, "expected array");
+ }
+
+ int n = 0;
+ if(num_args == 2)
+ {
+ oberon_expr_t * num;
+ num = list_args -> next;
+ oberon_check_src(ctx, num);
+
+ if(!oberon_is_integer_type(num -> result))
+ {
+ oberon_error(ctx, "expected integer");
+ }
+ oberon_check_const(ctx, num);
+
+ n = num -> item.integer;
+ }
+
+ int dim = 0;
+ oberon_type_t * arr = v -> result;
+ while(arr -> class == OBERON_TYPE_ARRAY)
+ {
+ dim += 1;
+ arr = arr -> base;
+ }
+
+ if(n < 0 || n > dim)
+ {
+ oberon_error(ctx, "not in range 0..%i", dim - 1);
+ }
+
+ assert(v -> is_item);
+
+ oberon_expr_t * expr;
+ expr = oberon_new_item(MODE_LEN, ctx -> int_type, true);
+ expr -> item.parent = (oberon_item_t *) v;
+ expr -> item.integer = n;
+ return expr;
+}
+
+static void
+oberon_new_const(oberon_context_t * ctx, char * name, oberon_expr_t * expr)
+{
+ oberon_object_t * constant;
+ constant = oberon_define_object(ctx -> decl, name, OBERON_CLASS_CONST, true, false, false);
+ oberon_check_const(ctx, expr);
+ constant -> value = (oberon_item_t *) expr;
+}
+
+static void
+register_default_types(oberon_context_t * ctx)
+{
+ ctx -> notype_type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
+ oberon_generator_init_type(ctx, ctx -> notype_type);
+
+ ctx -> nil_type = oberon_new_type_ptr(OBERON_TYPE_NIL);
+ oberon_generator_init_type(ctx, ctx -> nil_type);
+
+ ctx -> string_type = oberon_new_type_string(1);
+ oberon_generator_init_type(ctx, ctx -> string_type);
+
+ ctx -> bool_type = oberon_new_type_boolean();
+ oberon_generator_init_type(ctx, ctx -> bool_type);
+
+ ctx -> char_type = oberon_new_type_char(1);
+ oberon_generator_init_type(ctx, ctx -> char_type);
+
+ ctx -> byte_type = oberon_new_type_integer(1);
+ oberon_generator_init_type(ctx, ctx -> byte_type);
+
+ ctx -> shortint_type = oberon_new_type_integer(2);
+ oberon_generator_init_type(ctx, ctx -> shortint_type);
+
+ ctx -> int_type = oberon_new_type_integer(4);
+ oberon_generator_init_type(ctx, ctx -> int_type);
+
+ ctx -> longint_type = oberon_new_type_integer(8);
+ oberon_generator_init_type(ctx, ctx -> longint_type);
+
+ ctx -> real_type = oberon_new_type_real(4);
+ oberon_generator_init_type(ctx, ctx -> real_type);
+
+ ctx -> longreal_type = oberon_new_type_real(8);
+ oberon_generator_init_type(ctx, ctx -> longreal_type);
+
+ ctx -> set_type = oberon_new_type_set(4);
+ 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;
+
+ ctx -> shortint_type -> shorter = ctx -> byte_type;
+ ctx -> shortint_type -> longer = ctx -> int_type;
+
+ ctx -> int_type -> shorter = ctx -> shortint_type;
+ ctx -> int_type -> longer = ctx -> longint_type;
+
+ ctx -> longint_type -> shorter = ctx -> int_type;
+ ctx -> longint_type -> longer = NULL;
+
+ ctx -> real_type -> shorter = NULL;
+ ctx -> real_type -> longer = ctx -> longreal_type;
+
+ ctx -> longreal_type -> shorter = ctx -> real_type;
+ ctx -> longreal_type -> longer = NULL;
+}
+
+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, 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 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 = GC_MALLOC(sizeof *ctx);
+ memset(ctx, 0, sizeof *ctx);
+
+ oberon_scope_t * world_scope;
+ world_scope = oberon_open_scope(ctx);
+ ctx -> world_scope = world_scope;
+
+ ctx -> import_module = import_module;
+
+ 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, "CAP", oberon_make_cap_call, NULL);
+ oberon_new_intrinsic(ctx, "CHR", oberon_make_chr_call, NULL);
+ oberon_new_intrinsic(ctx, "ENTIER", oberon_make_entier_call, NULL);
+ oberon_new_intrinsic(ctx, "LEN", oberon_make_len_call, NULL);
+ oberon_new_intrinsic(ctx, "LONG", oberon_make_long_call, NULL);
+ oberon_new_intrinsic(ctx, "MAX", oberon_make_max_call, NULL);
+ oberon_new_intrinsic(ctx, "MIN", oberon_make_min_call, NULL);
+ oberon_new_intrinsic(ctx, "ODD", oberon_make_odd_call, NULL);
+ oberon_new_intrinsic(ctx, "ORD", oberon_make_ord_call, NULL);
+ oberon_new_intrinsic(ctx, "SHORT", oberon_make_short_call, NULL);
+ oberon_new_intrinsic(ctx, "SIZE", oberon_make_size_call, NULL);
+
+ /* Procedures */
+ oberon_new_intrinsic(ctx, "ASSERT", NULL, oberon_make_assert_call);
+ oberon_new_intrinsic(ctx, "COPY", NULL, oberon_make_copy_call);
+ oberon_new_intrinsic(ctx, "DEC", NULL, oberon_make_dec_call);
+ oberon_new_intrinsic(ctx, "EXCL", NULL, oberon_make_excl_call);
+ oberon_new_intrinsic(ctx, "HALT", NULL, oberon_make_halt_call);
+ oberon_new_intrinsic(ctx, "INC", NULL, oberon_make_inc_call);
+ 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;