printf ("local or auto Automatic setting based on source file\n");
printf ("c Use the C language\n");
printf ("c++ Use the C++ language\n");
- /* start-sanitize-chill */
printf ("chill Use the Chill language\n");
- /* end-sanitize-chill */
printf ("modula-2 Use the Modula-2 language\n");
/* Restore the silly string. */
set_language(current_language->la_language);
/* Search the list of languages for a match. */
for (i = 0; i < languages_size; i++) {
- if (!strcmp (languages[i]->la_name, language)) {
+ if (STREQ (languages[i]->la_name, language)) {
/* Found it! Go into manual mode, and use this language. */
if (languages[i]->la_language == language_auto) {
/* Enter auto mode. Set to the current frame's language, if known. */
char *ignore;
int from_tty;
{
- if (!strcmp(type,"on"))
+ if (STREQ(type,"on"))
{
type_check = type_check_on;
type_mode = type_mode_manual;
}
- else if (!strcmp(type,"warn"))
+ else if (STREQ(type,"warn"))
{
type_check = type_check_warn;
type_mode = type_mode_manual;
}
- else if (!strcmp(type,"off"))
+ else if (STREQ(type,"off"))
{
type_check = type_check_off;
type_mode = type_mode_manual;
}
- else if (!strcmp(type,"auto"))
+ else if (STREQ(type,"auto"))
{
type_mode = type_mode_auto;
set_type_range();
char *ignore;
int from_tty;
{
- if (!strcmp(range,"on"))
+ if (STREQ(range,"on"))
{
range_check = range_check_on;
range_mode = range_mode_manual;
}
- else if (!strcmp(range,"warn"))
+ else if (STREQ(range,"warn"))
{
range_check = range_check_warn;
range_mode = range_mode_manual;
}
- else if (!strcmp(range,"off"))
+ else if (STREQ(range,"off"))
{
range_check = range_check_off;
range_mode = range_mode_manual;
}
- else if (!strcmp(range,"auto"))
+ else if (STREQ(range,"auto"))
{
range_mode = range_mode_auto;
set_type_range();
not needed. */
return l1 > l2 ? VALUE_TYPE(v1) : VALUE_TYPE(v2);
break;
- /* start-sanitize-chill */
- case language_chill:
+ case language_chill:
error ("Missing Chill support in function binop_result_check.");/*FIXME*/
- /* end-sanitize-chill */
}
abort();
return (struct type *)0; /* For lint */
string. Returns a pointer to this string. */
char *
local_hex_string (num)
- int num;
+ unsigned long num;
{
static char res[50];
string. Returns a pointer to this string. */
char *
local_hex_string_custom(num,pre)
- int num;
+ unsigned long num;
char *pre;
{
static char res[50];
strcat (form, local_octal_format_suffix ());
return form;
}
+
+/* Returns the appropriate printf format for decimal numbers. */
+char *
+local_decimal_format_custom(pre)
+ char *pre;
+{
+ static char form[50];
+
+ strcpy (form, local_decimal_format_prefix ());
+ strcat (form, "%");
+ strcat (form, pre);
+ strcat (form, local_decimal_format_specifier ());
+ strcat (form, local_decimal_format_suffix ());
+ return form;
+}
\f
/* This page contains functions that are used in type/range checking.
They all return zero if the type/range check fails.
(TYPE_CODE(type) != TYPE_CODE_ENUM) ? 0 : 1;
case language_m2:
return TYPE_CODE(type) != TYPE_CODE_INT ? 0 : 1;
- /* start-sanitize-chill */
case language_chill:
error ("Missing Chill support in function integral_type."); /*FIXME*/
- /* end-sanitize-chill */
default:
error ("Language not supported.");
}
{
switch(current_language->la_language)
{
- /* start-sanitize-chill */
case language_chill:
- /* end-sanitize-chill */
case language_m2:
return TYPE_CODE(type) != TYPE_CODE_CHAR ? 0 : 1;
}
}
+/* Returns non-zero if the value is a string type */
+int
+string_type (type)
+ struct type *type;
+{
+ switch(current_language->la_language)
+ {
+ case language_chill:
+ case language_m2:
+ return TYPE_CODE(type) != TYPE_CODE_STRING ? 0 : 1;
+
+ case language_c:
+ case language_cplus:
+ /* C does not have distinct string type. */
+ return (0);
+ default:
+ return (0);
+ }
+}
+
/* Returns non-zero if the value is a boolean type */
int
boolean_type (type)
{
switch(current_language->la_language)
{
- /* start-sanitize-chill */
case language_chill:
- /* end-sanitize-chill */
case language_m2:
return TYPE_CODE(type) != TYPE_CODE_BOOL ? 0 : 1;
return (TYPE_CODE(type) == TYPE_CODE_STRUCT) ||
(TYPE_CODE(type) == TYPE_CODE_SET) ||
(TYPE_CODE(type) == TYPE_CODE_ARRAY);
- /* start-sanitize-chill */
case language_chill:
error ("Missing Chill support in function structured_type."); /*FIXME*/
- /* end-sanitize-chill */
default:
return (0);
}
}
if (i >= len)
return 0; /* Not a valid BOOLEAN value */
- if (!strcmp ("TRUE", TYPE_FIELD_NAME(VALUE_TYPE(val), i)))
+ if (STREQ ("TRUE", TYPE_FIELD_NAME(VALUE_TYPE(val), i)))
return 1; /* BOOLEAN with value TRUE */
else
return 0; /* BOOLEAN with value FALSE */
break;
- /* start-sanitize-chill */
case language_chill:
error ("Missing Chill support in function value_type."); /*FIXME*/
- /* end-sanitize-chill */
default:
error ("Language not supported.");
break;
case BINOP_REM:
+ case BINOP_MOD:
if (!integral_type(t1) || !integral_type(t2))
type_op_error ("Arguments to %s must be of integral type.",op);
break;
type_op_error ("Arguments to %s must be of the same type.",op);
break;
+ case BINOP_CONCAT:
+ /* FIXME: Needs to handle bitstrings as well. */
+ if (!(string_type(t1) || character_type(t1) || integral_type(t1))
+ || !(string_type(t2) || character_type(t2) || integral_type(t2)))
+ type_op_error ("Arguments to %s must be strings or characters.", op);
+ break;
+
/* Unary checks -- arg2 is null */
case UNOP_LOGICAL_NOT:
}
#endif
-/* start-sanitize-chill */
#ifdef _LANG_chill
case language_chill:
error ("Missing Chill support in function binop_type_check.");/*FIXME*/
#endif
-/* end-sanitize-chill */
}
}
fprintf (stderr, "\n");
va_end (args);
if (type_check==type_check_on)
- return_to_top_level();
+ return_to_top_level (RETURN_ERROR);
}
void
fprintf (stderr, "\n");
va_end (args);
if (range_check==range_check_on)
- return_to_top_level();
+ return_to_top_level (RETURN_ERROR);
}
\f
static struct type ** const (unknown_builtin_types[]) = { 0 };
static const struct op_print unk_op_print_tab[] = {
- {NULL, 0, 0, 0}
+ {NULL, OP_NULL, PREC_NULL, 0}
};
const struct language_defn unknown_language_defn = {
&builtin_type_error, /* longest unsigned integral type */
&builtin_type_error, /* longest floating point type */
{"", "", "", ""}, /* Binary format info */
- {"0%o", "0", "o", ""}, /* Octal format info */
- {"%d", "", "d", ""}, /* Decimal format info */
- {"0x%x", "0x", "x", ""}, /* Hex format info */
+ {"0%lo", "0", "o", ""}, /* Octal format info */
+ {"%ld", "", "d", ""}, /* Decimal format info */
+ {"0x%lx", "0x", "x", ""}, /* Hex format info */
unk_op_print_tab, /* expression operators for printing */
LANG_MAGIC
};
&builtin_type_error, /* longest unsigned integral type */
&builtin_type_error, /* longest floating point type */
{"", "", "", ""}, /* Binary format info */
- {"0%o", "0", "o", ""}, /* Octal format info */
- {"%d", "", "d", ""}, /* Decimal format info */
- {"0x%x", "0x", "x", ""}, /* Hex format info */
+ {"0%lo", "0", "o", ""}, /* Octal format info */
+ {"%ld", "", "d", ""}, /* Decimal format info */
+ {"0x%lx", "0x", "x", ""}, /* Hex format info */
unk_op_print_tab, /* expression operators for printing */
LANG_MAGIC
};
&builtin_type_error, /* longest unsigned integral type */
&builtin_type_error, /* longest floating point type */
{"", "", "", ""}, /* Binary format info */
- {"0%o", "0", "o", ""}, /* Octal format info */
- {"%d", "", "d", ""}, /* Decimal format info */
- {"0x%x", "0x", "x", ""}, /* Hex format info */
+ {"0%lo", "0", "o", ""}, /* Octal format info */
+ {"%ld", "", "d", ""}, /* Decimal format info */
+ {"0x%lx", "0x", "x", ""}, /* Hex format info */
unk_op_print_tab, /* expression operators for printing */
LANG_MAGIC
};