simplified options.c

lang/cem/cemcom.ansi/Makefile

@@ -509,10 +509,10 @@ code.o: debug.h
 code.o: declar.h
 code.o: decspecs.h
 code.o: def.h
-code.o: l_em.h
 code.o: expr.h
 code.o: file_info.h
 code.o: idf.h
+code.o: l_em.h
 code.o: l_lint.h
 code.o: label.h
 code.o: level.h
@@ -551,10 +551,10 @@ error.o: LLlex.h
 error.o: arith.h
 error.o: debug.h
 error.o: def.h
-error.o: l_em.h
 error.o: errout.h
 error.o: expr.h
 error.o: file_info.h
+error.o: l_em.h
 error.o: label.h
 error.o: lint.h
 error.o: nopp.h
@@ -693,8 +693,8 @@ stack.o: botch_free.h
 stack.o: dbsymtab.h
 stack.o: debug.h
 stack.o: def.h
-stack.o: l_em.h
 stack.o: idf.h
+stack.o: l_em.h
 stack.o: level.h
 stack.o: lint.h
 stack.o: mes.h
@@ -784,9 +784,9 @@ switch.o: code.h
 switch.o: dbsymtab.h
 switch.o: debug.h
 switch.o: density.h
-switch.o: l_em.h
 switch.o: expr.h
 switch.o: idf.h
+switch.o: l_em.h
 switch.o: label.h
 switch.o: lint.h
 switch.o: nobitfield.h
@@ -1033,10 +1033,10 @@ statement.o: code.h
 statement.o: dbsymtab.h
 statement.o: debug.h
 statement.o: def.h
-statement.o: l_em.h
 statement.o: expr.h
 statement.o: file_info.h
 statement.o: idf.h
+statement.o: l_em.h
 statement.o: l_lint.h
 statement.o: label.h
 statement.o: lint.h
@@ -1090,12 +1090,12 @@ ival.o: assert.h
 ival.o: dbsymtab.h
 ival.o: debug.h
 ival.o: def.h
-ival.o: l_em.h
 ival.o: estack.h
 ival.o: expr.h
 ival.o: field.h
 ival.o: file_info.h
 ival.o: idf.h
+ival.o: l_em.h
 ival.o: l_lint.h
 ival.o: label.h
 ival.o: level.h

lang/cem/cemcom.ansi/options.c

@@ -114,20 +114,8 @@ next_option:			/* to allow combined one-char options */
 		goto next_option;
 #endif	LINT
 
-#ifdef	___XXX___
-deleted, is now a debug-flag
-	case 'C' :	/* E option + comment output		*/
-#ifndef	NOPP
-		options['E'] = 1;
-		warning("-C: comment is not output");
-#else NOPP
-		warning("-C option ignored");
-#endif	NOPP
-		break;
-#endif	___XXX___
-
-	case 'D' :	{	/* -Dname :	predefine name		*/
 #ifndef NOPP
+	case 'D' :	{	/* -Dname :	predefine name		*/
 		register char *cp = text, *name, *mactext;
 		unsigned maclen;
 
@@ -158,25 +146,10 @@ deleted, is now a debug-flag
 		}
 
 		macro_def(str2idf(name), mactext, -1, (int)maclen, NOFLAG);
-#else NOPP
-		warning("-D option ignored");
-#endif NOPP
 		break;
 	}
 
-#ifdef ___XXX___
-deleted, is now a debug-flag
-	case 'E' :	/* run preprocessor only, with #<int>	*/
-#ifndef NOPP
-		options['E'] = 1;
-#else NOPP
-		warning("-E option ignored");
-#endif NOPP
-		break;
-#endif ___XXX___
-
 	case 'I' :	/* -Ipath : insert "path" into include list	*/
-#ifndef NOPP
 		if (*text)	{
 			int i;
 			register char *new = text;
@@ -195,10 +168,8 @@ deleted, is now a debug-flag
 			}
 		}
 		else inctable[inc_pos] = 0;
-#else NOPP
-		warning("-I option ignored");
-#endif NOPP
 		break;
+#endif NOPP
 
 	case 'M':	/* maximum identifier length */
 		idfsize = txt2int(&text);
@@ -208,18 +179,6 @@ deleted, is now a debug-flag
 			fatal("maximum identifier length is %d", IDFSIZE);
 		break;
 
-#ifdef ___XXX___
-deleted, is now a debug-flag
-	case 'P' :	/* run preprocessor stand-alone, without #'s	*/
-#ifndef NOPP
-		options['E'] = 1;
-		options['P'] = 1;
-#else NOPP
-		warning("-P option ignored");
-#endif NOPP
-		break;
-#endif ___XXX___
-
 #ifdef	LINT
 	case 'S' : {		/* -Sint :	static scope number for lint */
 		extern int stat_number;
@@ -241,21 +200,15 @@ deleted, is now a debug-flag
 		break;
 	}
 		
-	case 'U' :	{	/* -Uname :	undefine predefined	*/
 #ifndef NOPP
+	case 'U' :		/* -Uname :	undefine predefined	*/
 		if (*text) do_undef(str2idf(text));
-#else NOPP
-		warning("-U option ignored");
-#endif NOPP
 		break;
-	}
+#endif NOPP
 
 #ifndef	LINT
+#ifndef NOCROSS
 	case 'V' :	/* set object sizes and alignment requirements	*/
-#ifdef NOCROSS
-		warning("-V option ignored");
-		break;
-#else NOCROSS
 	{
 		register arith sz, algn;
 		char c;