diff --git a/src/oberon.c b/src/oberon.c
index 6cc5d1d193787867c68e74c0aec302d40a6022e0..f2310db26de0ab2b1bffb82efee2a4b346bf7052 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
NIL,
IMPORT,
REAL,
- CHAR
+ CHAR,
+ STRING
};
// =======================================================================
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
// =======================================================================
}
}
+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;
@@ -903,11 +949,29 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
// Допускается:
// Если классы типов равны
// Если INTEGER переводится в REAL
+ // Есди STRING переводится в ARRAY OF CHAR
bool error = false;
if(pref -> class != expr -> result -> class)
{
- if(expr -> result -> class == OBERON_TYPE_INTEGER)
+ 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(pref -> class != OBERON_TYPE_REAL)
{
@@ -922,7 +986,7 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
if(error)
{
- oberon_error(ctx, "incompatible types");
+ oberon_error(ctx, "oberon_autocast_to: incompatible types");
}
if(pref -> class == OBERON_TYPE_INTEGER || pref -> class == OBERON_TYPE_REAL)
@@ -939,6 +1003,7 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
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)
{
@@ -1154,6 +1219,7 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_object_t * proc, int num_ar
|| ((x) == INTEGER) \
|| ((x) == REAL) \
|| ((x) == CHAR) \
+ || ((x) == STRING) \
|| ((x) == NIL) \
|| ((x) == LPAREN) \
|| ((x) == NOT) \
break;
case INTEGER:
result = oberon_get_type_of_int_value(ctx, ctx -> integer);
- expr = oberon_new_item(MODE_INTEGER, result, 1);
+ expr = oberon_new_item(MODE_INTEGER, result, true);
expr -> item.integer = ctx -> integer;
oberon_assert_token(ctx, INTEGER);
break;
case CHAR:
result = ctx -> char_type;
- expr = oberon_new_item(MODE_CHAR, result, 1);
+ 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:
result = (ctx -> longmode) ? (ctx -> longreal_type) : (ctx -> real_type);
expr = oberon_new_item(MODE_REAL, result, 1);
oberon_assert_token(ctx, REAL);
break;
case TRUE:
- expr = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, 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 = oberon_new_item(MODE_BOOLEAN, ctx -> bool_type, true);
expr -> item.boolean = false;
oberon_assert_token(ctx, FALSE);
break;
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");
ctx -> void_ptr_type -> base = ctx -> void_type;
oberon_generator_init_type(ctx, ctx -> void_ptr_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);