First cut at sanitizing away the chill stuff.

1 files changed, 22 insertions, 6 deletions

diff --git a/gdb/language.c b/gdb/language.c
index 0fb0796..afe0832 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -161,12 +161,14 @@ set_language_command (ignore, from_tty)
 
   /* FIXME -- do this from the list, with HELP.  */
   if (!language || !language[0]) {
-    printf("The currently understood settings are:\n\n\
-local or auto    Automatic setting based on source file\n\
-c                Use the C language\n\
-c++              Use the C++ language\n\
-chill            Use the Chill language\n\
-modula-2         Use the Modula-2 language\n");
+    printf("The currently understood settings are:\n\n");
+    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);
     return;
@@ -458,8 +460,10 @@ binop_result_type(v1,v2)
 	 not needed. */
       return l1 > l2 ? VALUE_TYPE(v1) : VALUE_TYPE(v2);
       break;
+    /* start-sanitize-chill */
     case language_chill:
       error ("Missing Chill support in function binop_result_check.");/*FIXME*/
+    /* end-sanitize-chill */
    }
    abort();
    return (struct type *)0;	/* For lint */
@@ -608,8 +612,10 @@ integral_type (type)
 	 (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.");
    }
@@ -645,8 +651,10 @@ character_type (type)
       return (TYPE_CODE(type) == TYPE_CODE_INT) &&
 	 TYPE_LENGTH(type) == sizeof(char)
 	 ? 1 : 0;
+    /* start-sanitize-chill */
    case language_chill:
       error ("Missing Chill support in function character_type.");  /*FIXME*/
+    /* end-sanitize-chill */
    default:
       return (0);
    }
@@ -659,7 +667,9 @@ 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;
 
@@ -704,8 +714,10 @@ structured_type(type)
       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);
    }
@@ -750,8 +762,10 @@ value_true(val)
       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.");
@@ -914,10 +928,12 @@ binop_type_check(arg1,arg2,op)
 	 }
 #endif
 
+/* start-sanitize-chill */
 #ifdef _LANG_chill
        case language_chill:
 	 error ("Missing Chill support in function binop_type_check.");/*FIXME*/
 #endif
+/* end-sanitize-chill */
 
       }
    }