diff --git a/src/oberon.c b/src/oberon.c
index 29c40cb974b5a822bb89c18cfe567a2d464aa966..ebcaa990f9640d227f34c139844e63b26e5defee 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
#include <gc.h>
-#include "../include/oberon.h"
-
#include "oberon-internals.h"
#include "oberon-type-compat.h"
#include "oberon-common.h"
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];
}
{
while(isspace(ctx -> c))
{
- oberon_get_char(ctx);
+ if(ctx -> c == 0xD)
+ {
+ oberon_get_char(ctx);
+ if(ctx -> c == 0xA)
+ {
+ oberon_get_char(ctx);
+ }
+ ctx -> xloc.line += 1;
+ ctx -> xloc.col = 1;
+ }
+ else if(ctx -> c == 0xA)
+ {
+ oberon_get_char(ctx);
+ ctx -> xloc.line += 1;
+ ctx -> xloc.col = 1;
+ }
+ else
+ {
+ oberon_get_char(ctx);
+ }
}
}
{
oberon_skip_space(ctx);
+ ctx -> loc = ctx -> xloc;
+
int c = ctx -> c;
if(isalpha(c) || c == '_')
{
int num_args = desig -> num_args;
int num_decl = fn -> num_decl;
+ printf("oberon_autocast_call: num_args %i num_decl %i\n", num_args, num_decl);
+
if(num_args < num_decl)
{
oberon_error(ctx, "too few arguments");
@@ -1259,6 +1285,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))
@@ -2758,7 +2785,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
@@ -2911,20 +2945,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;
}
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);
}
}
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;
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;