[Pizzacompiler-commits] CVS: pizza/tests/lib bcel.jar,NONE,1.1

[Nick Fortescue <nfortescue@us...>]

Update of /cvsroot/pizzacompiler/pizza/tests/lib
In directory usw-pr-cvs1:/tmp/cvs-serv5037/tests/lib

Added Files:
	bcel.jar 
Log Message:



--- NEW FILE: bcel.jar ---
PK









Mö6•…\'4.×ß;5ٗìZ™šº¢+•™Z›Ëä“Ùü@YÈsBáUÉuÉ©™d¶wj|ŪTWÞ	•7U/Œ·tNëœæ„œ„
…B“ÐˆB³ödf0…Jј©„
J´ªBÁQƒB¢ÆtL5¦;¡>ˆˆ2®¼´3± ÞÒJ¥û÷;!…5­t@<¬º¶¶³¹­¦1Z‹Ç	
璖h{µ©D`„)Š·Fj[#u(ôlËDku«iéÓ	QRU7¢ LO†«tÄj´ÄcѳLÓ	N¨åíñFjÛÈç8Ӟ£µ¥:–ˆFb­(¼Èž#FÕÚQnÃT‹ÆZ#-õÕµ(tC¶¿êš5¯ES/T¼¼–(—ø!{y‰¶æ=›
<¾ÜÆêÓA$‘ S5ENH/kÞi"ߟÎöÎÅû‹Çè~c­mùžSébjè‹eÑl>՛êwB#‹Eõ™\2/Û5æ²½¸³'4ªXX—\‘I¡¸T6®Í$PZæ„
ºL§2Ýý©(—½˜«tB•Å’¦T~e®Pw˜À¥ö÷$»RTî„.V‰%פª³Ý­ûøÊ*ä•Ù‡4Ƽ{zÑÖhu#½Þ>D×ðßOÏ5Ò·7¯+“ΦóóÏ­¥­¶5nZù¡¸*gO(¾áDg´©¹1ÒDßD¤Ž>ÜÎꖖê:ýH¼ÁÚæN:ÐÅõŒà‚x]¤3A×¢è…ÓÿT,Þ̟4N×kk¤Ë(j¢§oóS‚T”Véô ¤3)mzhz¨Jëÿ«”Î#ˆël-ðȀy@EÏ£&ÚܖX@...‚D7ÕXÇ?¹Jú­SÚ¹ ©A•¡ƒéP´1^Í¿¸Ñ¨W€Cê0† ®
WPZo*|‰SîìJN¹Â—ñٙ
WqʾÂ)wv5ŸßòW1xÄZ«à2¹”/òk¶´vAu—²-þ:¦c*µ6Õk¬mâ/ñÌR”ói¾aßÁµ˜²
G¾i|¤>²ù·9ñ/é:ÎÙS~‡ó.¿Þä\þ]S‡ËoÀ5ÕwF©_ÓÙ÷‚ÓãAéöûAéû&QÀ5~ šp›MAuñ,?
ÌYn¡kjˆ·Æ‘ÿˆÙ¿ù[)m‰p§?&kÓZ]ÓI,‰¶Ö²=¸Ìlc<¾¨­9(û	†0jÒÖގ!,À;0„x'†‡
[...1196 lines suppressed...]








ӔÛÀ

äÆ

º

ŸÎ¼




¨èۇ



ÐúÿI

[Pizzacompiler-commits] CVS: pizza/main/src/net/sf/pizzacompiler/compiler Main.pizza,1.16,1.17

[Nick Fortescue <nfortescue@us...>]

Update of /cvsroot/pizzacompiler/pizza/main/src/net/sf/pizzacompiler/compiler
In directory usw-pr-cvs1:/tmp/cvs-serv5037/main/src/net/sf/pizzacompiler/compiler

Modified Files:
	Main.pizza 
Log Message:



Index: Main.pizza
===================================================================
RCS file: /cvsroot/pizzacompiler/pizza/main/src/net/sf/pizzacompiler/compiler/Main.pizza,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Main.pizza	6 Dec 2001 11:46:37 -0000	1.16
--- Main.pizza	14 Feb 2002 18:04:44 -0000	1.17
***************
*** 22,33 ****
  
  /**
!  * The main Pizza Compiler class.
!  * <p>
!  * Copyright (C) 1996,97 Martin Odersky. All rights reserved.
!  * Permission is hereby granted to modify and use this software for research
!  * and teaching purposes. Modification for commercial purposes requires
!  * prior written permission by the author.
!  * The software, or modifications thereof, may be redistributed only
!  * if this copyright notice stays attached.
   */
  public class Main implements /*imports*/ Constants {
--- 22,26 ----
  
  /**
!  * The main Pizza Compiler class.<p>
   */
  public class Main implements /*imports*/ Constants {

[Pizzacompiler-commits] CVS: pizza/tests/src/acceptance/net/sf/pizzacompiler DebugInformationTest.java,NONE,1.1 NullOutputStream.java,NONE,1.1 NullPrintStream.java,NONE,1.1 AllAcceptanceTests.java,1.7,1.8 CompilerTestMethods.java,1.6,1.7 EmbeddedTest.java,1.3,1.4

[Nick Fortescue <nfortescue@us...>]

Update of /cvsroot/pizzacompiler/pizza/tests/src/acceptance/net/sf/pizzacompiler
In directory usw-pr-cvs1:/tmp/cvs-serv5037/tests/src/acceptance/net/sf/pizzacompiler

Modified Files:
	AllAcceptanceTests.java CompilerTestMethods.java 
	EmbeddedTest.java 
Added Files:
	DebugInformationTest.java NullOutputStream.java 
	NullPrintStream.java 
Log Message:



--- NEW FILE: DebugInformationTest.java ---
package net.sf.pizzacompiler;

/**
 * $Id: DebugInformationTest.java,v 1.1 2002/02/14 18:04:45 nfortescue Exp $
 *
 * Copyright (C) 2001 Nicolas Fortescue.
 * This software is distributed under the Artistic License. See
 * artistic.html or artistic.txt which came with this distribution.
 *
 * Created: Thu Feb 14 14:14:28 2002
 */

import java.io.ByteArrayInputStream;
import java.io.IOException;

import junit.framework.TestCase;

import org.apache.bcel.classfile.ClassParser;
import org.apache.bcel.classfile.JavaClass;
import org.apache.bcel.classfile.LocalVariable;
import org.apache.bcel.classfile.LocalVariableTable;
import org.apache.bcel.classfile.Method;

public class DebugInformationTest extends TestCase {
  private static final String CLASSNAME = "Foo";

  private static final int RETURN = 1;
  private static final int ASSIGN = 2;

  public DebugInformationTest(String s) {
    super(s);
  }

  private static final String ONE_VAR_NAME = "oneVar";
  private static final String ONE_VAR_BODY = "int c=0;";
  public void testLocalVariableContext() {
    assertContext(ASSIGN, 0, "c",ONE_VAR_NAME,ONE_VAR_BODY);
  }

  private static final String BRACKET_NAME = "bracket";
  private static final String BRACKET_BODY = 
    "int c=0; if(true) {int d=0;} c=1;";
  public void testBracketedVariableContext() {
    assertContext(2*ASSIGN, ASSIGN+RETURN, "d", BRACKET_NAME, BRACKET_BODY);
  }

  private void assertContext(int start, int distFromEnd, 
			     String varName, String methodName,
			     String methodBody) {
    VariableContext context =getVariableContext(COMPILED, varName, methodName);
    assertEquals(start, context.start_pc);
    assertEquals(distFromEnd, context.codeLength-(context.start_pc+context.length));
  }

  private static String makeOneMethod(String methodName, String methodBody) {
    StringBuffer result = new StringBuffer("public static void ");
    result.append(methodName);
    result.append("() {");
    result.append(methodBody);
    result.append("}\n\n");
    return result.toString();
  }

  private VariableContext getVariableContext(byte [] code, String varName,
					     String methodName) {
      return getVariableContext(getMethod(code, methodName), varName);
  }

  private Method getMethod(byte [] bytecode, String methodName) {
    try {
      ClassParser parser = 
	new ClassParser(new ByteArrayInputStream(bytecode), CLASSNAME+".java");
      JavaClass javaClass = parser.parse();
      return getMethod(javaClass, methodName);
    } catch(IOException ex) {
      fail("failed in reading class" + ex);
      return null;
    }
  }

  private VariableContext getVariableContext(Method method, String varName) {
    LocalVariableTable lvt = method.getLocalVariableTable();
    LocalVariable [] variables = lvt.getLocalVariableTable();
    for(int i=0; i<variables.length; i++) {
      if(!varName.equals(variables[i].getName())) {
	continue;
      }
      
      VariableContext result = new VariableContext();
      result.codeLength = method.getCode().getCode().length;
      result.start_pc = variables[i].getStartPC();
      result.length = variables[i].getLength();
      return result;
    }
    return null;
  }

  private Method getMethod(JavaClass javaClass, String methodName) {
    Method [] methods = javaClass.getMethods();
    for(int i=0; i<methods.length; i++) {
      if(methodName.equals(methods[i].getName())) {
	return methods[i];
      }
    }
    return null;
  }

  private static class VariableContext {
    int start_pc;
    int length;
    int codeLength;
  }

  private static final String TEST_CODE = 
    "public class "+CLASSNAME+" {\n" +    
    makeOneMethod(ONE_VAR_NAME, ONE_VAR_BODY) +
    makeOneMethod(BRACKET_NAME, BRACKET_BODY) +
    "}\n";
      
  private static final byte [] COMPILED = 
    CompilerTestMethods.compileSourceToBytes(CLASSNAME, TEST_CODE, true);

}// DebugInformationTest

--- NEW FILE: NullOutputStream.java ---
package net.sf.pizzacompiler;

/**
 * $Id: NullOutputStream.java,v 1.1 2002/02/14 18:04:45 nfortescue Exp $
 *
 * Copyright (C) 2001 Nicolas Fortescue.
 * This software is distributed under the Artistic License. See
 * artistic.html or artistic.txt which came with this distribution.
 *
 * Created: Thu Feb 14 14:30:20 2002
 */

import java.io.OutputStream;

public class NullOutputStream extends OutputStream {
  public void write(int b) {}
}// NullOutputStream

--- NEW FILE: NullPrintStream.java ---
package net.sf.pizzacompiler;

/**
 * $Id: NullPrintStream.java,v 1.1 2002/02/14 18:04:45 nfortescue Exp $
 *
 * Copyright (C) 2001 Nicolas Fortescue.
 * This software is distributed under the Artistic License. See
 * artistic.html or artistic.txt which came with this distribution.
 *
 * Created: Thu Feb 14 14:29:30 2002
 */

import java.io.PrintStream;

public class NullPrintStream extends PrintStream {
  public NullPrintStream() {super(new NullOutputStream());}
}// NullPrintStream

Index: AllAcceptanceTests.java
===================================================================
RCS file: /cvsroot/pizzacompiler/pizza/tests/src/acceptance/net/sf/pizzacompiler/AllAcceptanceTests.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AllAcceptanceTests.java	31 Oct 2001 15:45:16 -0000	1.7
--- AllAcceptanceTests.java	14 Feb 2002 18:04:44 -0000	1.8
***************
*** 18,21 ****
--- 18,22 ----
      suite.addTest(new TestSuite(ClassAndSourceOutputTests.class));
      suite.addTest(new TestSuite(ClasspathOptionsTest.class));
+     suite.addTest(new TestSuite(DebugInformationTest.class));
      suite.addTest(new TestSuite(EmbeddedTest.class));
      suite.addTest(new TestSuite(MakesItself.class));

Index: CompilerTestMethods.java
===================================================================
RCS file: /cvsroot/pizzacompiler/pizza/tests/src/acceptance/net/sf/pizzacompiler/CompilerTestMethods.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CompilerTestMethods.java	31 Oct 2001 15:45:16 -0000	1.6
--- CompilerTestMethods.java	14 Feb 2002 18:04:45 -0000	1.7
***************
*** 21,26 ****
--- 21,29 ----
  import java.security.Permission;
  
+ import net.sf.pizzacompiler.compiler.ByteArrayCompilerOutput;
+ import net.sf.pizzacompiler.compiler.ClassReader;
  import net.sf.pizzacompiler.compiler.FileCompilerOutput;
  import net.sf.pizzacompiler.compiler.Main;
+ import net.sf.pizzacompiler.compiler.MapSourceReader;
  import net.sf.pizzacompiler.compiler.SourceReader;
  
***************
*** 80,83 ****
--- 83,103 ----
      Assert.assertEquals("resource was not a file", "file", resource.getProtocol());
      return new File(resource.getFile());
+   }
+ 
+   public static byte [] compileSourceToBytes(String className, String source, 
+ 					     boolean debug) {
+     ByteArrayCompilerOutput output = new ByteArrayCompilerOutput();
+     Map sourceMap = Collections.singletonMap(className+".java", source);
+     Main.init();
+     if(debug) {
+       Main.argument("-g");
+     }
+     Main.setClassReader(new ClassReader(null, null));
+     Main.compile(new String[]{className+".java"}, 
+ 		 new MapSourceReader(sourceMap),
+ 		 output, new NullPrintStream());
+     Collection bytecode = output.getBytecode();
+     Assert.assertEquals(1, bytecode.size());
+     return (byte[])bytecode.iterator().next();
    }
  

Index: EmbeddedTest.java
===================================================================
RCS file: /cvsroot/pizzacompiler/pizza/tests/src/acceptance/net/sf/pizzacompiler/EmbeddedTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EmbeddedTest.java	19 Sep 2001 15:17:23 -0000	1.3
--- EmbeddedTest.java	14 Feb 2002 18:04:45 -0000	1.4
***************
*** 17,22 ****
  import java.io.IOException;
  import java.io.InputStream;
- import java.io.OutputStream;
- import java.io.PrintStream;
  import java.util.*;
  
--- 17,20 ----
***************
*** 97,105 ****
    }
  
-   private static class NullPrintStream extends PrintStream {
-     public NullPrintStream() {super(new NullOutputStream());}
-   }
-   private static class NullOutputStream extends OutputStream {
-     public void write(int b) {}
-   }
  }// EmbeddedTest
--- 95,97 ----

[Pizzacompiler-commits] CVS: pizza build.xml,1.4,1.5

[Nick Fortescue <nfortescue@us...>]

Update of /cvsroot/pizzacompiler/pizza
In directory usw-pr-cvs1:/tmp/cvs-serv5037

Modified Files:
	build.xml 
Log Message:



Index: build.xml
===================================================================
RCS file: /cvsroot/pizzacompiler/pizza/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build.xml	31 Oct 2001 15:45:16 -0000	1.4
--- build.xml	14 Feb 2002 18:04:42 -0000	1.5
***************
*** 32,36 ****
    <path id="tests.compile.classpath">
       <pathelement location="${pizza_jar}"/>
!      <pathelement location="${tests.lib}/junit.jar"/>
    </path>
    <path id="tests.run.classpath">
--- 32,38 ----
    <path id="tests.compile.classpath">
       <pathelement location="${pizza_jar}"/>
!      <fileset dir="${tests.lib}">
!        <include name="**/*.jar"/>
!      </fileset>
    </path>
    <path id="tests.run.classpath">
***************
*** 69,72 ****
--- 71,75 ----
      <pizzac srcdir="${tests.src}"
             destdir="${tests.build}"
+ 	   debug="true"
  	   >
        <classpath refid="tests.compile.classpath"/>