[SCM] master: Rename .complete to .completeMember.

cagney@sourceware.org cagney@sourceware.org
Sun Nov 18 21:44:00 GMT 2007


The branch, master has been updated
       via  17129b1e6ff7a095f661a702e5fdcf8dd45a7436 (commit)
      from  11b29ff932127e58a13743509f930d118c25f02f (commit)

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

- Log -----------------------------------------------------------------
commit 17129b1e6ff7a095f661a702e5fdcf8dd45a7436
Author: Andrew Cagney <cagney@redhat.com>
Date:   Sun Nov 18 15:37:04 2007 -0500

    Rename .complete to .completeMember.
    
    frysk-core/frysk/expr/ChangeLog
    2007-11-18  Andrew Cagney  <cagney@redhat.com>
    
    	* IncompleteMemberException.java: Update Type.complete renamed to
    	Type.completeMember.
    
    frysk-core/frysk/value/ChangeLog
    2007-11-18  Andrew Cagney  <cagney@redhat.com>
    
    	* ArrayType.java (completeMember(String,List)): New.
    	* PointerType.java (completeMember(String,List)): New.
    	* Type.java (completeMember(String,List)): Rename
    	complete(String,List).
    	(completeFollowSym(String,List)): New.
    	* CompositeType.java: Update.

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

Summary of changes:
 frysk-core/frysk/expr/ChangeLog                    |    5 +++++
 .../frysk/expr/IncompleteMemberException.java      |    2 +-
 frysk-core/frysk/value/ArrayType.java              |    6 +++++-
 frysk-core/frysk/value/ChangeLog                   |    9 +++++++++
 frysk-core/frysk/value/CompositeType.java          |    2 +-
 frysk-core/frysk/value/PointerType.java            |    5 +++++
 frysk-core/frysk/value/Type.java                   |   11 +++++++++--
 7 files changed, 35 insertions(+), 5 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/expr/ChangeLog b/frysk-core/frysk/expr/ChangeLog
index 1908f5d..08a71da 100644
--- a/frysk-core/frysk/expr/ChangeLog
+++ b/frysk-core/frysk/expr/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-18  Andrew Cagney  <cagney@redhat.com>
+
+	* IncompleteMemberException.java: Update Type.complete renamed to
+	Type.completeMember.
+
 2007-11-17  Andrew Cagney  <cagney@redhat.com>
 
 	* IncompleteMemberException.java (complete(ExprSymTab,List)):
diff --git a/frysk-core/frysk/expr/IncompleteMemberException.java b/frysk-core/frysk/expr/IncompleteMemberException.java
index adda314..e7e585e 100644
--- a/frysk-core/frysk/expr/IncompleteMemberException.java
+++ b/frysk-core/frysk/expr/IncompleteMemberException.java
@@ -61,7 +61,7 @@ class IncompleteMemberException extends CompletionException {
     }
     int complete(ExprSymTab symTab, List candidates) {
 	if (new Expression(symTab, expression)
-	    .getType().complete(getText(),candidates))
+	    .getType().completeMember(getText(),candidates))
 	    return getColumn();
 	else
 	    return -1;
diff --git a/frysk-core/frysk/value/ArrayType.java b/frysk-core/frysk/value/ArrayType.java
index 7813722..897c9ec 100644
--- a/frysk-core/frysk/value/ArrayType.java
+++ b/frysk-core/frysk/value/ArrayType.java
@@ -42,7 +42,7 @@ package frysk.value;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.io.PrintWriter;
-
+import java.util.List;
 import frysk.debuginfo.PieceLocation;
 import inua.eio.ByteBuffer;
 
@@ -268,4 +268,8 @@ public class ArrayType
     public ArithmeticUnit getALU(int wordSize) {
 	return new AddressUnit(this, wordSize);
     }      
+
+    public boolean completeMember(String incomplete, List candidates) {
+	return type.completeMember(incomplete, candidates);
+    }
 }
diff --git a/frysk-core/frysk/value/ChangeLog b/frysk-core/frysk/value/ChangeLog
index 5cbf1f0..d30cda8 100644
--- a/frysk-core/frysk/value/ChangeLog
+++ b/frysk-core/frysk/value/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-18  Andrew Cagney  <cagney@redhat.com>
+
+	* ArrayType.java (completeMember(String,List)): New.
+	* PointerType.java (completeMember(String,List)): New.
+	* Type.java (completeMember(String,List)): Rename
+	complete(String,List).
+	(completeFollowSym(String,List)): New.
+	* CompositeType.java: Update.
+
 2007-11-17  Andrew Cagney  <cagney@redhat.com>
 
 	* CompositeType.java (complete(String,List)): New.
diff --git a/frysk-core/frysk/value/CompositeType.java b/frysk-core/frysk/value/CompositeType.java
index 2669fd4..9937d28 100644
--- a/frysk-core/frysk/value/CompositeType.java
+++ b/frysk-core/frysk/value/CompositeType.java
@@ -390,7 +390,7 @@ public abstract class CompositeType
 	return mem.getValue (var1);
     }
 
-    public boolean complete(String incomplete, List candidates) {
+    public boolean completeMember(String incomplete, List candidates) {
 	int completions = 0;
 	for (Iterator i = nameToMember.keySet().iterator(); i.hasNext(); ) {
 	    String member = (String)i.next();
diff --git a/frysk-core/frysk/value/PointerType.java b/frysk-core/frysk/value/PointerType.java
index 5b238d7..f7805d8 100644
--- a/frysk-core/frysk/value/PointerType.java
+++ b/frysk-core/frysk/value/PointerType.java
@@ -44,6 +44,7 @@ import inua.eio.ByteBuffer;
 import inua.eio.ByteOrder;
 import java.io.PrintWriter;
 import java.math.BigInteger;
+import java.util.List;
 
 /**
  * Type for a pointer (or address) of another type.
@@ -152,4 +153,8 @@ public class PointerType
     public ArithmeticUnit getALU(int wordSize) {
 	return new AddressUnit(this, wordSize);
     }
+
+    public boolean completeMember(String incomplete, List candidates) {
+	return type.completeMember(incomplete, candidates);
+    }
 }
diff --git a/frysk-core/frysk/value/Type.java b/frysk-core/frysk/value/Type.java
index e69561a..6b93e62 100644
--- a/frysk-core/frysk/value/Type.java
+++ b/frysk-core/frysk/value/Type.java
@@ -198,10 +198,17 @@ public abstract class Type {
     }
 
     /**
-     * Complete the specified string; return false if nothing
+     * Complete the type's member; return false if nothing completed.
+     */
+    public boolean completeMember(String incomplete, List candidates) {
+	return false;
+    }
+
+    /**
+     * Complete the type's next token; return false if nothing
      * completed.
      */
-    public boolean complete(String incomplete, List candidates) {
+    public boolean completeFollowSym(String incomplete, List candidates) {
 	return false;
     }
 }


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



More information about the Frysk-cvs mailing list