nice-commit

[Arjan B. <ar...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/link
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10834/F:/nice/src/bossa/link

Modified Files:
	Alternative.java Compilation.java 
Removed Files:
	DispatchTest.java 
Log Message:
Converted DispatchTest.

Index: Alternative.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/Alternative.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** Alternative.java	21 Dec 2004 01:31:13 -0000	1.60
--- Alternative.java	29 Dec 2004 16:31:01 -0000	1.61
***************
*** 83,87 ****
    }
  
!   static boolean disjoint(Alternative a, Alternative b)
    {
      for(int i = 0; i<a.patterns.length; i++)
--- 83,87 ----
    }
  
!   public static boolean disjoint(Alternative a, Alternative b)
    {
      for(int i = 0; i<a.patterns.length; i++)
***************
*** 92,96 ****
    }
  
!   static Alternative greatestLowerBound(Alternative a, Alternative b)
    {
      Pattern[] pats = new Pattern[a.patterns.length];
--- 92,96 ----
    }
  
!   public static Alternative greatestLowerBound(Alternative a, Alternative b)
    {
      Pattern[] pats = new Pattern[a.patterns.length];
***************
*** 111,115 ****
     * Tests the matching of tags against a method alternative.
     */
!   boolean matches(TypeConstructor[] tags)
    {
      for(int i = 0; i < patterns.length; i++)
--- 111,115 ----
     * Tests the matching of tags against a method alternative.
     */
!  public boolean matches(TypeConstructor[] tags)
    {
      for(int i = 0; i < patterns.length; i++)
***************
*** 120,124 ****
    }
  
!   boolean matchesTypePart(TypeConstructor[] tags, boolean[] isValue)
    {
      for(int i = 0; i < patterns.length; i++)
--- 120,124 ----
    }
  
!   public boolean matchesTypePart(TypeConstructor[] tags, boolean[] isValue)
    {
      for(int i = 0; i < patterns.length; i++)
***************
*** 129,133 ****
    }
  
!   boolean matchesValuePart(ConstantExp[] values, boolean[] isValue)
    {
      for(int i = 0; i < patterns.length; i++)
--- 129,133 ----
    }
  
!   public boolean matchesValuePart(ConstantExp[] values, boolean[] isValue)
    {
      for(int i = 0; i < patterns.length; i++)
***************
*** 138,142 ****
    }
  
!   boolean containsTypeMatchingValue()
    {
      for(int i = 0; i < patterns.length; i++)
--- 138,142 ----
    }
  
!   public boolean containsTypeMatchingValue()
    {
      for(int i = 0; i < patterns.length; i++)
***************
*** 147,151 ****
    }
  
!   boolean allAtAny()
    {
      for (int i = 0; i<patterns.length; i++)
--- 147,151 ----
    }
  
!   public boolean allAtAny()
    {
      for (int i = 0; i<patterns.length; i++)
***************
*** 195,199 ****
    }
  
!   String printLocated()
    {
      return toString();
--- 195,199 ----
    }
  
!   public String printLocated()
    {
      return toString();
***************
*** 201,205 ****
  
    String methodName;
!   Pattern[] patterns;
  
    public Pattern[] getPatterns() { return patterns; }
--- 201,205 ----
  
    String methodName;
!   public Pattern[] patterns;
  
    public Pattern[] getPatterns() { return patterns; }

--- DispatchTest.java DELETED ---

Index: Compilation.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/Compilation.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Compilation.java	19 Dec 2004 22:37:17 -0000	1.20
--- Compilation.java	29 Dec 2004 16:31:02 -0000	1.21
***************
*** 35,39 ****
  public final class Compilation
  {
!   static void compile(UserOperator/*NiceMethod*/ m, 
  		      Stack sortedAlternatives, 
  		      bossa.modules.Package module)
--- 35,39 ----
  public final class Compilation
  {
!   public static void compile(UserOperator/*NiceMethod*/ m, 
  		      Stack sortedAlternatives, 
  		      bossa.modules.Package module)
***************
*** 132,136 ****
     ****************************************************************/
  
!   static void compile(MethodDeclaration /* JavaMethod */ m,
  		      Stack sortedAlternatives, 
  		      bossa.modules.Package module)
--- 132,136 ----
     ****************************************************************/
  
!   public static void compile(MethodDeclaration /* JavaMethod */ m,
  		      Stack sortedAlternatives, 
  		      bossa.modules.Package module)