X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Foberon.c;h=e684e655df644a277dbc65955983efcc62d08b27;hp=29c40cb974b5a822bb89c18cfe567a2d464aa966;hb=4e58c0e61815196bcf87405ab9d070631bc72f90;hpb=0f382f6efef254a295e71dc82ddd0f87b95aaddd

diff --git a/src/oberon.c b/src/oberon.c
index 29c40cb..e684e65 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -10,8 +10,6 @@
 
 #include <gc.h>
 
-#include "../include/oberon.h"
-
 #include "oberon-internals.h"
 #include "oberon-type-compat.h"
 #include "oberon-common.h"
@@ -362,15 +360,20 @@ oberon_get_char(oberon_context_t * ctx)
 	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];
 }
 
@@ -694,7 +697,26 @@ oberon_skip_space(oberon_context_t * ctx)
 {
 	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);
+		}
 	}
 }
 
@@ -910,6 +932,8 @@ oberon_read_token(oberon_context_t * ctx)
 {
 	oberon_skip_space(ctx);
 
+	ctx -> loc = ctx -> xloc;
+
 	int c = ctx -> c;
 	if(isalpha(c) || c == '_')
 	{
@@ -3567,14 +3591,14 @@ oberon_import_module(oberon_context_t * ctx, char * alias, char * name)
 
 	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);
 	}
 
@@ -4878,10 +4902,12 @@ oberon_destroy_context(oberon_context_t * 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;
@@ -4903,13 +4929,15 @@ oberon_compile_module(oberon_context_t * ctx, const char * newcode)
 	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;