i21017/JavaCompilerCore
1
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

Änderung an StringLitTest.jav -> jetzt return void

Browse Source
This commit is contained in:
Fütterling, Franziska (WWI2012D) 2015-06-22 16:40:30 +02:00
parent 68aa427220
commit 1cd1aa7a50
8 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
bin/log4j.xml
View File

@ -1,35 +1,35 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
<appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender">
<param name="Target" value="System.out"/>
<layout class="de.dhbwstuttgart.logger.PatternLayout">
<param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/>
</layout>
</appender>
<logger name="codegen">
<level value="INFO"/>
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="parser">
<level value="OFF"/>
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="inference">
<level value="WARN"/>
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="bytecode">
<level value="INFO"/>
<appender-ref ref="CONSOLE"/>
</logger>
</log4j:configuration>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
<appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender">
<param name="Target" value="System.out"/>
<layout class="de.dhbwstuttgart.logger.PatternLayout">
<param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/>
</layout>
</appender>
<logger name="codegen">
<level value="INFO"/>
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="parser">
<level value="OFF"/>
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="inference">
<level value="WARN"/>
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="bytecode">
<level value="INFO"/>
<appender-ref ref="CONSOLE"/>
</logger>
</log4j:configuration>

48
bin/log4jTesting.xml
View File

@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
<appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender">
<param name="Target" value="System.out"/>
<layout class="de.dhbwstuttgart.logger.PatternLayout">
<param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/>
</layout>
</appender>
<logger name="trtest">
<level value="DEBUG"/>
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="funcTest">
<level value="DEBUG"/>
<appender-ref ref="CONSOLE"/>
</logger>
</log4j:configuration>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
<appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender">
<param name="Target" value="System.out"/>
<layout class="de.dhbwstuttgart.logger.PatternLayout">
<param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/>
</layout>
</appender>
<logger name="trtest">
<level value="DEBUG"/>
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="funcTest">
<level value="DEBUG"/>
<appender-ref ref="CONSOLE"/>
</logger>
</log4j:configuration>

6
bin/parser/BoundedParameter.jav
View File

@ -1,3 +1,3 @@
class Matrix{
<A extends B, C extends B> String op = "String";
}
class Matrix{
<A extends B, C extends B> String op = "String";
}

4
bin/parser/FieldInitializationTest.jav
View File

@ -1,3 +1,3 @@
class FieldInitializationTest{
String var = "hallo";
class FieldInitializationTest{
String var = "hallo";
}

6
bin/parser/GenericFieldVarTest.jav
View File

@ -1,3 +1,3 @@
class Test{
<A> A var;
}
class Test{
<A> A var;
}

6
bin/parser/ImportTest.jav
View File

@ -1,4 +1,4 @@
import java.util.*;
class ImportTest{
import java.util.*;
class ImportTest{
}

4
src/de/dhbwstuttgart/syntaxtree/statement/Assign.java
View File

@ -179,8 +179,8 @@ public class Assign extends Expr
//Bytecode: bipush 20
// istore_1
InstructionFactory _factory = new InstructionFactory(cg, cg.getConstantPool());
InstructionList il = this.expr2.genByteCode(cg);//expr2 rechte expr
il.append(_factory.createConstant(expr2.toString()));
InstructionList il = expr2.genByteCode(cg);//expr2 rechte expr
il.append(_factory.createConstant(expr2));
il.append(_factory.ISTORE_1);
return il;
}

2
test/bytecode/StringLitTest.jav
View File

@ -1,7 +1,7 @@
class StringLitTest{
Object method() { s = ""; }
void method() { s = ""; }
}