X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=a0f17a5dff9473bf1ed162d4ca25d0888e46287d;hb=2151f7ff22ee388e6a57ff024d2558101907e7f7;hp=a529a0364ea6b3dc2f5466628f639d3c47d1bdec;hpb=f017f4f5080052f95185056b3af472ab737bc64a;p=cparser

diff --git a/main.c b/main.c
index a529a03..a0f17a5 100644
--- a/main.c
+++ b/main.c
@@ -1,3 +1,22 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #include <config.h>
 
 #define _GNU_SOURCE
@@ -86,7 +105,7 @@ bool strict_mode = false;
 /* to switch on printing of implicit casts */
 extern bool print_implicit_casts;
 
-/* to switch on printing of  srenthesis to indicate operator precedence */
+/* to switch on printing of parenthesis to indicate operator precedence */
 extern bool print_parenthesis;
 
 static int            verbose;
@@ -343,6 +362,7 @@ int main(int argc, char **argv)
 	const char     *dumpfunction = NULL;
 	compile_mode_t  mode         = CompileAssembleLink;
 	int             opt_level    = 1;
+	int             result = EXIT_SUCCESS;
 
 	obstack_init(&cppflags_obst);
 	obstack_init(&ldflags_obst);
@@ -396,7 +416,6 @@ int main(int argc, char **argv)
 		/* fallthrough */
 	case 2:
 		firm_option("inline");
-		firm_option("no-strength-red");
 		firm_option("deconv");
 		firm_be_option("omitfp");
 		break;
@@ -414,6 +433,8 @@ int main(int argc, char **argv)
 				GET_ARG_AFTER(outname, "-o");
 			} else if(option[0] == 'g') {
 				firm_be_option("stabs=yes");
+				firm_be_option("omitfp=no");
+				firm_be_option("ia32-nooptcc=yes");
 			} else if(SINGLE_OPTION('c')) {
 				mode = CompileAssemble;
 			} else if(SINGLE_OPTION('S')) {
@@ -536,7 +557,8 @@ int main(int argc, char **argv)
 				} else if(strcmp(option, "version") == 0) {
 					firm_version_t ver;
 					firm_get_version(&ver);
-					printf("cparser (%d.%d %s) using libFirm (%u.%u", 0, 1, cparser_REVISION, ver.major, ver.minor);
+					printf("cparser (%s) using libFirm (%u.%u",
+					       cparser_REVISION, ver.major, ver.minor);
 					if(ver.revision[0] != 0) {
 						putchar(' ');
 						fputs(ver.revision, stdout);
@@ -665,29 +687,35 @@ int main(int argc, char **argv)
 
 	FILE *preprocessed_in = preprocess(in, input);
 	translation_unit_t *const unit = do_parsing(preprocessed_in, input);
-	int result = pclose(preprocessed_in);
-	if(result != 0) {
-		return result;
+	int res = pclose(preprocessed_in);
+	if(res != 0) {
+		return res;
 	}
-	if(unit == NULL) {
+
+	if(error_count > 0) {
 		/* parsing failed because of errors */
 		fprintf(stderr, "%u error(s), %u warning(s)\n", error_count, warning_count);
-		return EXIT_FAILURE;
-	}
-	if (warning_count > 0) {
+		result = EXIT_FAILURE;
+	} else if(warning_count > 0) {
 		fprintf(stderr, "%u warning(s)\n", warning_count);
 	}
 
 	if(mode == BenchmarkParser) {
-		return 0;
+		return result;
 	}
 
+	/* prints the AST even if errors occurred */
 	if(mode == PrintAst) {
 		type_set_output(out);
 		ast_set_output(out);
 		print_ast(unit);
-		return 0;
+		return result;
 	}
+
+	/* cannot handle other modes with errors */
+	if(result != EXIT_SUCCESS)
+		return result;
+
 	if(mode == PrintFluffy) {
 		type_set_output(out);
 		ast_set_output(out);