public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: swagiaal: Renamed Subroutine to Function.
@ 2008-04-14 20:09 swagiaal
  0 siblings, 0 replies; only message in thread
From: swagiaal @ 2008-04-14 20:09 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  78a5cfaaee5c6f95736667e265d5defe1e60ede2 (commit)
      from  f52d581e1acd78bbe6c62be4f3dd2f050e3636b7 (commit)

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

- Log -----------------------------------------------------------------
commit 78a5cfaaee5c6f95736667e265d5defe1e60ede2
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date:   Mon Apr 14 16:07:44 2008 -0400

    swagiaal: Renamed Subroutine to Function.
    
    frysk-core/frysk/debuginfo/ChangeLog
    +2008-04-14  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +	Renamed Subroutine to Function.
    +	* DebugInfoFrame.java: Updated.
    +	* TestDebugInfoStackTrace.java: Updated.
    +
    
    frysk-core/frysk/scopes/ChangeLog
    +2008-04-14  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +	* Function.java: renamed Subroutine to Function.
    +	* TestScopeFactory.java: Updated
    +	* Subprogram.java: Updated.
    +	* InlinedSubroutine.java: Updated.
    +

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

Summary of changes:
 frysk-core/frysk/debuginfo/ChangeLog               |    6 ++++++
 frysk-core/frysk/debuginfo/DebugInfoFrame.java     |    4 ++--
 frysk-core/frysk/debuginfo/TestFrameDebugInfo.java |    4 ++--
 frysk-core/frysk/scopes/ChangeLog                  |    7 +++++++
 .../scopes/{Subroutine.java => Function.java}      |    4 ++--
 frysk-core/frysk/scopes/InlinedSubroutine.java     |    2 +-
 frysk-core/frysk/scopes/Subprogram.java            |    2 +-
 frysk-core/frysk/scopes/TestScopeFactory.java      |    4 ++--
 8 files changed, 23 insertions(+), 10 deletions(-)
 rename frysk-core/frysk/scopes/{Subroutine.java => Function.java} (97%)

First 500 lines of diff:
diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
index 98204bd..b6414e4 100644
--- a/frysk-core/frysk/debuginfo/ChangeLog
+++ b/frysk-core/frysk/debuginfo/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-14  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	Renamed Subroutine to Function.
+	* DebugInfoFrame.java: Updated.
+	* TestDebugInfoStackTrace.java: Updated.
+
 2008-04-14  Andrew Cagney  <cagney@redhat.com>
 
 	* LocationExpression.java: Use frysk.config.Host.
diff --git a/frysk-core/frysk/debuginfo/DebugInfoFrame.java b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
index e208812..71a24ee 100644
--- a/frysk-core/frysk/debuginfo/DebugInfoFrame.java
+++ b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
@@ -52,7 +52,7 @@ import frysk.scopes.ScopeFactory;
 import frysk.scopes.SourceLocation;
 import frysk.scopes.SourceLocationFactory;
 import frysk.scopes.Subprogram;
-import frysk.scopes.Subroutine;
+import frysk.scopes.Function;
 import frysk.stack.Frame;
 import frysk.stack.FrameDecorator;
 
