Consistency.

Author: samuel-williams-shopify

context/index.yaml

@@ -12,7 +12,7 @@ files:
     programs and core dumps with GDB or LLDB.
 - path: object-inspection.md
   title: Object Inspection
-  description: This guide explains how to use `rb-object-print` to inspect Ruby objects,
+  description: This guide explains how to use `rb-print` to inspect Ruby objects,
     hashes, arrays, and structs in GDB.
 - path: stack-inspection.md
   title: Stack Inspection

data/toolbox/context.py

@@ -284,8 +284,8 @@ def invoke(self, arguments, terminal):
 
 			print()
 			print("Now you can use:")
-			print("  rb-object-print $errinfo")
-			print("  rb-object-print $ec->cfp->sp[-1]")
+			print("  rb-print $errinfo")
+			print("  rb-print $ec->cfp->sp[-1]")
 			print("  rb-stack-trace")
 
 		except Exception as e:

data/toolbox/debugger/gdb_backend.py

@@ -312,7 +312,7 @@ def __init__(self, name, category=COMMAND_DATA):
 		"""Initialize and register a command.
 		
 		Args:
-			name: Command name (e.g., "rb-object-print")
+			name: Command name (e.g., "rb-print")
 			category: Command category (COMMAND_DATA or COMMAND_USER)
 		"""
 		self.name = name
@@ -597,7 +597,7 @@ def register(name, handler_class, usage=None, category=COMMAND_USER):
 	and delegates to the handler class for actual command logic.
 	
 	Args:
-		name: Command name (e.g., "rb-object-print")
+		name: Command name (e.g., "rb-print")
 		handler_class: Class to instantiate for handling the command
 		usage: Optional command.Usage specification for validation/help
 		category: Command category (COMMAND_USER, etc.)

data/toolbox/debugger/lldb_backend.py

@@ -428,7 +428,7 @@ def __init__(self, name, category=COMMAND_DATA):
 		"""Initialize and register a command.
 		
 		Args:
-			name: Command name (e.g., "rb-object-print")
+			name: Command name (e.g., "rb-print")
 			category: Command category (not used in LLDB)
 		"""
 		self.name = name
@@ -538,8 +538,8 @@ def set_convenience_variable(name, value):
 		name: Variable name (without $ prefix)
 		value: Value to set (can be Value wrapper or native value)
 	
-	Note: LLDB doesn't have direct convenience variables like GDB.
-	This implementation uses expression evaluation to set variables.
+	Note: LLDB convenience variables are created using expression evaluation.
+	The variable name will be prefixed with $ automatically.
 	"""
 	if isinstance(value, Value):
 		native_value = value._value
@@ -549,16 +549,45 @@ def set_convenience_variable(name, value):
 	# LLDB approach: use expression to create a persistent variable
 	# Variables in LLDB are prefixed with $
 	target = lldb.debugger.GetSelectedTarget()
-	frame = target.GetProcess().GetSelectedThread().GetSelectedFrame()
+	if not target:
+		return
 
-	# Create a persistent variable by evaluating an expression
+	process = target.GetProcess()
+	if not process:
+		return
+	
+	thread = process.GetSelectedThread()
+	if not thread:
+		return
+	
+	frame = thread.GetSelectedFrame()
+	if not frame:
+		return
+	
+	# Create a persistent variable by evaluating an assignment expression
 	if hasattr(native_value, 'GetValue'):
 		# It's an SBValue
 		addr = native_value.GetValueAsUnsigned()
 		type_name = native_value.GetType().GetName()
-		frame.EvaluateExpression(f"({type_name})0x{addr:x}", lldb.SBExpressionOptions())
-	# For now, simplified implementation
-	# Full implementation would require more complex value handling
+		
+		# Use expr command to create persistent variable
+		# Format: expr <type> $varname = (<type>)address
+		expr = f"{type_name} ${name} = ({type_name})0x{addr:x}"
+		
+		options = lldb.SBExpressionOptions()
+		options.SetIgnoreBreakpoints(True)
+		options.SetFetchDynamicValue(lldb.eNoDynamicValues)
+		options.SetTimeoutInMicroSeconds(100000)  # 0.1 second timeout
+		options.SetTryAllThreads(False)
+		
+		# Evaluate the expression to create the persistent variable
+		result = frame.EvaluateExpression(expr, options)
+		
+		# Check for errors
+		if result.GetError().Fail():
+			error_msg = result.GetError().GetCString()
+			# Silently ignore errors for now - convenience variables are optional
+			pass
 
 
 def execute(command, from_tty=False, to_string=False):
@@ -894,7 +923,7 @@ def register(name, handler_class, usage=None, category=COMMAND_USER):
 	and delegates to the handler class for actual command logic.
 	
 	Args:
-		name: Command name (e.g., "rb-object-print")
+		name: Command name (e.g., "rb-print")
 		handler_class: Class to instantiate for handling the command
 		usage: Optional command.Usage specification for validation/help
 		category: Command category (COMMAND_USER, etc.)

data/toolbox/rbasic.py

@@ -29,39 +29,39 @@ def is_type(value, ruby_type_constant):
 
 # Map of type constants to their names for display
 TYPE_NAMES = {
-	'RUBY_T_NONE': 'None',
-	'RUBY_T_OBJECT': 'Object',
-	'RUBY_T_CLASS': 'Class',
-	'RUBY_T_MODULE': 'Module',
-	'RUBY_T_FLOAT': 'Float',
-	'RUBY_T_STRING': 'String',
-	'RUBY_T_REGEXP': 'Regexp',
-	'RUBY_T_ARRAY': 'Array',
-	'RUBY_T_HASH': 'Hash',
-	'RUBY_T_STRUCT': 'Struct',
-	'RUBY_T_BIGNUM': 'Bignum',
-	'RUBY_T_FILE': 'File',
-	'RUBY_T_DATA': 'Data',
-	'RUBY_T_MATCH': 'Match',
-	'RUBY_T_COMPLEX': 'Complex',
-	'RUBY_T_RATIONAL': 'Rational',
-	'RUBY_T_NIL': 'Nil',
-	'RUBY_T_TRUE': 'True',
-	'RUBY_T_FALSE': 'False',
-	'RUBY_T_SYMBOL': 'Symbol',
-	'RUBY_T_FIXNUM': 'Fixnum',
-	'RUBY_T_UNDEF': 'Undef',
-	'RUBY_T_IMEMO': 'IMemo',
-	'RUBY_T_NODE': 'Node',
-	'RUBY_T_ICLASS': 'IClass',
-	'RUBY_T_ZOMBIE': 'Zombie',
+	'RUBY_T_NONE': 'T_NONE',
+	'RUBY_T_OBJECT': 'T_OBJECT',
+	'RUBY_T_CLASS': 'T_CLASS',
+	'RUBY_T_MODULE': 'T_MODULE',
+	'RUBY_T_FLOAT': 'T_FLOAT',
+	'RUBY_T_STRING': 'T_STRING',
+	'RUBY_T_REGEXP': 'T_REGEXP',
+	'RUBY_T_ARRAY': 'T_ARRAY',
+	'RUBY_T_HASH': 'T_HASH',
+	'RUBY_T_STRUCT': 'T_STRUCT',
+	'RUBY_T_BIGNUM': 'T_BIGNUM',
+	'RUBY_T_FILE': 'T_FILE',
+	'RUBY_T_DATA': 'T_DATA',
+	'RUBY_T_MATCH': 'T_MATCH',
+	'RUBY_T_COMPLEX': 'T_COMPLEX',
+	'RUBY_T_RATIONAL': 'T_RATIONAL',
+	'RUBY_T_NIL': 'T_NIL',
+	'RUBY_T_TRUE': 'T_TRUE',
+	'RUBY_T_FALSE': 'T_FALSE',
+	'RUBY_T_SYMBOL': 'T_SYMBOL',
+	'RUBY_T_FIXNUM': 'T_FIXNUM',
+	'RUBY_T_UNDEF': 'T_UNDEF',
+	'RUBY_T_IMEMO': 'T_IMEMO',
+	'RUBY_T_NODE': 'T_NODE',
+	'RUBY_T_ICLASS': 'T_ICLASS',
+	'RUBY_T_ZOMBIE': 'T_ZOMBIE',
 }
 
 def type_name(value):
 	"""Get the human-readable type name for a VALUE.
 	
 	Returns:
