[llvm-commits] CVS: llvm/tools/gccas/gccas.cpp

[Reid Spencer]

Changes in directory llvm/tools/gccas:

gccas.cpp updated: 1.117 -> 1.118
---
Log message:

For PR797: http://llvm.org/PR797 :
Rid the Assembly Parser of exceptions. This is a really gross hack but it
will do until the Assembly Parser is re-written as a recursive descent.
The basic premise is that wherever the old "ThrowException" function was
called (new name: GenerateError) we set a flag (TriggerError). Every
production checks that flag and calls YYERROR if it is set. Additionally,
each call to ThrowException in the grammar is replaced with GEN_ERROR 
which calls GenerateError and then YYERROR immediately. This prevents
the remaining production from continuing after an error condition.


---
Diffs of the changes:  (+3 -10)

 gccas.cpp |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)


Index: llvm/tools/gccas/gccas.cpp
diff -u llvm/tools/gccas/gccas.cpp:1.117 llvm/tools/gccas/gccas.cpp:1.118
--- llvm/tools/gccas/gccas.cpp:1.117	Mon Jul  3 11:46:03 2006
+++ llvm/tools/gccas/gccas.cpp	Fri Aug 18 03:43:06 2006
@@ -137,17 +137,10 @@
                                 " llvm .s -> .o assembler for GCC\n");
     sys::PrintStackTraceOnErrorSignal();
 
-    std::auto_ptr<Module> M;
-    try {
-      // Parse the file now...
-      M.reset(ParseAssemblyFile(InputFilename));
-    } catch (const ParseException &E) {
-      std::cerr << argv[0] << ": " << E.getMessage() << "\n";
-      return 1;
-    }
-
+    ParseError Err;
+    std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename,&Err));
     if (M.get() == 0) {
-      std::cerr << argv[0] << ": assembly didn't read correctly.\n";
+      std::cerr << argv[0] << ": " << Err.getMessage() << "\n"; 
       return 1;
     }