kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-04-24 04:46:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetic fix for the repl level indentation, fixed the simulator capture code

Browse Source
This commit is contained in:
Laurent Sansonetti
2012-05-20 20:15:25 +02:00
parent 2205be0ac6
commit ee8168c2ef
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
bin/sim.m
View File

@@ -127,8 +127,25 @@ locate_simulator_app_bounds(void)
}
id name = [dict objectForKey:@"kCGWindowName"];
validate(name, NSString);
if (![name rangeOfString:[NSString stringWithFormat:@"iPhone - %@",
sdk_version]].location == NSNotFound) {
static NSArray *patterns = nil;
if (patterns == nil) {
patterns = [[NSArray alloc] initWithObjects:
[NSString stringWithFormat:@"iPhone - iOS %@", sdk_version],
[NSString stringWithFormat:@"iPad - iOS %@", sdk_version],
[NSString stringWithFormat:@"iPhone / iOS %@", sdk_version],
[NSString stringWithFormat:@"iPad / iOS %@", sdk_version],
nil];
}
bool found = false;
for (NSString *pattern in patterns) {
if ([name rangeOfString:pattern].location != NSNotFound) {
found = true;
break;
}
}
if (!found) {
continue;
}
@@ -173,6 +190,8 @@ locate_simulator_app_bounds(void)
simulator_app_bounds = bounds;
}
static int expr_level = 0;
static NSString *
current_repl_prompt(NSString *top_level)
{
@@ -194,8 +213,13 @@ current_repl_prompt(NSString *top_level)
stringByAppendingString:@"..."];
}
return [NSString stringWithFormat:@"(%@)%c> ",
top_level, question];
NSString *prompt = [NSString stringWithFormat:@"(%@)%c ",
top_level, question];
for (int i = 0; i < expr_level; i++) {
prompt = [prompt stringByAppendingString:@" "];
}
return prompt;
}
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
@@ -601,13 +625,9 @@ repl_complete(const char *text, int start, int end)
rl_basic_word_break_characters = strdup(" \t\n`<;|&(");
NSString *expr = nil;
int expr_level = 0;
while (true) {
// Read expression from stdin.
NSString *prompt = current_repl_prompt(nil);
for (int i = 0; i < expr_level; i++) {
prompt = [prompt stringByAppendingString:@" "];
}
char *line_cstr = readline([prompt UTF8String]);
if (line_cstr == NULL) {
terminate_session();