-		String like 'String', 'Array', 'Hash', etc., or 'Unknown'
+		String like 'T_STRING', 'T_ARRAY', 'T_HASH', etc., or 'Unknown(0x...)'
 	"""
 	type_flag = type_of(value)
 
@@ -85,16 +85,14 @@ def __init__(self, value):
 
 	def __str__(self):
 		type_str = type_name(self.value)
-		return f"<{type_str}:0x{int(self.value):x}>"
+		return f"<{type_str}@0x{int(self.value):x}>"
 
 	def print_to(self, terminal):
 		"""Print formatted basic object representation."""
 		type_str = type_name(self.value)
 		addr = int(self.value)
-		# Note: Using : instead of @ for basic objects
-		import format as fmt
-		terminal.print(fmt.metadata, '<', fmt.reset, fmt.type, type_str, fmt.reset, end='')
-		terminal.print(fmt.metadata, f':0x{addr:x}>', fmt.reset, end='')
+		# Use print_type_tag for consistency with other types
+		terminal.print_type_tag(type_str, addr)
 
 	def print_recursive(self, printer, depth):
 		"""Print this basic object (no recursion)."""

data/toolbox/readme.md

@@ -125,7 +125,7 @@ command script import /path/to/gem/data/toolbox/init.py
 - `rb-heap-scan [--type TYPE] [--limit N]` - Scan Ruby heap for objects
 
 ### Stack Inspection
-- `rb-stack-print` - Print Ruby stack (coming soon)
+- `rb-stack-trace` - Print combined Ruby/C stack trace
 
 ## Migration Status
 

fixtures/toolbox/gdb/context/can_get_context.txt

@@ -11,6 +11,6 @@ Convenience variables set:
   $cfp     - Control frame pointer
 
 Now you can use:
-  rb-object-print $errinfo
-  rb-object-print $ec->cfp->sp[-1]
+  rb-print $errinfo
+  rb-print $ec->cfp->sp[-1]
   rb-stack-trace

fixtures/toolbox/gdb/heap/can_find_with_numeric_type.txt

@@ -2,9 +2,9 @@ Scanning heap for type 0x..., limit=3...
 
 Found 3 object(s):
 
-  [0] $heap0 = <File:0x...>
-  [1] $heap1 = <File:0x...>
-  [2] $heap2 = <File:0x...>
+  [0] $heap0 = <T_FILE@...>
+  [1] $heap1 = <T_FILE@...>
+  [2] $heap2 = <T_FILE@...>
 
 Objects saved in $heap0 through $heap2
 Reached end of heap (no more objects to scan)

fixtures/toolbox/lldb/context/can_get_context.txt

@@ -11,6 +11,6 @@ Convenience variables set:
   $cfp     - Control frame pointer
 
 Now you can use:
-  rb-object-print $errinfo
-  rb-object-print $ec->cfp->sp[-1]
+  rb-print $errinfo
+  rb-print $ec->cfp->sp[-1]
   rb-stack-trace