rbx-trepanning 0.0.7-universal-rubinius-1.2 → 0.0.8-universal-rubinius-1.2

data/ChangeLog

@@ -1,3 +1,239 @@
+2011-03-12  rocky <rockyb@rubyforge.org>
+
+	* processor/command/help.rb, processor/command/help/command.txt,
+	processor/command/help/filename.txt,
+	processor/command/help/filenames.txt,
+	processor/command/help/location.txt: sync with rb-trepanning.
+
+2011-03-12  rocky <rockyb@rubyforge.org>
+
+	* processor/command/help.rb, processor/command/help/command.txt,
+	processor/command/help/filenames.txt,
+	processor/command/help/syntax.txt, processor/help.rb,
+	test/unit/test-completion.rb: Start multi-level "help syntax"
+
+2011-03-12  rocky <rockyb@rubyforge.org>
+
+	* processor/command/info_subcmd/files.rb: info files: iseq -> cm.
+	Document it.
+
+2011-03-12  rocky <rockyb@rubyforge.org>
+
+	* processor/command/info_subcmd/files.rb: Show compiled method
+	status in "info files" .
+
+2011-03-12  rocky <rockyb@rubyforge.org>
+
+	* processor/command/info_subcmd/files.rb, processor/location.rb,
+	processor/main.rb, processor/validate.rb: Handle more cases of
+	file/line breakpoints. Improve "info files" more.
+
+2011-03-11  rocky <rockyb@rubyforge.org>
+
+	* app/method.rb, processor/command/info_subcmd/files.rb,
+	processor/location.rb, processor/validate.rb: Better "info file"
+	display. Start to handle filenames other than current one by using
+	LineCache saving the top compile method.
+
+2011-03-11  rocky <rockyb@rubyforge.org>
+
+	* app/cmd_parse.kpeg, app/cmd_parser.rb,
+	processor/command/help/filenames.txt,
+	processor/command/help/location.txt,
+	test/unit/test-app-cmd_parser.rb: Clean up filename parsing
+	somewhat.
+
+2011-03-10  rocky <rockyb@rubyforge.org>
+
+	* app/cmd_parse.rb, app/cmd_parser.rb, processor/command/help.rb,
+	processor/command/help/.gitignore,
+	processor/command/help/location.txt,
+	processor/command/help/syntax.txt: Start moving text help, to text
+	file.
+
+2011-03-10  rocky <rockyb@rubyforge.org>
+
+	* processor/command/save.rb, processor/validate.rb,
+	test/unit/test-proc-validate.rb: Cutover to KPEG for breakpoints
+	complete. What a relief! save.rb: save debugger settings for
+	restart.
+
+2011-03-10  rocky <rockyb@rubyforge.org>
+
+	* app/breakpoint.rb, app/cmd_parse.kpeg, app/cmd_parse.rb,
+	app/cmd_parser.rb, lib/trepanning.rb, processor/breakpoint.rb,
+	processor/command/break.rb, processor/command/condition.rb,
+	processor/command/continue.rb,
+	processor/command/info_subcmd/breakpoints.rb,
+	processor/command/tbreak.rb, processor/mock.rb,
+	processor/validate.rb, test/unit/cmd-helper.rb,
+	test/unit/test-app-cmd_parse.rb, test/unit/test-cmd-break.rb: 
+	Towards getting breakpoint refactoring complete.
+
+2011-03-09  rocky <rockyb@rubyforge.org>
+
+	Merge branch 'master' of github.com:rocky/rbx-trepanning
+
+2011-03-09  rocky <rockyb@rubyforge.org>
+
+	* processor/load_cmds.rb, processor/main.rb: Small changes.
+
+2011-03-08  rocky <rockyb@rubyforge.org>
+
+	* Rakefile, processor/command/info_subcmd/frame.rb: Add "info frame"
+	command Revise "rake cmd_parse" to use TempDir.
+
+2011-03-07  rocky <rockyb@rubyforge.org>
+
+	Merge branch 'master' of github.com:rocky/rbx-trepanning
+
+2011-03-06  rocky <rockyb@rubyforge.org>
+
+	* Rakefile, app/cmd_parse.kpeg, app/cmd_parser.rb,
+	processor/location.rb, processor/main.rb,
+	test/example/debugger-stop.rb, test/integration/helper.rb,
+	test/unit/test-proc-location.rb: Largely sync with rb-trepanning -
+	no bug fixes or completed enhancements cmd_parse.kpeg: fill out for
+	location. More complete. Rakefile: add descriptions to some tasks
+	helper.rb: add feed_input option test: test some bugs that were in
+	rb-trepanning but here.
+
+2011-03-05  rvm <rocky@gnu.org>
+
+	* test/unit/test-app-options.rb: Remove tempfile in unit test
+
+2011-03-05  rvm <rocky@gnu.org>
+
+	* app/default.rb, app/options.rb, bin/trepanx, lib/trepanning.rb,
+	processor/command/base/submgr.rb, processor/command/restart.rb,
+	processor/command/set_subcmd/trace_subcmd/buffer.rb,
+	processor/command/set_subcmd/trace_subcmd/print.rb,
+	processor/load_cmds.rb: Save/restore of debugger state across a
+	restart finally works!
+
+2011-03-04  rocky <rockyb@rubyforge.org>
+
+	* Rakefile, app/cmd_parse.kpeg: Sync Rakefile with rb-trepanning
+
+2011-03-04  rocky <rockyb@rubyforge.org>
+
+	* app/cmd_parse.citrus, app/cmd_parse.kpeg, app/cmd_parser.rb: 
+	Citrus -> KPeg: Forgot to add new files and remove old ones
+
+2011-03-04  rocky <rockyb@rubyforge.org>
+
+	* app/cmd_parse.rb, processor/validate.rb, rbx-trepanning.gemspec,
+	test/unit/test-app-cmd_parse.rb: Switch from Citrus to KPeg. Thanks
+	Evan!
+
+2011-03-02  rocky <rockyb@rubyforge.org>
+
+	Merge branch 'master' of github.com:rocky/rbx-trepanning
+
+2011-03-02  rocky <rockyb@rubyforge.org>
+
+	* processor/command/eval.rb, test/functional/test-eval.rb: Add to
+	eval? stripping "unless" and optional "then".
+
+2011-03-01  rvm <rocky@gnu.org>
+
+	* Rakefile, app/cmd_parse.citrus, app/cmd_parse.rb, doc/.gitignore,
+	doc/debugger.html, test/unit/test-app-cmd_parse.rb: Sync with
+	rb-trepanning: move forward in location parsing. Rakefile: add task
+	to remove patch residue files.
+
+2011-03-01  rocky <rockyb@rubyforge.org>
+
+	Merge branch 'master' of github.com:rocky/rbx-trepanning
+
+2011-02-28  rvm <rocky@gnu.org>
+
+	* app/brkptmgr.rb, processor/command/eval.rb: In "eval?" extract
+	expression in "case", and echo that.
+
+2011-02-25  rocky <rockyb@rubyforge.org>
+
+	* app/cmd_parse.citrus, app/cmd_parse.rb,
+	test/unit/test-app-cmd_parse.rb: Start filling out location parsing.
+
+
+2011-02-25  rocky <rockyb@rubyforge.org>
+
+	* app/cmd_parse.citrus, app/cmd_parse.rb, app/method_name.citrus,
+	app/method_name.rb, processor/validate.rb,
+	test/unit/test-app-cmd_parse.rb, test/unit/test-app-method_name.rb: 
+	method_name -> cmd_parse to allow expansion
+
+2011-02-25  rvm <rocky@gnu.org>
+
+	* processor/command/eval.rb, test/functional/test-eval.rb: In eval?
+	we now also strip a leading 'return'.
+
+2011-02-25  rocky <rockyb@rubyforge.org>
+
+	* app/method_name.rb: Use bind instead of binding for binding
+	variable name. I think it is less likely to be confused with
+	Kernel#bind
+
+2011-02-25  rocky <rockyb@rubyforge.org>
+
+	* app/method_name.rb, app/validate.rb, lib/trepanning.rb,
+	processor/breakpoint.rb, processor/command/break.rb,
+	processor/validate.rb, test/functional/test-break-name.rb,
+	test/functional/test-tbreak.rb, test/unit/test-app-validate.rb,
+	test/unit/test-cmd-break.rb, test/unit/test-proc-validate.rb: Get
+	rid of the all-to-hacky # vs . notation for breakpoints. Also,
+	offsets are now specified with '@' rather than 'O' or 'o'. Some
+	other breakpoint bugs fixed.
+
+2011-02-24  rocky <rockyb@rubyforge.org>
+
+	Merge branch 'master' of github.com:rocky/rbx-trepanning
+
+2011-02-24  rocky <rockyb@rubyforge.org>
+
+	* app/method_name.citrus, app/method_name.rb,
+	processor/command/break.rb, processor/command/disassemble.rb,
+	processor/validate.rb, rbx-trepanning.gemspec,
+	test/unit/test-app-method_name.rb, test/unit/test-proc-validate.rb: 
+	Use a PEG parser (citrus) to parse method names. This weay we can
+	get the method in a controlled way without having to eval and hope
+	we didn't do any damage.
+
+2011-02-23  rocky <rockyb@rubyforge.org>
+
+	* processor/command/step.rb, processor/disassemble.rb,
+	processor/main.rb, processor/running.rb: Add "step until"
+
+2011-02-23  rocky <rockyb@rubyforge.org>
+
+	* app/options.rb, processor/command/alias.rb,
+	processor/command/exit.rb, processor/command/kill.rb,
+	processor/command/restart.rb, processor/command/show.rb: Call
+	cmdproc finalization routine on exit and restart. Mention "show
+	alias" in alias help.
+
+2011-02-22  rocky <rockyb@rubyforge.org>
+
+	* app/options.rb: Update version for release.
+
+2011-02-22  rocky <rockyb@rubyforge.org>
+
+	* processor/command/base/subsubcmd.rb,
+	processor/command/show_subcmd/trace_subcmd/buffer.rb,
+	processor/main.rb, test/unit/test-base-subsubcmd.rb: Mark stopping
+	boundaries in event buffer. Test setting command CMD, NAME and
+	PREFIX. Make main more like rb-trepanning.
+
+2011-02-22  rocky <rockyb@rubyforge.org>
+
+	* ChangeLog, NEWS, Rakefile,
+	processor/command/info_subcmd/breakpoints.rb,
+	processor/command/show_subcmd/trace_subcmd/buffer.rb,
+	processor/eventbuf.rb, processor/location.rb: Now shows trace buffer
+	events and locations properly. How number of breakpoint hits. Get
+	ready for release.
+
 2011-02-22  rocky <rockyb@rubyforge.org>
 
 	* app/breakpoint.rb, app/brkptmgr.rb, lib/trepanning.rb,

