public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
From: swagiaal@sourceware.org
To: frysk-cvs@sourceware.org
Subject: [SCM]  master: swagiaal: Renamed ObjectDeclarationSearchEngine.getVariable to getObjectInScope.
Date: Wed, 09 Apr 2008 20:33:00 -0000	[thread overview]
Message-ID: <20080409203325.16852.qmail@sourceware.org> (raw)

The branch, master has been updated
       via  43514553d00994f50595dfcc218884a76ba2667c (commit)
      from  1d25e6986ac84a5e5a5293638b6afa7420b83cf2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 43514553d00994f50595dfcc218884a76ba2667c
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date:   Wed Apr 9 15:25:03 2008 -0400

    swagiaal: Renamed ObjectDeclarationSearchEngine.getVariable to getObjectInScope.
    
    frysk-core/frysk/debuginfo/ChangeLog
    +2008-04-09  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +	* ObjectDeclarationSearchEngine.java: Renamed getVariable to
    +	getObjectInScope.
    +	* TestObjectDeclarationSearchEngine.java: Updated
    +	* TestGccInterface.java: Updated.
    +	* TestGccClass.java: Updated.
    +	* TestAddress.java: Updated.
    +
    
    frysk-core/frysk/expr/ChangeLog
    +2008-04-09  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +	Renamed ObjectDeclarationSearchEngine.getVariable to
    +	getObjectInScope.
    +	* TestbedSymTab.java: Updated.
    +	* ScratchSymTab.java: Updated.
    +	* ExprSymTab.java: Updated.
    +
    
    frysk-core/frysk/scopes/ChangeLog
    +2008-04-09  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +	Renamed ObjectDeclarationSearchEngine.getVariable to
    +	getObjectInScope.
    +	* TestDie.java: Updated
    +	* Subroutine.java: Updated
    +

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/debuginfo/ChangeLog               |    9 +++++++++
 .../debuginfo/ObjectDeclarationSearchEngine.java   |    9 +++++++--
 frysk-core/frysk/debuginfo/TestAddress.java        |    4 ++--
 frysk-core/frysk/debuginfo/TestGccClass.java       |    2 +-
 frysk-core/frysk/debuginfo/TestGccInterface.java   |    2 +-
 .../TestObjectDeclarationSearchEngine.java         |   10 +++++-----
 frysk-core/frysk/expr/ChangeLog                    |    8 ++++++++
 frysk-core/frysk/expr/ExprSymTab.java              |    2 +-
 frysk-core/frysk/expr/ScratchSymTab.java           |    2 +-
 frysk-core/frysk/expr/TestbedSymTab.java           |    2 +-
 frysk-core/frysk/scopes/ChangeLog                  |    7 +++++++
 frysk-core/frysk/scopes/TestDie.java               |    2 +-
 12 files changed, 44 insertions(+), 15 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
index bc1767e..e8d90ce 100644
--- a/frysk-core/frysk/debuginfo/ChangeLog
+++ b/frysk-core/frysk/debuginfo/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-09  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	* ObjectDeclarationSearchEngine.java: Renamed getVariable to 
+	getObjectInScope.
+	* TestObjectDeclarationSearchEngine.java: Updated
+	* TestGccInterface.java: Updated.
+	* TestGccClass.java: Updated.
+	* TestAddress.java: Updated.
+
 2008-04-08  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	* ObjectDeclarationSearchEngine.java: moved getSymbolDie(String input)
diff --git a/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java b/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java
index 62849b6..e1524cf 100644
--- a/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java
+++ b/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java
@@ -104,7 +104,12 @@ public class ObjectDeclarationSearchEngine implements ExprSymTab{
 	    return result;
     }
  
