JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / parser / ParserError.h

diff --git a/parser/ParserError.h b/parser/ParserError.h
index df38a067429aeb2bb769a5fb8396404fe88a4567..89a05ab4290f4e8ad3364efa0df970defce8f732 100644 (file)
--- a/parser/ParserError.h
+++ b/parser/ParserError.h
@@ -34,7 +34,8 @@
 
 namespace JSC {
 
 
 namespace JSC {
 

-struct ParserError {
+class ParserError {
+public:

     enum SyntaxErrorType {
         SyntaxErrorNone,
         SyntaxErrorIrrecoverable,
     enum SyntaxErrorType {
         SyntaxErrorNone,
         SyntaxErrorIrrecoverable,


@@ -50,62 +51,72 @@ struct ParserError {
         SyntaxError
     };
 
         SyntaxError
     };
 

-    ErrorType m_type;
-    SyntaxErrorType m_syntaxErrorType;
-    JSToken m_token;
-    String m_message;
-    int m_line;

     ParserError()
         : m_type(ErrorNone)
         , m_syntaxErrorType(SyntaxErrorNone)
     ParserError()
         : m_type(ErrorNone)
         , m_syntaxErrorType(SyntaxErrorNone)

-        , m_line(-1)

     {
     }
     
     explicit ParserError(ErrorType type)
         : m_type(type)
         , m_syntaxErrorType(SyntaxErrorNone)
     {
     }
     
     explicit ParserError(ErrorType type)
         : m_type(type)
         , m_syntaxErrorType(SyntaxErrorNone)

-        , m_line(-1)

     {
     }
 
     ParserError(ErrorType type, SyntaxErrorType syntaxError, JSToken token)
     {
     }
 
     ParserError(ErrorType type, SyntaxErrorType syntaxError, JSToken token)

-        : m_type(type)
+        : m_token(token)
+        , m_type(type)

         , m_syntaxErrorType(syntaxError)
         , m_syntaxErrorType(syntaxError)

-        , m_token(token)
-        , m_line(-1)

     {
     }
 
     {
     }
 

-    ParserError(ErrorType type, SyntaxErrorType syntaxError, JSToken token, String msg, int line)
-        : m_type(type)
-        , m_syntaxErrorType(syntaxError)
-        , m_token(token)
+    ParserError(ErrorType type, SyntaxErrorType syntaxError, JSToken token, const String& msg, int line)
+        : m_token(token)

         , m_message(msg)
         , m_line(line)
         , m_message(msg)
         , m_line(line)

+        , m_type(type)
+        , m_syntaxErrorType(syntaxError)

     {
     }
 
     {
     }
 

-    JSObject* toErrorObject(JSGlobalObject* globalObject, const SourceCode& source)
+    bool isValid() const { return m_type != ErrorNone; }
+    SyntaxErrorType syntaxErrorType() const { return m_syntaxErrorType; }
+    const JSToken& token() const { return m_token; }
+    const String& message() const { return m_message; }
+    int line() const { return m_line; }
+
+    JSObject* toErrorObject(
+        JSGlobalObject* globalObject, const SourceCode& source, 
+        int overrideLineNumber = -1)

     {
     {

+        ExecState* exec = globalObject->globalExec();

         switch (m_type) {
         case ErrorNone:
         switch (m_type) {
         case ErrorNone:

-            return 0;
+            return nullptr;

         case SyntaxError:
         case SyntaxError:

-            return addErrorInfo(globalObject->globalExec(), createSyntaxError(globalObject, m_message), m_line, source);
+            return addErrorInfo(
+                exec, 
+                createSyntaxError(exec, m_message), 
+                overrideLineNumber == -1 ? m_line : overrideLineNumber, source);

         case EvalError:
         case EvalError:

-            return createSyntaxError(globalObject, m_message);
+            return createSyntaxError(exec, m_message);

         case StackOverflow: {
             ErrorHandlingScope errorScope(globalObject->vm());
         case StackOverflow: {
             ErrorHandlingScope errorScope(globalObject->vm());

-            return createStackOverflowError(globalObject);
+            return createStackOverflowError(exec);

         }
         case OutOfMemory:
         }
         case OutOfMemory:

-            return createOutOfMemoryError(globalObject);
+            return createOutOfMemoryError(exec);

         }
         CRASH();
         }
         CRASH();

-        return createOutOfMemoryError(globalObject); // Appease Qt bot
+        return nullptr;

     }
     }

-#undef GET_ERROR_CODE
+
+private:
+    JSToken m_token;
+    String m_message;
+    int m_line { -1 };
+    ErrorType m_type;
+    SyntaxErrorType m_syntaxErrorType;

 };
 
 } // namespace JSC
 };
 
 } // namespace JSC