For PR797:

Update to reflect ParseException becoming ParseError (from Parser.h)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29766 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/projects/Stacker/lib/compiler/StackerCompiler.cpp b/projects/Stacker/lib/compiler/StackerCompiler.cpp
index b9e41a889ce7edbe06b4e4d81dbe23d53a484727..a6d3995045bd2c55a827df0b20051c6641c4a0c1 100644 (file)
--- a/projects/Stacker/lib/compiler/StackerCompiler.cpp
+++ b/projects/Stacker/lib/compiler/StackerCompiler.cpp
@@ -110,8 +110,9 @@ StackerCompiler::compile(
 
         if (F == 0)
         {
-            throw ParseException(filename,
-                "Could not open file '" + filename + "'");
+          ParseError Err;
+          Err.setError(filename, "Could not open file '" + filename + "'");
+          throw Err;
         }
     }
 

diff --git a/projects/Stacker/lib/compiler/StackerCompiler.h b/projects/Stacker/lib/compiler/StackerCompiler.h
index 383e569c2518d9c0f3c6894d21d8adadf20b8624..ef09cdb469a293f41bc958303c31896424fb0110 100644 (file)
--- a/projects/Stacker/lib/compiler/StackerCompiler.h
+++ b/projects/Stacker/lib/compiler/StackerCompiler.h
@@ -158,7 +158,9 @@ class StackerCompiler
         {
           if (line == -1) line = Stackerlineno;
           // TODO: column number in exception
-          throw ParseException(TheInstance->CurFilename, message, line);
+          ParseError Err;
+          Err.setError(TheInstance->CurFilename, message, line);
+          throw Err;
         }
     private:
         /// @brief Generate code to increment the stack index

diff --git a/projects/Stacker/tools/stkrc/stkrc.cpp b/projects/Stacker/tools/stkrc/stkrc.cpp
index 647fee42a9137f61b93185f1af239caaf0c8eb5f..727b044c20fdc4a68458f9d0b2249c00265f7e15 100644 (file)
--- a/projects/Stacker/tools/stkrc/stkrc.cpp
+++ b/projects/Stacker/tools/stkrc/stkrc.cpp
@@ -164,7 +164,7 @@ int main(int argc, char **argv)
       }
 
       WriteBytecodeToFile(M.get(), *Out);
-    } catch (const ParseException &E) {
+    } catch (const ParseError &E) {
       std::cerr << argv[0] << ": " << E.getMessage() << "\n";
       return 1;
     }