-    public ObjectDeclaration getVariable(String name){
+    /**
+     * Returns the object with the given name that is currently
+     * in scope. The scope is decided by the current frame
+     * object.
+     */
+    public ObjectDeclaration getObjectInScope(String name){
 	ObjectDeclaration declaredObject = null;
 	
 	Scope scope = frame.getScopes();
@@ -174,7 +179,7 @@ public class ObjectDeclarationSearchEngine implements ExprSymTab{
 	    return new Value(reg.getType(), new PieceLocation(pieces));
 	}
 	
-	ObjectDeclaration objectDeclaration = this.getVariable(s);
+	ObjectDeclaration objectDeclaration = this.getObjectInScope(s);
 	return objectDeclaration.getValue(frame);
     }
 
diff --git a/frysk-core/frysk/debuginfo/TestAddress.java b/frysk-core/frysk/debuginfo/TestAddress.java
index c05d112..426c1b1 100644
--- a/frysk-core/frysk/debuginfo/TestAddress.java
+++ b/frysk-core/frysk/debuginfo/TestAddress.java
@@ -83,7 +83,7 @@ public class TestAddress
 	
 	/* Evaluate the location of the variable.
 	 */ 
-	Variable var = (Variable) declarationSearchEngine.getVariable(variable);
+	Variable var = (Variable) declarationSearchEngine.getObjectInScope(variable);
 	DwarfDie varDie = var.getVariableDie();
 	List ops = varDie.getFormData(frame.getAdjustedAddress());
 	LocationExpression locExpr = new LocationExpression(varDie);
@@ -92,7 +92,7 @@ public class TestAddress
 
 	 /* Get the value of the address.
 	 */
-	Variable addr = (Variable) declarationSearchEngine.getVariable(address);
+	Variable addr = (Variable) declarationSearchEngine.getObjectInScope(address);
 	DwarfDie addrDie = addr.getVariableDie();
 	List opsAddr = addrDie.getFormData(frame.getAdjustedAddress());
 	LocationExpression locExprAddr = new LocationExpression(
diff --git a/frysk-core/frysk/debuginfo/TestGccClass.java b/frysk-core/frysk/debuginfo/TestGccClass.java
index 8b7797a..d50add4 100644
--- a/frysk-core/frysk/debuginfo/TestGccClass.java
+++ b/frysk-core/frysk/debuginfo/TestGccClass.java
@@ -68,7 +68,7 @@ public class TestGccClass extends TestCase {
 	log.log(this, "Got search engine: ", objectDeclarationSearchEngine);
 
 	Variable variable = (Variable) objectDeclarationSearchEngine
-		.getVariable(variableName);
+		.getObjectInScope(variableName);
 
 	assertNotNull("Variable found", variable);
 	
diff --git a/frysk-core/frysk/debuginfo/TestGccInterface.java b/frysk-core/frysk/debuginfo/TestGccInterface.java
index 9a75ce6..27f8f1a 100644
--- a/frysk-core/frysk/debuginfo/TestGccInterface.java
+++ b/frysk-core/frysk/debuginfo/TestGccInterface.java
@@ -59,7 +59,7 @@ public class TestGccInterface extends TestLib {
 		frame);
 
 	Variable variable = (Variable) objectDeclarationSearchEngine
-		.getVariable(variableName);
+		.getObjectInScope(variableName);
 
 	assertNotNull("Variable found", variable);
 
diff --git a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
index b7e93eb..5eb82ae 100644
--- a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
+++ b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
@@ -121,7 +121,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
     	DebugInfoFrame frame = DebugInfoStackFactory.createVirtualStackTrace(task);
     	objectDeclarationSearchEngine = new ObjectDeclarationSearchEngine(frame);
     	
-    	ObjectDeclaration declaredObject = objectDeclarationSearchEngine.getVariable(variableName);
+    	ObjectDeclaration declaredObject = objectDeclarationSearchEngine.getObjectInScope(variableName);
  
     	assertEquals("Object has the correct name", declaredObject.getName(), variableName);
 
@@ -176,7 +176,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
 	Task task = (new DaemonBlockedAtSignal(fileName)).getMainTask();
 	DebugInfoFrame frame = DebugInfoStackFactory.createVirtualStackTrace(task);
 	objectDeclarationSearchEngine = new ObjectDeclarationSearchEngine(frame);
-	ObjectDeclaration objectDeclaration = (ObjectDeclaration) objectDeclarationSearchEngine.getVariable(variableName);
+	ObjectDeclaration objectDeclaration = (ObjectDeclaration) objectDeclarationSearchEngine.getObjectInScope(variableName);
 
 	assertNotNull("Variable found", objectDeclaration);
 	assertEquals("Correct name", variableName, objectDeclaration.getName() );
@@ -184,7 +184,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
 	
 	//Negative test:
 	try {
-	    objectDeclaration = (Variable) objectDeclarationSearchEngine.getVariable("NOT"+variableName);
+	    objectDeclaration = (Variable) objectDeclarationSearchEngine.getObjectInScope("NOT"+variableName);
 	    assertTrue("Exception was not thrown", false);
 	} catch (ObjectDeclarationNotFoundException e) {
 	    // exception was thrown
@@ -220,7 +220,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
 	DebugInfoFrame frame = DebugInfoStackFactory.createVirtualStackTrace(task);
 	assertNotNull("frame object created",  frame);
 	objectDeclarationSearchEngine = new ObjectDeclarationSearchEngine(frame);
-	ObjectDeclaration objectDeclaration = (ObjectDeclaration) objectDeclarationSearchEngine.getVariable(variableName);
+	ObjectDeclaration objectDeclaration = (ObjectDeclaration) objectDeclarationSearchEngine.getObjectInScope(variableName);
 
 	assertNotNull("Variable found", objectDeclaration);
 	assertEquals("Correct name", variableName, objectDeclaration.getName() );
@@ -228,7 +228,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
 	
 	//Negative test:
 	try {
-	    objectDeclaration = (Variable) objectDeclarationSearchEngine.getVariable("NOT"+variableName);
+	    objectDeclaration = (Variable) objectDeclarationSearchEngine.getObjectInScope("NOT"+variableName);
 	    assertTrue("Exception was not thrown", false);
 	} catch (ObjectDeclarationNotFoundException e) {
 	    // exception was thrown
diff --git a/frysk-core/frysk/expr/ChangeLog b/frysk-core/frysk/expr/ChangeLog
index d4b600c..b718896 100644
--- a/frysk-core/frysk/expr/ChangeLog
+++ b/frysk-core/frysk/expr/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-09  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	Renamed ObjectDeclarationSearchEngine.getVariable to 
+	getObjectInScope.
+	* TestbedSymTab.java: Updated. 
+	* ScratchSymTab.java: Updated.
+	* ExprSymTab.java: Updated.
+
 2008-04-04  Sami Wagiaalla  <swagiaal@redhat.com> 
 
 	* ExprSymTab.java: Removed getValue().
diff --git a/frysk-core/frysk/expr/ExprSymTab.java b/frysk-core/frysk/expr/ExprSymTab.java
index 5cde7cc..adfa122 100644
--- a/frysk-core/frysk/expr/ExprSymTab.java
+++ b/frysk-core/frysk/expr/ExprSymTab.java
@@ -56,7 +56,7 @@ public interface ExprSymTab
     /**
      * Lookup S, assuming S is a variable.
      */
-    ObjectDeclaration getVariable(String s);
+    ObjectDeclaration getObjectInScope(String s);
     /**
      * The byte order to use when creating new values.
      */
diff --git a/frysk-core/frysk/expr/ScratchSymTab.java b/frysk-core/frysk/expr/ScratchSymTab.java
index 3ca680b..6690b27 100644
--- a/frysk-core/frysk/expr/ScratchSymTab.java
+++ b/frysk-core/frysk/expr/ScratchSymTab.java
@@ -58,7 +58,7 @@ public class ScratchSymTab implements ExprSymTab {
     /**
      * Lookup S, assuming S is a variable.
      */
-    public ObjectDeclaration getVariable(String s) {
+    public ObjectDeclaration getObjectInScope(String s) {
 	throw new RuntimeException("no variables");
     }
     /**
diff --git a/frysk-core/frysk/expr/TestbedSymTab.java b/frysk-core/frysk/expr/TestbedSymTab.java
index 51ee12e..d4bdf2a 100644
--- a/frysk-core/frysk/expr/TestbedSymTab.java
+++ b/frysk-core/frysk/expr/TestbedSymTab.java
@@ -95,7 +95,7 @@ class TestbedSymTab implements ExprSymTab {
     /**
      * Lookup S, assuming S is a variable.
      */
-    public ObjectDeclaration getVariable(String s) {
+    public ObjectDeclaration getObjectInScope(String s) {
 	throw new RuntimeException("no variables");
     }
     /**
diff --git a/frysk-core/frysk/scopes/ChangeLog b/frysk-core/frysk/scopes/ChangeLog
index aa6748f..1e52e78 100644
--- a/frysk-core/frysk/scopes/ChangeLog
+++ b/frysk-core/frysk/scopes/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-09  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	Renamed ObjectDeclarationSearchEngine.getVariable to 
+	getObjectInScope.
+	* TestDie.java: Updated 
+	* Subroutine.java: Updated
+
 2008-04-01  Andrew Cagney  <cagney@redhat.com>
 
 	* Variable.java: Move to here from frysk.value.Variable.
diff --git a/frysk-core/frysk/scopes/TestDie.java b/frysk-core/frysk/scopes/TestDie.java
index 58e2c23..f6fc9ea 100644
--- a/frysk-core/frysk/scopes/TestDie.java
+++ b/frysk-core/frysk/scopes/TestDie.java
@@ -71,7 +71,7 @@ public class TestDie
 	DebugInfoFrame frame = DebugInfoStackFactory.createDebugInfoStackTrace(task);
 	ObjectDeclarationSearchEngine objectDeclarationSearchEngine = new ObjectDeclarationSearchEngine(frame);
 	
-	Variable variable = (Variable) objectDeclarationSearchEngine.getVariable("first");
+	Variable variable = (Variable) objectDeclarationSearchEngine.getObjectInScope("first");
 	
 	assertNotNull("Variable found", variable);
 	


hooks/post-receive
--
frysk system monitor/debugger


                 reply	other threads:[~2008-04-09 20:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080409203325.16852.qmail@sourceware.org \
    --to=swagiaal@sourceware.org \
    --cc=frysk-cvs@sourceware.org \
    --cc=frysk@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).