| OLD | NEW |
| 1 #include <AdblockPlus.h> | 1 #include <AdblockPlus.h> |
| 2 #include <fstream> | 2 #include <fstream> |
| 3 #include <iostream> | 3 #include <iostream> |
| 4 #include <sstream> | 4 #include <sstream> |
| 5 | 5 |
| 6 #include "GcCommand.h" | 6 #include "GcCommand.h" |
| 7 #include "HelpCommand.h" | 7 #include "HelpCommand.h" |
| 8 #include "FiltersCommand.h" | 8 #include "FiltersCommand.h" |
| 9 #include "SubscriptionsCommand.h" | 9 #include "SubscriptionsCommand.h" |
| 10 #include "MatchesCommand.h" | 10 #include "MatchesCommand.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 std::getline(lineStream, arguments); | 53 std::getline(lineStream, arguments); |
| 54 } | 54 } |
| 55 } | 55 } |
| 56 | 56 |
| 57 int main() | 57 int main() |
| 58 { | 58 { |
| 59 try | 59 try |
| 60 { | 60 { |
| 61 LibFileReader fileReader; | 61 LibFileReader fileReader; |
| 62 CerrErrorCallback errorCallback; | 62 CerrErrorCallback errorCallback; |
| 63 AdblockPlus::JsEngine jsEngine(&fileReader, 0); | 63 AdblockPlus::JsEngine jsEngine(&fileReader, 0, 0); |
| 64 AdblockPlus::FilterEngine filterEngine(jsEngine); | 64 AdblockPlus::FilterEngine filterEngine(jsEngine); |
| 65 | 65 |
| 66 CommandMap commands; | 66 CommandMap commands; |
| 67 Add(commands, new GcCommand(jsEngine)); | 67 Add(commands, new GcCommand(jsEngine)); |
| 68 Add(commands, new HelpCommand(commands)); | 68 Add(commands, new HelpCommand(commands)); |
| 69 Add(commands, new FiltersCommand(filterEngine)); | 69 Add(commands, new FiltersCommand(filterEngine)); |
| 70 Add(commands, new SubscriptionsCommand(filterEngine)); | 70 Add(commands, new SubscriptionsCommand(filterEngine)); |
| 71 Add(commands, new MatchesCommand(filterEngine)); | 71 Add(commands, new MatchesCommand(filterEngine)); |
| 72 | 72 |
| 73 std::string commandLine; | 73 std::string commandLine; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 89 std::cout << error.what() << std::endl; | 89 std::cout << error.what() << std::endl; |
| 90 } | 90 } |
| 91 } | 91 } |
| 92 } | 92 } |
| 93 catch (const std::exception& e) | 93 catch (const std::exception& e) |
| 94 { | 94 { |
| 95 std::cerr << "Exception: " << e.what() << std::endl; | 95 std::cerr << "Exception: " << e.what() << std::endl; |
| 96 } | 96 } |
| 97 return 0; | 97 return 0; |
| 98 } | 98 } |
| OLD | NEW |