[Nice-commit] Nice/testsuite helpers.nice,1.3,1.4

[Artem Gr K. <ar...@us...>]

Update of /cvsroot/nice/Nice/testsuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13291/testsuite

Modified Files:
	helpers.nice 
Log Message:
Print source line numbers; avoid excess line breaks in writeProgram.

Index: helpers.nice
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/helpers.nice,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** helpers.nice	29 Aug 2005 11:05:19 -0000	1.3
--- helpers.nice	29 Aug 2005 12:12:46 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  
  import nice.io;
+ import nice.functional;
  import nice.tools.compiler.console;
  import nice.tools.compiler;
***************
*** 36,41 ****
    File source;
    error(location, message){
!     println( "8<-------------------------------------------------------------------------->8" );
!     println( read( source ) );
      super;
    }
--- 37,42 ----
    File source;
    error(location, message){
!     println("----1--------10--------20--------30--------40--------50--------60--------70--");
!     int lnum = 0; foreach(readLines(source), (String line)=>println((++lnum>9?""lnum:"0"lnum)+"| "+line));
      super;
    }
***************
*** 75,96 ****
    (File to, ?String imp, ?String toplevel, ?String main, ?String check)
  {
!   using(let w = new BufferedWriter(new FileWriter(to))) {
  
      if (imp != null)
!       w.write("import "imp";");
  
      if (toplevel != null)
!       w.write(toplevel);
  
      if (main != null || check != null)
        {
! 	w.write("public void main(String[] args) {\n");
  	if (main != null)
! 	  w.write(main);
  	if (check != null)
! 	  w.write("\nassert "check";");
! 	w.write("\n}\n");
        }
  
    }
  }
--- 76,99 ----
    (File to, ?String imp, ?String toplevel, ?String main, ?String check)
  {
!   let lines = new LinkedList();
  
      if (imp != null)
!       lines.add("import "imp";");
  
      if (toplevel != null)
!       lines.add(toplevel);
  
      if (main != null || check != null)
        {
! 	lines.add("public void main(String[] args) {");
  	if (main != null)
! 	  lines.add(main);
  	if (check != null)
! 	  lines.add("assert "check";");
! 	lines.add("}");
        }
  
+   using(let w = new BufferedWriter(new FileWriter(to))) {
+     w.write(lines.join("\n"));
    }
  }