| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 #ifndef ADBLOCKPLUS_JS_ENGINE_H | 1 #ifndef ADBLOCKPLUS_JS_ENGINE_H |
| 2 #define ADBLOCKPLUS_JS_ENGINE_H | 2 #define ADBLOCKPLUS_JS_ENGINE_H |
| 3 | 3 |
| 4 #include <stdexcept> | 4 #include <stdexcept> |
| 5 #include <string> | 5 #include <string> |
| 6 #include <v8.h> | 6 #include <v8.h> |
| 7 | 7 |
| 8 class ErrorCallback; | 8 class ErrorCallback; |
| 9 class FileReader; | 9 class FileReader; |
| 10 | 10 |
| 11 namespace AdblockPlus | 11 namespace AdblockPlus |
| 12 { | 12 { |
| 13 class JsError : public std::runtime_error | 13 class JsError : public std::runtime_error |
| 14 { | 14 { |
| 15 public: | 15 public: |
| 16 JsError(const v8::Handle<v8::Value> exception); | 16 JsError(const v8::Handle<v8::Value> exception, |
| 17 const v8::Handle<v8::Message> message); | |
| 18 private: | |
|
Felix Dahlke
2013/03/15 14:18:15
Mind adding an empty line before private? I know,
| |
| 19 std::string toString(const v8::Handle<v8::Value> exception, | |
|
Felix Dahlke
2013/03/15 14:18:15
We are starting all function/method names with an
Wladimir Palant
2013/03/15 15:27:26
I prefer having this a method for reasons of bette
| |
| 20 const v8::Handle<v8::Message> message); | |
| 17 }; | 21 }; |
| 18 | 22 |
| 19 class JsEngine | 23 class JsEngine |
| 20 { | 24 { |
| 21 public: | 25 public: |
| 22 JsEngine(const FileReader* const fileReader, | 26 JsEngine(const FileReader* const fileReader, |
| 23 ErrorCallback* const errorCallback); | 27 ErrorCallback* const errorCallback); |
| 24 void Evaluate(const char* source, const char* filename = NULL); | 28 void Evaluate(const char* source, const char* filename = NULL); |
| 25 void Evaluate(const std::string& source) | 29 void Evaluate(const std::string& source) |
| 26 { | 30 { |
| 27 Evaluate(source.c_str()); | 31 Evaluate(source.c_str()); |
| 28 } | 32 } |
| 29 void Evaluate(const std::string& source, const std::string& filename) | 33 void Evaluate(const std::string& source, const std::string& filename) |
| 30 { | 34 { |
| 31 Evaluate(filename.c_str(), source.c_str()); | 35 Evaluate(filename.c_str(), source.c_str()); |
| 32 } | 36 } |
| 33 void Load(const std::string& scriptPath); | 37 void Load(const std::string& scriptPath); |
| 34 std::string Call(const std::string& functionName); | 38 std::string Call(const std::string& functionName); |
| 35 void Gc(); | 39 void Gc(); |
| 36 | 40 |
| 37 private: | 41 private: |
| 38 const FileReader* const fileReader; | 42 const FileReader* const fileReader; |
| 39 v8::Persistent<v8::Context> context; | 43 v8::Persistent<v8::Context> context; |
| 40 inline v8::Handle<v8::Script> CompileScript(const char* source, const char* filename); | 44 inline v8::Handle<v8::Script> CompileScript(const char* source, const char* filename); |
| 41 }; | 45 }; |
| 42 } | 46 } |
| 43 | 47 |
| 44 #endif | 48 #endif |
| OLD | NEW |