data/NEWS

@@ -1,3 +1,19 @@
+March 15, 2011  (0.0.8)
+
+- Revise breakpoint location parsing
+  * Add: break <location> if/unless <condition>
+  * Add: step until <condition>
+  * VM offsets are now specified via @ rather than o or O
+  * Filenames can be quoted and blanks and characters inside escaped
+- Document command syntax by adding it as a new category with sub help
+- More controlled parsing of method names 
+- improvements to "info files"
+  show if we have a compiled method object for the file
+- eval? now strips more: 
+   * leading "return" or "case", or "unless"
+   * trailing "then"
+- Save and restore some debugger state across a restart
+
 Feb 22, 2011  (0.0.7)
 - Add gdb "condition" command
 - More complete command completion

data/Rakefile

@@ -6,9 +6,6 @@ raise RuntimeError, 'This package is for Rubinius 1.2.x only!' unless
   Rubinius::VERSION =~ /1\.2.+/
 
 require 'rubygems'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/testtask'
 
 ROOT_DIR = File.dirname(__FILE__)
 Gemspec_filename = 'rbx-trepanning.gemspec'
@@ -18,13 +15,14 @@ def gemspec
   @gemspec ||= eval(File.read(Gemspec_filename), binding, Gemspec_filename)
 end
 
