X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon.c;h=1d9e670e82fcc1c2e197b7bcbeea9b91cc935782;hb=8212ec191c6700e5f0ceb7600b6d30441ca2bc88;hp=58823246bde98fb0e9ebedd171d7fe24e85659c4;hpb=8db9b6a5f0d565ae2994cefeb081712ce917f67f;p=dsw-obn.git

diff --git a/src/oberon.c b/src/oberon.c
index 5882324..1d9e670 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -2631,9 +2631,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)
 	{
@@ -2674,11 +2673,11 @@ oberon_type_record_body(oberon_context_t * ctx, oberon_type_t * rec)
 	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;
@@ -3142,33 +3141,34 @@ oberon_prevent_undeclarated_procedures(oberon_context_t * ctx)
 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);
+			}
 		}
 	}
 
@@ -4958,7 +4958,10 @@ oberon_create_context(ModuleImportCallback import_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 */