Merge branch 'master' of https://github.com/thepowersgang/mrustc

1 files changed, 40 insertions, 40 deletions

diff --git a/src/parse/parseerror.hpp b/src/parse/parseerror.hpp
index 0a00f60a..d6bcab6b 100644
--- a/src/parse/parseerror.hpp
+++ b/src/parse/parseerror.hpp
@@ -1,40 +1,40 @@
-#ifndef PARSEERROR_HPP_INCLUDED

-#define PARSEERROR_HPP_INCLUDED

-

-#include <stdexcept>

-#include "tokenstream.hpp"

-#include <compile_error.hpp>

-

-namespace ParseError {

-

-using CompileError::Generic;

-using CompileError::BugCheck;

-using CompileError::Todo;

-

-class BadChar:

-    public CompileError::Base

-{

-    //char    m_char;

-public:

-    BadChar(const TokenStream& lex, char character);

-    virtual ~BadChar() throw ();

-

-};

-

-class Unexpected:

-    public CompileError::Base

-{

-    Token   m_tok;

-public:

-    Unexpected(const TokenStream& lex, const Token& tok);

-    Unexpected(const TokenStream& lex, const Token& tok, Token exp);

-    Unexpected(const TokenStream& lex, const Token& tok, ::std::vector<eTokenType> exp);

-    virtual ~Unexpected() throw ();

-

-};

-

-#define ASSERT(lex, cnd)    do { if( !(cnd) ) throw CompileError::BugCheck(lex, "Assertion failed: " __FILE__ " - " #cnd); } while(0)

-

-}

-

-#endif // PARSEERROR_HPP_INCLUDED

+#ifndef PARSEERROR_HPP_INCLUDED
+#define PARSEERROR_HPP_INCLUDED
+
+#include <stdexcept>
+#include "tokenstream.hpp"
+#include <compile_error.hpp>
+
+namespace ParseError {
+
+using CompileError::Generic;
+using CompileError::BugCheck;
+using CompileError::Todo;
+
+class BadChar:
+    public CompileError::Base
+{
+    //char    m_char;
+public:
+    BadChar(const TokenStream& lex, char character);
+    virtual ~BadChar() throw ();
+
+};
+
+class Unexpected:
+    public CompileError::Base
+{
+    Token   m_tok;
+public:
+    Unexpected(const TokenStream& lex, const Token& tok);
+    Unexpected(const TokenStream& lex, const Token& tok, Token exp);
+    Unexpected(const TokenStream& lex, const Token& tok, ::std::vector<eTokenType> exp);
+    virtual ~Unexpected() throw ();
+
+};
+
+#define ASSERT(lex, cnd)    do { if( !(cnd) ) throw CompileError::BugCheck(lex, "Assertion failed: " __FILE__ " - " #cnd); } while(0)
+
+}
+
+#endif // PARSEERROR_HPP_INCLUDED