[Nice-commit] Nice/src/bossa/link Compilation.java,1.18,1.19 DispatchTest.java,1.1,1.2

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

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

Modified Files:
	Compilation.java DispatchTest.java 
Log Message:
Converted NiceMethod.

Index: DispatchTest.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/DispatchTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DispatchTest.java	19 Dec 2004 00:28:29 -0000	1.1
--- DispatchTest.java	19 Dec 2004 19:58:27 -0000	1.2
***************
*** 44,48 ****
    private DispatchTest() { }
  
!   public static void register(NiceMethod m)
    {
      methods.add(m);
--- 44,48 ----
    private DispatchTest() { }
  
!   public static void register(UserOperator/*NiceMethod*/ m)
    {
      methods.add(m);
***************
*** 73,77 ****
      try {
        for(Iterator i = methods.iterator(); i.hasNext();)
! 	test((NiceMethod) i.next(), module);
  
        for (Iterator i = javaMethods.iterator(); i.hasNext();)
--- 73,77 ----
      try {
        for(Iterator i = methods.iterator(); i.hasNext();)
! 	test((UserOperator/*NiceMethod*/) i.next(), module);
  
        for (Iterator i = javaMethods.iterator(); i.hasNext();)
***************
*** 83,87 ****
    }
    
!   private static void test(NiceMethod m, bossa.modules.Package module)
    {
      Stack sortedAlternatives = Alternative.sortedAlternatives(m);
--- 83,87 ----
    }
    
!   private static void test(UserOperator/*NiceMethod*/ m, bossa.modules.Package module)
    {
      Stack sortedAlternatives = Alternative.sortedAlternatives(m);
***************
*** 143,147 ****
    }
  
!   private static boolean shortTestOk(NiceMethod method, Stack alternatives)
    {
      if (alternatives.size() < 2)
--- 143,147 ----
    }
  
!   private static boolean shortTestOk(UserOperator/*NiceMethod*/ method, Stack alternatives)
    {
      if (alternatives.size() < 2)

Index: Compilation.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/Compilation.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Compilation.java	25 Nov 2004 19:28:19 -0000	1.18
--- Compilation.java	19 Dec 2004 19:58:27 -0000	1.19
***************
*** 35,39 ****
  public final class Compilation
  {
!   static void compile(NiceMethod m, 
  		      Stack sortedAlternatives, 
  		      bossa.modules.Package module)
--- 35,39 ----
  public final class Compilation
  {
!   static void compile(UserOperator/*NiceMethod*/ m, 
  		      Stack sortedAlternatives, 
  		      bossa.modules.Package module)