X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b3378a02d0a811be38e530933fb9a57a3012a823..210e14b3fd3765a57e5f151c159c2ad921dadc98:/Console.cpp diff --git a/Console.cpp b/Console.cpp index 6ecc251..c680947 100644 --- a/Console.cpp +++ b/Console.cpp @@ -313,7 +313,7 @@ static char **Complete(const char *word, int start, int end) { std::string common; bool rest(false); - for (CYElement *element(array->elements_); element != NULL; element = element->next_) { + CYForEach (element, array->elements_) { CYString *string(dynamic_cast(element->value_)); _assert(string != NULL); @@ -482,7 +482,7 @@ static void Console(CYOptions &options) { if (parser.parse() != 0 || !driver.errors_.empty()) { for (CYDriver::Errors::const_iterator error(driver.errors_.begin()); error != driver.errors_.end(); ++error) { cy::position begin(error->location_.begin); - if (begin.line != lines.size() || begin.column - 1 != lines.back().size() || error->warning_) { + if (begin.line != lines.size() || begin.column < lines.back().size() || error->warning_) { cy::position end(error->location_.end); if (begin.line != lines.size()) { @@ -573,7 +573,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) { bool compile(false); CYOptions options; - append_history$ = reinterpret_cast(dlsym(RTLD_DEFAULT, "append_history")); + append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history")); #ifdef CY_ATTACH pid_t pid(_not(pid_t));