X-Git-Url: http://nitlanguage.org diff --git a/src/debugger.nit b/src/debugger.nit index 9aa622e..24df936 100644 --- a/src/debugger.nit +++ b/src/debugger.nit @@ -109,8 +109,8 @@ redef class ToolContext message_sorter.sort(messages) for m in messages do - if "Warning".search_in(m.text, 0) == null then had_error = true - stderr.write("{m.to_color_string}\n") + if m.text.search("Warning") == null then had_error = true + sys.stderr.write("{m.to_color_string}\n") end end @@ -223,6 +223,8 @@ class Debugger var old = frame.current_node frame.current_node = n + if sys.stdin.poll_in then process_debug_command(gets) + if not self.autocontinue then if not n isa ABlockExpr then steps_fun_call(n) @@ -271,19 +273,14 @@ class Debugger self.discover_call_trace.add mpropdef self.debug("Discovered {mpropdef}") end - if args.length < mpropdef.msignature.arity + 1 or args.length > mpropdef.msignature.arity + 1 then - fatal("NOT YET IMPLEMENTED: Invalid arity for {mpropdef}. {args.length} arguments given.") - end - if args.length < mpropdef.msignature.arity + 1 then - fatal("NOT YET IMPLEMENTED: default closures") - end + assert args.length == mpropdef.msignature.arity + 1 else debug("Invalid arity for {mpropdef}. {args.length} arguments given.") # Look for the AST node that implements the property var mproperty = mpropdef.mproperty if self.modelbuilder.mpropdef2npropdef.has_key(mpropdef) then var npropdef = self.modelbuilder.mpropdef2npropdef[mpropdef] self.parameter_check(npropdef, mpropdef, args) - if npropdef isa AConcreteMethPropdef then + if npropdef isa AMethPropdef then return npropdef.rt_call(self, mpropdef, args) else print "Error, invalid propdef to call at runtime !" @@ -306,8 +303,12 @@ class Debugger var local_toolctx = modelbuilder.toolcontext local_toolctx.dbg = self var e = local_toolctx.parse_something(nit_code) + if e isa ABlockExpr then + nit_code = "module rt_module\n" + nit_code + e = local_toolctx.parse_something(nit_code) + end if e isa AExpr then - nit_code = "print " + nit_code + nit_code = "module rt_module\nprint " + nit_code e = local_toolctx.parse_something(nit_code) end if e isa AModule then @@ -334,8 +335,8 @@ class Debugger if initprop != null then self.send(initprop, [mobj]) end - self.check_init_instance(mobj) - var mainprop = mmod.try_get_primitive_method("main", sys_type.mclass) + var mainprop = mmod.try_get_primitive_method("run", sys_type.mclass) or else + mmod.try_get_primitive_method("main", sys_type.mclass) if mainprop != null then self.rt_send(mainprop, [mobj]) end @@ -486,7 +487,7 @@ class Debugger else if command == "nit" then printn "$~> " command = gets - var nit_buf = new Buffer + var nit_buf = new FlatBuffer while not command == ":q" do nit_buf.append(command) nit_buf.append("\n") @@ -588,16 +589,15 @@ class Debugger var keys = map_of_instances.iterator - print "Variables collection : \n" + var self_var = seek_variable("self", frame) + print "self: {self_var.to_s}" for instance in map_of_instances.keys do - print "Variable {instance.to_s}, Instance {map_of_instances[instance].to_s}" + print "{instance.to_s}: {map_of_instances[instance].to_s}" end - - print "\nEnd of current instruction \n" else if parts_of_command[1] == "stack" then print self.stack_trace - else if parts_of_command[1].has('[') and parts_of_command[1].has(']') then + else if parts_of_command[1].chars.has('[') and parts_of_command[1].chars.has(']') then process_array_command(parts_of_command) else var instance = seek_variable(get_real_variable_name(parts_of_command[1]), frame) @@ -645,7 +645,7 @@ class Debugger # Processes an array print command fun process_array_command(parts_of_command: Array[String]) do - var index_of_first_brace = parts_of_command[1].index_of('[') + var index_of_first_brace = parts_of_command[1].chars.index_of('[') var variable_name = get_real_variable_name(parts_of_command[1].substring(0,index_of_first_brace)) var braces = parts_of_command[1].substring_from(index_of_first_brace) @@ -824,16 +824,16 @@ class Debugger # Gets all the identifiers of an instruction (uses the rules of Nit as of Mar 05 2013) # - fun get_identifiers_in_current_instruction(instruction: AbstractString): Array[String] + fun get_identifiers_in_current_instruction(instruction: Text): Array[String] do var result_array = new Array[String] - var instruction_buffer = new Buffer + var instruction_buffer = new FlatBuffer var trigger_char_escape = false var trigger_string_escape = false var trigger_concat_in_string = false - for i in instruction do + for i in instruction.chars do if trigger_char_escape then if i == '\'' then trigger_char_escape = false else if trigger_string_escape then @@ -845,7 +845,7 @@ class Debugger if i.is_alphanumeric or i == '_' then instruction_buffer.add(i) else if i == '.' then - if instruction_buffer.is_numeric or (instruction_buffer[0] >= 'A' and instruction_buffer[0] <= 'Z') then + if instruction_buffer.is_numeric or (instruction_buffer.chars[0] >= 'A' and instruction_buffer.chars[0] <= 'Z') then instruction_buffer.clear else result_array.push(instruction_buffer.to_s) @@ -859,25 +859,25 @@ class Debugger trigger_concat_in_string = false trigger_string_escape = true else - if instruction_buffer.length > 0 and not instruction_buffer.is_numeric and not (instruction_buffer[0] >= 'A' and instruction_buffer[0] <= 'Z') then result_array.push(instruction_buffer.to_s) + if instruction_buffer.length > 0 and not instruction_buffer.is_numeric and not (instruction_buffer.chars[0] >= 'A' and instruction_buffer.chars[0] <= 'Z') then result_array.push(instruction_buffer.to_s) instruction_buffer.clear end end end - if instruction_buffer.length > 0 and not instruction_buffer.is_numeric and not (instruction_buffer[0] >= 'A' and instruction_buffer[0] <= 'Z') then result_array.push(instruction_buffer.to_s) + if instruction_buffer.length > 0 and not instruction_buffer.is_numeric and not (instruction_buffer.chars[0] >= 'A' and instruction_buffer.chars[0] <= 'Z') then result_array.push(instruction_buffer.to_s) return result_array end # Takes a function call or declaration and strips all but the arguments # - fun get_function_arguments(function: AbstractString): String + fun get_function_arguments(function: Text): String do - var buf = new Buffer + var buf = new FlatBuffer var trigger_copy = false - for i in function do + for i in function.chars do if i == ')' then break if trigger_copy then buf.add(i) if i == '(' then trigger_copy = true @@ -910,7 +910,7 @@ class Debugger fun get_real_variable_name(name: String): String do var explode_string = name.split_with(".") - var final_string = new Buffer + var final_string = new FlatBuffer for i in explode_string do var alias_resolved = get_variable_name_by_alias(i) if alias_resolved != null then @@ -933,20 +933,18 @@ class Debugger # If it is a primitive type, its value is directly printed fun print_instance(instance: Instance) do - print "Printing innards of a variable" - if instance isa MutableInstance then - var attributes = instance.attributes - print "Object : {instance}" + print "\{" + print "\ttype : {instance}," - for current_attribute in attributes.keys do - print "Attribute : {current_attribute.to_s} \nValeur : {attributes[current_attribute].to_s}" - end + printn("\t") + + print instance.attributes.join(",\n\t"," : ") + + print "\}" else - print "Found variable {instance}" + print "{instance}" end - - print "Stopping printing innards of a variable" end # Prints the attributes demanded in a SequenceRead @@ -1101,8 +1099,8 @@ class Debugger # Returns an array containing all the indexes demanded fun process_index(index_string: String): nullable Array[Int] do - var from_end_index = index_string.index_of('.') - var to_start_index = index_string.last_index_of('.') + var from_end_index = index_string.chars.index_of('.') + var to_start_index = index_string.chars.last_index_of('.') if from_end_index != -1 and to_start_index != -1 then var index_from_string = index_string.substring(0,from_end_index) @@ -1158,7 +1156,7 @@ class Debugger # Returns an array containing their content fun remove_braces(braces: String): nullable Array[String] do - var buffer = new Buffer + var buffer = new FlatBuffer var result_array = new Array[String] @@ -1167,7 +1165,7 @@ class Debugger var last_was_opening_bracket = false - for i in braces do + for i in braces.chars do if i == '[' then if last_was_opening_bracket then return null @@ -1345,7 +1343,7 @@ class Debugger fun get_char(value: String): nullable Instance do if value.length >= 1 then - return char_instance(value[0]) + return char_instance(value.chars[0]) else return null end @@ -1366,7 +1364,7 @@ class Debugger end -redef class AConcreteMethPropdef +redef class AMethPropdef # Same as call except it will copy local variables of the parent frame to the frame defined in this call. # Not supposed to be used by anyone else than the Debugger.