@@ -231,7 +231,7 @@ public class DebugInfoFrame extends FrameDecorator {
 	if (scope != null) {
 	    writer.print(indentString + "{");
 	    scope.toPrint(this, writer, indentString);
-	    if(!(scope.getInner() instanceof Subroutine && ((Subroutine)scope.getInner()).isInlined())){
+	    if(!(scope.getInner() instanceof Function && ((Function)scope.getInner()).isInlined())){
 		printScope(writer, scope.getInner(), indentString+" ");
 	    }
 	    writer.println(indentString+"}");
diff --git a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java
index dcd2471..c6375ef 100644
--- a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java
+++ b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java
@@ -53,7 +53,7 @@ import frysk.proc.Task;
 import frysk.scopes.LexicalBlock;
 import frysk.scopes.Scope;
 import frysk.scopes.Subprogram;
-import frysk.scopes.Subroutine;
+import frysk.scopes.Function;
 import frysk.stack.Frame;
 import frysk.stack.StackFactory;
 import frysk.testbed.DaemonBlockedAtSignal;
@@ -219,7 +219,7 @@ public class TestFrameDebugInfo extends TestLib {
     Scope scope3 = scope2.getOuter();
     
     assertTrue("lexical block scope" , scope1 instanceof LexicalBlock);
-    assertTrue("InlinedSubroutine scope" , scope2 instanceof Subroutine && ((Subroutine)scope2).isInlined());
+    assertTrue("InlinedSubroutine scope" , scope2 instanceof Function && ((Function)scope2).isInlined());
     assertTrue("lexical block scope" , scope3 instanceof Scope);
     
   }
diff --git a/frysk-core/frysk/scopes/ChangeLog b/frysk-core/frysk/scopes/ChangeLog
index 242f37d..9027826 100644
--- a/frysk-core/frysk/scopes/ChangeLog
+++ b/frysk-core/frysk/scopes/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-14  Sami Wagiaalla  <swagiaal@redhat.com> 
+
+	* Function.java: renamed Subroutine to Function. 
+	* TestScopeFactory.java: Updated
+	* Subprogram.java: Updated.
+	* InlinedSubroutine.java: Updated.
+
 2008-04-14  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	* TestScopeFactory.java: test InlinedSubroutine.
diff --git a/frysk-core/frysk/scopes/Subroutine.java b/frysk-core/frysk/scopes/Function.java
similarity index 97%
rename from frysk-core/frysk/scopes/Subroutine.java
rename to frysk-core/frysk/scopes/Function.java
index c8ffe78..8444174 100644
--- a/frysk-core/frysk/scopes/Subroutine.java
+++ b/frysk-core/frysk/scopes/Function.java
@@ -55,13 +55,13 @@ import lib.dwfl.DwarfDie;
  * In DWARF a subroutine is used to refer to an entity that can either be a
  * concrete function (Subprogram) or an inlined function (InlinedSubprogram).
  */
-public class Subroutine extends NamedScope {
+public class Function extends NamedScope {
 
     Composite struct;
     Type type;
     private LocationExpression locationExpression;
     
-    public Subroutine(DwarfDie die, TypeFactory typeFactory) {
+    public Function(DwarfDie die, TypeFactory typeFactory) {
 	super(die, typeFactory);
 	this.type = typeFactory.getType(die);
 	locationExpression = new LocationExpression(die);
diff --git a/frysk-core/frysk/scopes/InlinedSubroutine.java b/frysk-core/frysk/scopes/InlinedSubroutine.java
index 9a8b6eb..0b0086f 100644
--- a/frysk-core/frysk/scopes/InlinedSubroutine.java
+++ b/frysk-core/frysk/scopes/InlinedSubroutine.java
@@ -42,7 +42,7 @@ package frysk.scopes;
 import lib.dwfl.DwarfDie;
 import frysk.debuginfo.TypeFactory;
 
-public class InlinedSubroutine extends Subroutine{
+public class InlinedSubroutine extends Function{
 
     public InlinedSubroutine(DwarfDie die, TypeFactory typeFactory) {
 	super(die, typeFactory);
diff --git a/frysk-core/frysk/scopes/Subprogram.java b/frysk-core/frysk/scopes/Subprogram.java
index c661029..2facac1 100644
--- a/frysk-core/frysk/scopes/Subprogram.java
+++ b/frysk-core/frysk/scopes/Subprogram.java
@@ -58,7 +58,7 @@ import frysk.value.FunctionType;
 /**
  * A Subprogram refers to a concrete (not inlined) instance of a function.
  */
-public class Subprogram extends Subroutine
+public class Subprogram extends Function
 {
   // Language language;
     FunctionType functionType;
diff --git a/frysk-core/frysk/scopes/TestScopeFactory.java b/frysk-core/frysk/scopes/TestScopeFactory.java
index e03bfd5..b97f692 100644
--- a/frysk-core/frysk/scopes/TestScopeFactory.java
+++ b/frysk-core/frysk/scopes/TestScopeFactory.java
@@ -81,10 +81,10 @@ public class TestScopeFactory
 
       
       assertTrue("lexical block scope" , scope1 instanceof LexicalBlock);
-      assertTrue("InlinedSubroutine scope" , scope2 instanceof InlinedSubroutine && ((Subroutine)scope2).isInlined());
+      assertTrue("InlinedSubroutine scope" , scope2 instanceof InlinedSubroutine && ((Function)scope2).isInlined());
       assertTrue("File scope" , scope3 instanceof Scope);
       
-      assertTrue("Subprogram scope" , scope7 instanceof Subroutine && !((Subroutine)scope7).isInlined());
+      assertTrue("Subprogram scope" , scope7 instanceof Function && !((Function)scope7).isInlined());
       
       assertTrue("same object" , scope1 == scope4);
       assertTrue("same object" , scope2 == scope5);


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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-04-14 20:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-04-14 20:09 [SCM] master: swagiaal: Renamed Subroutine to Function swagiaal

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).