+require 'rake/gempackagetask'
 desc "Build the gem"
 task :package=>:gem
 task :gem=>:gemspec do
   Dir.chdir(ROOT_DIR) do
     sh "gem build #{Gemspec_filename}"
     FileUtils.mkdir_p 'pkg'
-    FileUtils.mv("#{gemspec.file_name}", "pkg/")
+    FileUtils.mv gemspec.file_name, 'pkg'
   end
 end
 
@@ -35,6 +33,18 @@ task :install => :gem do
   end
 end
 
+require 'rake/testtask'
+desc "Test everything."
+Rake::TestTask.new(:test) do |t|
+  t.libs << './lib'
+  t.pattern = 'test/test-*.rb'
+  t.verbose = true
+end
+task :test => :lib
+
+desc "same as test"
+task :check => :test
+
 require 'rbconfig'
 RUBY_PATH = File.join(RbConfig::CONFIG['bindir'],  
                       RbConfig::CONFIG['RUBY_INSTALL_NAME'])
@@ -47,7 +57,7 @@ def run_standalone_ruby_files(list)
 end
 
 def run_standalone_ruby_file(directory, opts={})
-  puts ('*' * 10) + ' ' + directory + ' ' + ('*' * 10)
+  puts(('*' * 10) + ' ' + directory + ' ' + ('*' * 10))
   Dir.chdir(directory) do
     Dir.glob('*.rb').each do |ruby_file|
       puts(('-' * 20) + ' ' + ruby_file + ' ' + ('-' * 20))
