[Nice-commit] Nice/src/nice/tools/doc document.nice,1.3,1.4 htmlwriter.nice,1.25,1.26

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

Update of /cvsroot/nice/Nice/src/nice/tools/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7541/F:/nice/src/nice/tools/doc

Modified Files:
	document.nice htmlwriter.nice 
Log Message:
Converted ClassDefinition. (patch by Luc Perrin)

Index: htmlwriter.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/doc/htmlwriter.nice,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** htmlwriter.nice	10 Oct 2004 13:19:32 -0000	1.25
--- htmlwriter.nice	25 Nov 2004 19:28:17 -0000	1.26
***************
*** 16,20 ****
      //println("Formal Parameters: " + m.formalParameters());
  
! import bossa.syntax.*;
  import java.util.*;
  import java.text.*;
--- 16,20 ----
      //println("Formal Parameters: " + m.formalParameters());
  
! import bossa.syntax;
  import java.util.*;
  import java.text.*;
***************
*** 41,45 ****
    }
  
!   write(ClassDefinition.Class c, packageName) {
      // Here we handle classes
      
--- 41,45 ----
    }
  
!   write(TypeDefinition c, packageName) {
      // Here we handle classes
      
***************
*** 66,71 ****
  
      //Print hierarchy
!     ArrayList<ClassDefinition.Class> list = new ArrayList();
!     ?ClassDefinition.Class superClass = c.getSuperClassDefinition();
      while(superClass != null) {
        list.add(superClass);
--- 66,71 ----
  
      //Print hierarchy
!     ArrayList<TypeDefinition> list = new ArrayList();
!     ?ClassDefinition superClass = c.getSuperClassDefinition();
      while(superClass != null) {
        list.add(superClass);
***************
*** 91,99 ****
  
      //Implemented interfaces
!     ClassDefinition.Interface[?] interfaces = c.getImplementedInterfaces();
      if(interfaces != null && interfaces.length > 0) {
        writer.write("<b>Implemented interfaces:</b>\n");
        writer.write("<ul>\n");
!       interfaces.foreach(ClassDefinition.Interface i => 
    		         writer.write("<li>" + htmlEncode(i.getName()) + "</li>\n"));
        writer.write("</ul>\n");
--- 91,99 ----
  
      //Implemented interfaces
!     InterfaceDefinition[?] interfaces = c.getImplementedInterfaces();
      if(interfaces != null && interfaces.length > 0) {
        writer.write("<b>Implemented interfaces:</b>\n");
        writer.write("<ul>\n");
!       interfaces.foreach(InterfaceDefinition i =>
    		         writer.write("<li>" + htmlEncode(i.getName()) + "</li>\n"));
        writer.write("</ul>\n");
***************
*** 247,251 ****
        for(Definition d : p.getDefinitions().definitions()) {
          //we only display information about these types
!         if(d instanceof ClassDefinition.Class ||
             d instanceof MethodDeclaration ||
             d instanceof DefaultMethodImplementation ||
--- 247,251 ----
        for(Definition d : p.getDefinitions().definitions()) {
          //we only display information about these types
!         if(d instanceof TypeDefinition ||
             d instanceof MethodDeclaration ||
             d instanceof DefaultMethodImplementation ||
***************
*** 307,311 ****
              
        //we need to separate class, methods, and global variables
!       (ArrayList<ClassDefinition.Class> classes,
         ArrayList<MethodDeclaration> methods,
         ArrayList<GlobalVarDeclaration> globalVars) = separateDefinitions(p.getDefinitions().definitions());
--- 307,311 ----
              
        //we need to separate class, methods, and global variables
!       (ArrayList<TypeDefinition> classes,
         ArrayList<MethodDeclaration> methods,
         ArrayList<GlobalVarDeclaration> globalVars) = separateDefinitions(p.getDefinitions().definitions());
***************
*** 315,319 ****
          writer.write("<b>Classes:</b>\n");
          writer.write("<ul>\n");
!         for(ClassDefinition.Class c : classes) {
              String s = c.getName().toString();
              int index = s.lastIndexOf('.');
--- 315,319 ----
          writer.write("<b>Classes:</b>\n");
          writer.write("<ul>\n");
!         for(TypeDefinition c : classes) {
              String s = c.getName().toString();
              int index = s.lastIndexOf('.');
***************
*** 534,545 ****
   * method declarations, and global variable declarations.
   */
! (ArrayList<ClassDefinition.Class>,
   ArrayList<MethodDeclaration>,
   ArrayList<GlobalVarDeclaration>) separateDefinitions(List<Definition> definitions) {
!     ArrayList<ClassDefinition.Class> classes = new ArrayList();
      ArrayList<MethodDeclaration> methods = new ArrayList();
      ArrayList<GlobalVarDeclaration> globalVars = new ArrayList();
      for(Definition d : definitions) {
!         if(d instanceof ClassDefinition.Class) {
            classes.add(d);
          }
--- 534,545 ----
   * method declarations, and global variable declarations.
   */
! (ArrayList<TypeDefinition>,
   ArrayList<MethodDeclaration>,
   ArrayList<GlobalVarDeclaration>) separateDefinitions(List<Definition> definitions) {
!     ArrayList<TypeDefinition> classes = new ArrayList();
      ArrayList<MethodDeclaration> methods = new ArrayList();
      ArrayList<GlobalVarDeclaration> globalVars = new ArrayList();
      for(Definition d : definitions) {
!         if(d instanceof TypeDefinition) {
            classes.add(d);
          }
***************
*** 568,572 ****
    StringBuffer buffer = new StringBuffer();
    //we need to separate class, methods, and global variables
!   (ArrayList<ClassDefinition.Class> classes,
     ArrayList<MethodDeclaration> methods,
     ArrayList<GlobalVarDeclaration> globalVars) = separateDefinitions(definitions);
--- 568,572 ----
    StringBuffer buffer = new StringBuffer();
    //we need to separate class, methods, and global variables
!   (ArrayList<TypeDefinition> classes,
     ArrayList<MethodDeclaration> methods,
     ArrayList<GlobalVarDeclaration> globalVars) = separateDefinitions(definitions);
***************
*** 582,586 ****
      buffer.append("    <span id=\"" file.getName() "Classes\" style=\"display: none;\">\n");
      buffer.append("    <ul>\n");
!     for(ClassDefinition.Class c : classes) {
        String s = c.getName().toString();
        int index = s.lastIndexOf('.');
--- 582,586 ----
      buffer.append("    <span id=\"" file.getName() "Classes\" style=\"display: none;\">\n");
      buffer.append("    <ul>\n");
!     for(TypeDefinition c : classes) {
        String s = c.getName().toString();
        int index = s.lastIndexOf('.');

Index: document.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/doc/document.nice,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** document.nice	31 Jul 2004 08:10:05 -0000	1.3
--- document.nice	25 Nov 2004 19:28:16 -0000	1.4
***************
*** 7,11 ****
  */
  
! import bossa.syntax.*;
  
  class Documenter {
--- 7,11 ----
  */
  
! import bossa.syntax;
  
  class Documenter {
***************
*** 37,41 ****
    }
  
!   document(ClassDefinition.Class c)
    {
      // Here we handle classes
--- 37,41 ----
    }
  
!   document(TypeDefinition c)
    {
      // Here we handle classes
***************
*** 47,53 ****
        println("  extends " + superClass.getName());
  
!     ClassDefinition.Interface[?] interfaces = c.getImplementedInterfaces();
      if (interfaces != null)
!       interfaces.foreach(ClassDefinition.Interface i => 
  		         println("  implements " + i.getName()));
    }
--- 47,53 ----
        println("  extends " + superClass.getName());
  
!     InterfaceDefinition[?] interfaces = c.getImplementedInterfaces();
      if (interfaces != null)
!       interfaces.foreach(InterfaceDefinition i =>
  		         println("  implements " + i.getName()));
    }