add currentData and currentInstruction variables

CHANGELOG.md

@@ -5,10 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [4.0.0] - 2024-07-06
+## [4.0.0] - 2024-07-07
 ### Added
- - Current function interpreter variables with the function containing the
-   current address.
+ - Current function, data, and instruction interpreter variables.
 
 ### Changed
  - Upgrade to JRuby 9.4.7.0 (Ruby 3.1.4)

src/main/help/help/topics/Clojure/interpreter.html

@@ -33,13 +33,15 @@ <H2>Environment</H2>
     environments are also available in the Clojure interpreter as global
     variables, both for interactive sessions and scripts. There are also some
     extra variables for commonly needed values such as the current function.
-    These are all added to the ghidra namespace:
+    These are all added to the ghidra namespace.
     </P>
 
     <PRE>
     ghidra/current-address
+    ghidra/current-data
     ghidra/current-function
     ghidra/current-highlight
+    ghidra/current-instruction
     ghidra/current-location
     ghidra/current-program
     ghidra/current-selection

src/main/help/help/topics/Groovy/interpreter.html

@@ -35,8 +35,10 @@ <H2>Environment</H2>
 
     <PRE>
     currentAddress
+    currentData
     currentFunction
     currentHighlight
+    currentInstruction
     currentLocation
     currentProgram
     currentSelection

src/main/help/help/topics/JShell/interpreter.html

@@ -38,8 +38,10 @@ <H2>Environment</H2>
 
     <PRE>
     currentAddress
+    currentData
     currentFunction
     currentHighlight
+    currentInstruction
     currentLocation
     currentProgram
     currentSelection

src/main/help/help/topics/Kotlin/interpreter.html

@@ -35,8 +35,10 @@ <H2>Environment</H2>
 
     <PRE>
     currentAddress
+    currentData
     currentFunction
     currentHighlight
+    currentInstruction
     currentLocation
     currentProgram
     currentSelection

src/main/help/help/topics/Ruby/interpreter.html

@@ -41,8 +41,10 @@ <H2>Environment</H2>
 
     <PRE>
     $current_address
+    $current_data
     $current_function
     $current_highlight
+    $current_instruction
     $current_location
     $current_program
     $current_selection

src/main/java/com/goatshriek/rubydragon/GhidraInterpreter.java

@@ -124,6 +124,17 @@ public String getCurrentAPIName() {
 		return "currentAPI";
 	}
 
+	/**
+	 * The default name for the current data variable.
+	 *
+	 * @return The default name for the current data variable.
+	 *
+	 * @since 4.0.0
+	 */
+	public String getCurrentDataName() {
+		return "currentData";
+	}
+
 	/**
 	 * The default name for the current function variable.
 	 *
@@ -146,6 +157,17 @@ public String getCurrentHighlightName() {
 		return "currentHighlight";
 	}
 
+	/**
+	 * The default name for the current instruction variable.
+	 *
+	 * @return The default name for the current instruction variable.
+	 *
+	 * @since 4.0.0
+	 */
+	public String getCurrentInstructionName() {
+		return "currentInstruction";
+	}
+
 	/**
 	 * The default name for the current location variable.
 	 *
@@ -306,7 +328,11 @@ public void setStreams(InterpreterConsole console) {
 	 */
 	public void updateAddress(Address address) {
 		setVariable(getCurrentAddressName(), address);
-		setVariable(getCurrentFunctionName(), api.getFunctionContaining(address));
+		if (api != null) {
+			setVariable(getCurrentDataName(), api.getDataContaining(address));
+			setVariable(getCurrentFunctionName(), api.getFunctionContaining(address));
+			setVariable(getCurrentInstructionName(), api.getInstructionContaining(address));
+		}
 	}
 
 	/**

src/main/java/com/goatshriek/rubydragon/clojure/ClojureGhidraInterpreter.java

@@ -142,6 +142,18 @@ public String getCurrentAPIName() {
 		return "current-api";
 	}
 
+	/**
+	 * The name for the current data variable.
+	 *
+	 * @return The name for the current data variable.
+	 *
+	 * @since 4.0.0
+	 */
+	@Override
+	public String getCurrentDataName() {
+		return "current-data";
+	}
+
 	/**
 	 * The name for the current function variable.
 	 *
@@ -166,6 +178,18 @@ public String getCurrentHighlightName() {
 		return "current-highlight";
 	}
 
+	/**
+	 * The name for the current instruction variable.
+	 *
+	 * @return The name for the current instruction variable.
+	 *
+	 * @since 4.0.0
+	 */
+	@Override
+	public String getCurrentInstructionName() {
+		return "current-instruction";
+	}
+
 	/**
 	 * The name for the current location variable.
 	 *

src/main/java/com/goatshriek/rubydragon/ruby/RubyGhidraInterpreter.java

@@ -167,6 +167,18 @@ public String getCurrentAPIName() {
 		return "$current_api";
 	}
 
+	/**
+	 * The name for the current data variable.
+	 *
+	 * @return The name for the current data variable.
+	 *
+	 * @since 4.0.0
+	 */
+	@Override
+	public String getCurrentDataName() {
+		return "$current_data";
+	}
+
 	/**
 	 * The name for the current function variable.
 	 *
@@ -191,6 +203,18 @@ public String getCurrentHighlightName() {
 		return "$current_highlight";
 	}
 
+	/**
+	 * The name for the current data variable.
+	 *
+	 * @return The name for the current data variable.
+	 *
+	 * @since 4.0.0
+	 */
+	@Override
+	public String getCurrentInstructionName() {
+		return "$current_data";
+	}
+
 	/**
 	 * The name for the current location variable.
 	 *