@@ -82,7 +92,6 @@ Rake::TestTask.new(:'test:integration') do |t|
 end
 
 desc 'Test everything - unit tests for now.'
-task :default => :test
 task :test do
   exceptions = %w(test:unit test:functional test:integration).collect do |task|
     begin
@@ -115,20 +124,55 @@ task :'check:sub:commands' do
   end
 end
 
+desc "Run each of the sub-sub commands in standalone mode."
+task :'check:subsub:commands' do
+  subsub_files = FileList["#{ROOT_DIR}/processor/command/*_subcmd/*_subcmd/*.rb"]
+  run_standalone_ruby_files(subsub_files)
+end
+
+desc "Run each processor Ruby file in standalone mode."
+task :'check:lib' do
+  run_standalone_ruby_file(File.join(%W(#{ROOT_DIR} lib)))
+end
+
 desc "Run each processor Ruby file in standalone mode."
 task :'check:processor' do
   run_standalone_ruby_file(File.join(%W(#{ROOT_DIR} processor)))
 end
 
+desc "Run each processor Ruby file in standalone mode."
+task :'check:unit' do
+  run_standalone_ruby_file(File.join(%W(#{ROOT_DIR} test unit)))
+end
+
+desc "Run functional tests in standalone mode."
 task :'check:functional' do
   run_standalone_ruby_file(File.join(%W(#{ROOT_DIR} test functional)))
 end
 
-desc "Run each unit test in standalone mode."
-task :'check:unit' do
-  run_standalone_ruby_file(File.join(%W(#{ROOT_DIR} test unit)))
+desc "Run command parser grammar."
+task :'check:cmd_parse' do
+  sh "kpeg --test --debug #{File.join(ROOT_DIR, %w(app cmd_parse.kpeg))}"
+end
+
+desc "Generate command parser."
+task :'cmd_parse' do
+  require 'tmpdir'
+  temp_file = File.join(Dir.tmpdir, "cmd_parser_#{$$}.rb")
+  sh("kpeg --name CmdParse --verbose --stand-alone  " + 
+     "#{File.join(ROOT_DIR, %w(app cmd_parse.kpeg))} " + 
+     "--output #{temp_file}")
 end
 
+task :'check:integration' do
+  run_standalone_ruby_file(File.join(%W(#{ROOT_DIR} test integration)))
+end
+
+task :check => %w(check:lib check:processor check:commands).map{|c| c.to_sym}
+
+desc "Test everything - same as test."
+task :default => :test
+
 desc "Generate the gemspec"
 task :generate do
   puts gemspec.to_ruby
@@ -140,10 +184,11 @@ task :gemspec do
 end
 
 # ---------  RDoc Documentation ------
+require 'rake/rdoctask'
 desc "Generate rdoc documentation"
 Rake::RDocTask.new("rdoc") do |rdoc|
   rdoc.rdoc_dir = 'doc'
-  rdoc.title    = "rbx-trepaning #{Trepan::VERSION} Documentation"
+  rdoc.title    = "Trepanning #{Trepan::VERSION} Documentation"
 
   rdoc.rdoc_files.include(%w(lib/trepanning.rb processor/*.rb
                              processor/command/*.rb
@@ -162,5 +207,9 @@ task :clobber_rdoc do
   FileUtils.rm_rf File.join(ROOT_DIR, 'doc')
 end
 
+task :rm_patch_residue do
+  FileUtils.rm_rf FileList['**/*.{rej,orig}'].to_a
+end
+
 desc "Remove built files"
-task :clean => [:clobber_package, :clobber_rdoc]
+task :clean => [:clobber_package, :clobber_rdoc, :rm_patch_residue]

data/app/breakpoint.rb

@@ -15,12 +15,16 @@ class Trepan
     attr_reader   :id        # Fixnum. Name of breakpoint
     attr_reader   :ignore    # Fixnum. How many more times do we have
                              # to encounter the breakpoint before we stop?
+    attr_reader   :negate    # Boolean. Negate sense of condition. Used in 
+                             # break if .. and break unless ..
+                             # breakpoint
     @@next_id = 1
 
     BRKPT_DEFAULT_SETTINGS = {
       :condition => 'true',
       :enabled   => 'true',
       :ignore    =>  0,
+      :negate    =>  false,
       :temp      =>  false,
       :event     =>  :Unknown,
     } unless defined?(BRKPT_DEFAULT_SETTINGS)
@@ -106,7 +110,7 @@ class Trepan
     end
 
     def condition?(bind)
-      if eval(@condition, bind)
+      if @negate != eval(@condition, bind)
         if @ignore > 0
           @ignore -= 1
           return false

data/app/brkptmgr.rb

@@ -9,6 +9,10 @@ class Trepan
     attr_reader :set
 
     def initialize
+      clear
+    end
+
+    def clear
       @list = []
       @set = Set.new
     end
@@ -19,6 +23,7 @@ class Trepan
         bp.related_bp.each { |bp| bp.remove! }
         bp.remove!
       end
+      clear
     end
 
     def <<(brkpt)

data/app/cmd_parse.kpeg

@@ -0,0 +1,225 @@
+# -*- Ruby -*-
+
+%% {
+##################################################### 
+  # Structure to hold composite method names
+  SymbolEntry = Struct.new(:type, :name, :chain)
+
+
+  # Structure to hold position information
+  Position = Struct.new(:container_type, :container,
+                       :position_type,  :position)
+
+  # Structure to hold breakpoint information
+  Breakpoint = Struct.new(:position, :negate, :condition)
+
+  # Structure to hold list information
+  List = Struct.new(:position, :num)
+
+   }
+#####################################################
+
+      upcase_letter = /[A-Z]/
+    downcase_letter = /[a-z]/
+      suffix_letter = /[=!?]/ 
+             letter = upcase_letter
+                    | downcase_letter
+          id_symbol = letter | "_" | [0-9]
+
+
+# An variable or a method identifier
+# Examples: 
+#   var1
+#   my_var? 
+# But not: Variable or @var
+vm_identifier = < (downcase_letter | "_") id_symbol* suffix_letter? >
+    { 
+      SymbolEntry.new(:variable, text)
+    }
+
+# Examples: 
+#   var1
+# But not: my_var?, my_var! 
+variable_identifier = < (downcase_letter | "_") id_symbol* >
+    { 
+      SymbolEntry.new(:variable, text)
+    }
+
+# Examples: 
+#   MY_CONSTANT
+#   MyConstant_01
+# But not:
+#   MyConstant_01?
+constant_identifier = < upcase_letter id_symbol* >
+    { 
+      SymbolEntry.new(:constant, text)
+    }
+
+# Examples:
+#   $global_variable
+# We won't try for funny global names like $$, $? $:, $', etc
+global_identifier = < "$" (constant_identifier | variable_identifier) >
+    {
+      SymbolEntry.new(:global, text)
+    }
+
+# Examples: 
+#   Foo
+#   foo
+# But not:
+#   foo!, @foo, Class.foo
+local_internal_identifier = constant_identifier | variable_identifier
+
+# Examples: 
+#   Foo, foo, foo!
+#   foo
+# But not:
+#   @foo, Class.foo
+local_identifier = constant_identifier | vm_identifier
+
+# Example: @foo
+instance_identifier = < '@' local_identifier >
+    {
+      SymbolEntry.new(:instance, text)
+    }     
+
+
+# Example: @@foo
+classvar_identifier = ('@@' local_identifier:id )
+    {
+     SymbolEntry.new(:classvar, id)
+    }     
+
+identifier = global_identifier 
+       | instance_identifier 
+       | classvar_identifier 
+       | local_identifier 
+
+id_separator = < '::'|'.' > { text }
+
+# Like of class_module_chain *after* the first name. So we don't
+# allow sigils in the initial id. That is we don't allow:
+#   Class.@name1.@@name2.$name3  
+# But we do allow final sigils:
+#   class.name!, class.name=
+internal_class_module_chain = 
+    < local_internal_identifier:parent id_separator:sep  
+      internal_class_module_chain:child >
+      {
+         SymbolEntry.new(parent.type, text, [parent, child, sep])
+      }
+    | local_identifier
+
+
+# I think strict Ruby rules are that once one goes from :: to .
+# There is no going back. That is, A.B::C is invalid. 
+# 
+# Also I think method names can't be constants. But such 
+# subtleties we'll handle when we process the final structure.
+# Examples:
+#  Object, A::B, A.b @@foo.bar, $foo.bar.baz? 
+
+class_module_chain = 
+    < identifier:parent id_separator:sep  internal_class_module_chain:child >
+       {
+         SymbolEntry.new(parent.type, text, [parent, child, sep])
+      }
+    | identifier
+
+##############################################################
+# Location-specific things. This is used in conjunction with
+# method-like things above.
+          sp     = /[ \t]/
+           -     = sp+
+     dbl_escapes = "\\\"" { '"' }
+                 | "\\n"  { "\n" }
+                 | "\\t"  { "\t" }
+                 | "\\\\" { "\\" }
+     escapes    = "\\\"" { '"' }
+                 | "\\n"  { "\n" }
+                 | "\\t"  { "\t" }
+                 | "\\ "  { " " }
+                 | "\\:"  { ":" }
+                 | "\\\\" { "\\" }
+   dbl_seq       = < /[^\\"]+/ > { text }
+   dbl_not_quote = (dbl_escapes | dbl_seq)+:ary { ary }
+      dbl_string = "\"" dbl_not_quote:ary "\"" { ary.join }
+not_space_colon  = escapes 
+                 | < /[^ \t\n:]/ > { text }
+not_space_colons = ( not_space_colon )+:ary { ary.join }
+    filename    = dbl_string | not_space_colons
+file_pos_sep    = sp+ | ':'
+     integer    = </[0-9]+/> { text.to_i }
+ line_number    = integer
+
+vm_offset = '@' integer:int
+  {
+    Position.new(nil, nil, :offset, int)
+  }
+
+# Examples:
+#  @43
+#  5
+position = 
+  vm_offset 
+  | line_number:l { 
+  Position.new(nil, nil, :line, l) 
+}
+
+file_colon_line = file_no_colon:file &{ File.exist?(file) } ':' position:pos { 
+  Position.new(:file, file, pos.position_type, pos.position) 
+}
+
+# Examples:
+#   Myclass.fn @5  # bytecode offset 5 of fn
+#   Myclass.fn:@5  # same as above
+#   Myclass.fn 5   # line number 5 of fn
+# Note: Myclass.fn could be either a filename or a method name
+
+# The below ordering is important. 
+# 1. Numbers can't be method names they are first. If there's a 
+#    file with that name, later we'll allow quoting to indicate filename.
+# 2. filename:position can't also be a method so that's next
+# 3. It is possible a filename can be a method name, but we
+#    test using File.exist? so we want to put this first.
+#    Later "quoting" will skip the File.exist?
+# 4. Class module *with* a position is next and has to be before
+#    without a position, else we would stop early before handling
+#    the position.
+
+location = 
+   position 
+ | <filename>:file &{ File.exist?(file) } file_pos_sep position:pos {
+      Position.new(:file, file, pos.position_type, pos.position)
+    }
+ | <filename>:file &{ File.exist?(file) } {
+      Position.new(:file, file, nil, nil)
+    }
+ | class_module_chain?:fn file_pos_sep position:pos {
+      Position.new(:fn, fn, pos.position_type, pos.position)
+    }
+ | class_module_chain?:fn  {
+      Position.new(:fn, fn, nil, nil)
+    }
+
+if_unless = <"if" | "unless"> { text }
+condition = </.+/> { text}
+
+breakpoint_stmt_no_condition = location:loc  {
+  Breakpoint.new(loc, false, 'true')
+}
+
+# Note that the first word "break" is handled in the command.
+# Also, "break" with nothing else is handled there as well
+breakpoint_stmt = location:loc - if_unless:iu - condition:cond {
+     Breakpoint.new(loc, iu == 'unless', cond)
+}
+ | breakpoint_stmt_no_condition
+
+# Note that the first word "list", "list>" or handled in
+# the command.  Also, "list" with nothing else is
+# handled there as well
+list_special_targets = <'.' '-'> { text }
+list_stmt = (list_special_target | location):loc - (integer:int)? {
+  List.new(loc, int)
+}