From 5dbf1809c6e3e905b94b8764e99491e608122261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 5 Mar 2017 16:44:50 +0100 Subject: A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code --- core/script_debugger_local.cpp | 206 +++++++++++++++++++---------------------- 1 file changed, 97 insertions(+), 109 deletions(-) (limited to 'core/script_debugger_local.cpp') diff --git a/core/script_debugger_local.cpp b/core/script_debugger_local.cpp index 22aceac4c5..b5ed9773f0 100644 --- a/core/script_debugger_local.cpp +++ b/core/script_debugger_local.cpp @@ -30,91 +30,91 @@ #include "os/os.h" -void ScriptDebuggerLocal::debug(ScriptLanguage *p_script,bool p_can_continue) { +void ScriptDebuggerLocal::debug(ScriptLanguage *p_script, bool p_can_continue) { - print_line("Debugger Break, Reason: '"+p_script->debug_get_error()+"'"); - print_line("*Frame "+itos(0)+" - "+p_script->debug_get_stack_level_source(0)+":"+itos(p_script->debug_get_stack_level_line(0))+" in function '"+p_script->debug_get_stack_level_function(0)+"'"); + print_line("Debugger Break, Reason: '" + p_script->debug_get_error() + "'"); + print_line("*Frame " + itos(0) + " - " + p_script->debug_get_stack_level_source(0) + ":" + itos(p_script->debug_get_stack_level_line(0)) + " in function '" + p_script->debug_get_stack_level_function(0) + "'"); print_line("Enter \"help\" for assistance."); - int current_frame=0; - int total_frames=p_script->debug_get_stack_level_count(); - while(true) { + int current_frame = 0; + int total_frames = p_script->debug_get_stack_level_count(); + while (true) { OS::get_singleton()->print("debug> "); String line = OS::get_singleton()->get_stdin_string().strip_edges(); - if (line=="") { - print_line("Debugger Break, Reason: '"+p_script->debug_get_error()+"'"); - print_line("*Frame "+itos(current_frame)+" - "+p_script->debug_get_stack_level_source(current_frame)+":"+itos(p_script->debug_get_stack_level_line(current_frame))+" in function '"+p_script->debug_get_stack_level_function(current_frame)+"'"); + if (line == "") { + print_line("Debugger Break, Reason: '" + p_script->debug_get_error() + "'"); + print_line("*Frame " + itos(current_frame) + " - " + p_script->debug_get_stack_level_source(current_frame) + ":" + itos(p_script->debug_get_stack_level_line(current_frame)) + " in function '" + p_script->debug_get_stack_level_function(current_frame) + "'"); print_line("Enter \"help\" for assistance."); - } else if (line=="c" || line=="continue") + } else if (line == "c" || line == "continue") break; - else if (line=="bt" || line=="breakpoint") { + else if (line == "bt" || line == "breakpoint") { - for(int i=0;idebug_get_stack_level_source(i)+":"+itos(p_script->debug_get_stack_level_line(i))+" in function '"+p_script->debug_get_stack_level_function(i)+"'"); + String cfi = (current_frame == i) ? "*" : " "; //current frame indicator + print_line(cfi + "Frame " + itos(i) + " - " + p_script->debug_get_stack_level_source(i) + ":" + itos(p_script->debug_get_stack_level_line(i)) + " in function '" + p_script->debug_get_stack_level_function(i) + "'"); } } else if (line.begins_with("fr") || line.begins_with("frame")) { - if (line.get_slice_count(" ")==1) { - print_line("*Frame "+itos(current_frame)+" - "+p_script->debug_get_stack_level_source(current_frame)+":"+itos(p_script->debug_get_stack_level_line(current_frame))+" in function '"+p_script->debug_get_stack_level_function(current_frame)+"'"); + if (line.get_slice_count(" ") == 1) { + print_line("*Frame " + itos(current_frame) + " - " + p_script->debug_get_stack_level_source(current_frame) + ":" + itos(p_script->debug_get_stack_level_line(current_frame)) + " in function '" + p_script->debug_get_stack_level_function(current_frame) + "'"); } else { - int frame = line.get_slicec(' ',1).to_int(); - if (frame<0 || frame >=total_frames) { + int frame = line.get_slicec(' ', 1).to_int(); + if (frame < 0 || frame >= total_frames) { print_line("Error: Invalid frame."); } else { - current_frame=frame; - print_line("*Frame "+itos(frame)+" - "+p_script->debug_get_stack_level_source(frame)+":"+itos(p_script->debug_get_stack_level_line(frame))+" in function '"+p_script->debug_get_stack_level_function(frame)+"'"); + current_frame = frame; + print_line("*Frame " + itos(frame) + " - " + p_script->debug_get_stack_level_source(frame) + ":" + itos(p_script->debug_get_stack_level_line(frame)) + " in function '" + p_script->debug_get_stack_level_function(frame) + "'"); } } - } else if (line=="lv" || line=="locals") { + } else if (line == "lv" || line == "locals") { List locals; List values; - p_script->debug_get_stack_level_locals(current_frame,&locals, &values); - List::Element* V = values.front(); - for (List::Element *E=locals.front();E;E=E->next()) { + p_script->debug_get_stack_level_locals(current_frame, &locals, &values); + List::Element *V = values.front(); + for (List::Element *E = locals.front(); E; E = E->next()) { print_line(E->get() + ": " + String(V->get())); V = V->next(); } - } else if (line=="gv" || line=="globals") { + } else if (line == "gv" || line == "globals") { List locals; List values; p_script->debug_get_globals(&locals, &values); - List::Element* V = values.front(); - for (List::Element *E=locals.front();E;E=E->next()) { + List::Element *V = values.front(); + for (List::Element *E = locals.front(); E; E = E->next()) { print_line(E->get() + ": " + String(V->get())); V = V->next(); } - } else if (line=="mv" || line=="members") { + } else if (line == "mv" || line == "members") { List locals; List values; - p_script->debug_get_stack_level_members(current_frame,&locals, &values); - List::Element* V = values.front(); - for (List::Element *E=locals.front();E;E=E->next()) { + p_script->debug_get_stack_level_members(current_frame, &locals, &values); + List::Element *V = values.front(); + for (List::Element *E = locals.front(); E; E = E->next()) { print_line(E->get() + ": " + String(V->get())); V = V->next(); } } else if (line.begins_with("p") || line.begins_with("print")) { - if (line.get_slice_count(" ")<=1) { + if (line.get_slice_count(" ") <= 1) { print_line("Usage: print "); } else { - String expr = line.get_slicec(' ',2); - String res = p_script->debug_parse_stack_level_expression(current_frame,expr); + String expr = line.get_slicec(' ', 2); + String res = p_script->debug_parse_stack_level_expression(current_frame, expr); print_line(res); } - } else if (line=="s" || line=="step") { + } else if (line == "s" || line == "step") { set_depth(-1); set_lines_left(1); @@ -126,41 +126,39 @@ void ScriptDebuggerLocal::debug(ScriptLanguage *p_script,bool p_can_continue) { break; } else if (line.begins_with("br") || line.begins_with("break")) { - if (line.get_slice_count(" ")<=1) { + if (line.get_slice_count(" ") <= 1) { //show breakpoints } else { - - String bppos=line.get_slicec(' ',1); - String source=bppos.get_slicec(':',0).strip_edges(); - int line=bppos.get_slicec(':',1).strip_edges().to_int(); + String bppos = line.get_slicec(' ', 1); + String source = bppos.get_slicec(':', 0).strip_edges(); + int line = bppos.get_slicec(':', 1).strip_edges().to_int(); source = breakpoint_find_source(source); - insert_breakpoint(line,source); + insert_breakpoint(line, source); - print_line("BreakPoint at "+source+":"+itos(line)); + print_line("BreakPoint at " + source + ":" + itos(line)); } } else if (line.begins_with("delete")) { - if (line.get_slice_count(" ")<=1) { + if (line.get_slice_count(" ") <= 1) { clear_breakpoints(); } else { - String bppos=line.get_slicec(' ',1); - String source=bppos.get_slicec(':',0).strip_edges(); - int line=bppos.get_slicec(':',1).strip_edges().to_int(); + String bppos = line.get_slicec(' ', 1); + String source = bppos.get_slicec(':', 0).strip_edges(); + int line = bppos.get_slicec(':', 1).strip_edges().to_int(); source = breakpoint_find_source(source); - remove_breakpoint(line,source); - - print_line("Removed BreakPoint at "+source+":"+itos(line)); + remove_breakpoint(line, source); + print_line("Removed BreakPoint at " + source + ":" + itos(line)); } - } else if (line=="h" || line=="help") { + } else if (line == "h" || line == "help") { print_line("Built-In Debugger command list:\n"); print_line("\tc,continue :\t\t Continue execution."); @@ -182,20 +180,17 @@ void ScriptDebuggerLocal::debug(ScriptLanguage *p_script,bool p_can_continue) { struct _ScriptDebuggerLocalProfileInfoSort { - bool operator()(const ScriptLanguage::ProfilingInfo &A,const ScriptLanguage::ProfilingInfo &B) const { + bool operator()(const ScriptLanguage::ProfilingInfo &A, const ScriptLanguage::ProfilingInfo &B) const { return A.total_time > B.total_time; } }; -void ScriptDebuggerLocal::profiling_set_frame_times(float p_frame_time,float p_idle_time,float p_fixed_time,float p_fixed_frame_time) { - - - frame_time=p_frame_time; - idle_time=p_idle_time; - fixed_time=p_fixed_time; - fixed_frame_time=p_fixed_frame_time; - +void ScriptDebuggerLocal::profiling_set_frame_times(float p_frame_time, float p_idle_time, float p_fixed_time, float p_fixed_frame_time) { + frame_time = p_frame_time; + idle_time = p_idle_time; + fixed_time = p_fixed_time; + fixed_frame_time = p_fixed_frame_time; } void ScriptDebuggerLocal::idle_poll() { @@ -205,107 +200,100 @@ void ScriptDebuggerLocal::idle_poll() { uint64_t diff = OS::get_singleton()->get_ticks_usec() - idle_accum; - if (diff<1000000) //show every one second + if (diff < 1000000) //show every one second return; idle_accum = OS::get_singleton()->get_ticks_usec(); - int ofs=0; - for(int i=0;iprofiling_get_frame_data(&pinfo[ofs],pinfo.size()-ofs); + int ofs = 0; + for (int i = 0; i < ScriptServer::get_language_count(); i++) { + ofs += ScriptServer::get_language(i)->profiling_get_frame_data(&pinfo[ofs], pinfo.size() - ofs); } - SortArray sort; - sort.sort(pinfo.ptr(),ofs); + SortArray sort; + sort.sort(pinfo.ptr(), ofs); //falta el frame time - uint64_t script_time_us=0; + uint64_t script_time_us = 0; - for(int i=0;iprofiling_start(); } - print_line("BEGIN PROFILING"); - profiling=true; + profiling = true; pinfo.resize(32768); - frame_time=0; - fixed_time=0; - idle_time=0; - fixed_frame_time=0; - + frame_time = 0; + fixed_time = 0; + idle_time = 0; + fixed_frame_time = 0; } - void ScriptDebuggerLocal::profiling_end() { - int ofs=0; + int ofs = 0; - for(int i=0;iprofiling_get_accumulated_data(&pinfo[ofs],pinfo.size()-ofs); + for (int i = 0; i < ScriptServer::get_language_count(); i++) { + ofs += ScriptServer::get_language(i)->profiling_get_accumulated_data(&pinfo[ofs], pinfo.size() - ofs); } - SortArray sort; - sort.sort(pinfo.ptr(),ofs); + SortArray sort; + sort.sort(pinfo.ptr(), ofs); - uint64_t total_us=0; - for(int i=0;iprofiling_stop(); } - profiling=false; + profiling = false; } -void ScriptDebuggerLocal::send_message(const String& p_message, const Array &p_args) { +void ScriptDebuggerLocal::send_message(const String &p_message, const Array &p_args) { - print_line("MESSAGE: '"+p_message+"' - "+String(Variant(p_args))); + print_line("MESSAGE: '" + p_message + "' - " + String(Variant(p_args))); } ScriptDebuggerLocal::ScriptDebuggerLocal() { - profiling=false; - idle_accum=OS::get_singleton()->get_ticks_usec(); + profiling = false; + idle_accum = OS::get_singleton()->get_ticks_usec(); } -- cgit v1.2.3