new file: doc/PluginBau.pdf
modified: src/de/dhbwstuttgart/typedeployment/TypeInsert.java modified: src/de/dhbwstuttgart/typedeployment/TypeInsertPoint.java equals Methoden eingefuegt um Marker nur einmal im Plugin zu haben modified: target/JavaTXcompiler-0.1-jar-with-dependencies.jar modified: test/bytecode/javFiles/OL.jav modified: test/typeinference/UnifyTest.java
This commit is contained in:
parent
1437788f5a
commit
895b5a972e
BIN
doc/PluginBau.pdf
Normal file
BIN
doc/PluginBau.pdf
Normal file
Binary file not shown.
@ -33,4 +33,22 @@ public class TypeInsert {
|
|||||||
public String getInsertString(){
|
public String getInsertString(){
|
||||||
return point.getInsertString();
|
return point.getInsertString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* PL 2018-06-18
|
||||||
|
* Zwei TypeInsert's sind gleich, wenn ihre point's und ihre inserts' gleich sind
|
||||||
|
* eingefuegt damit man TypeReplaceMarker vergleichen kann
|
||||||
|
* @see java.lang.Object#equals(java.lang.Object)
|
||||||
|
*/
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if(!(obj instanceof TypeInsert)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return ((TypeInsert)obj).point.equals(this.point);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public String toString() {
|
||||||
|
return point.toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,8 @@ package de.dhbwstuttgart.typedeployment;
|
|||||||
|
|
||||||
import org.antlr.v4.runtime.Token;
|
import org.antlr.v4.runtime.Token;
|
||||||
|
|
||||||
|
import de.dhbwstuttgart.typeinference.unify.model.ReferenceType;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@ -25,4 +27,23 @@ public class TypeInsertPoint {
|
|||||||
public String getInsertString() {
|
public String getInsertString() {
|
||||||
return insertString;
|
return insertString;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* PL 2018-06-19
|
||||||
|
* Zwei TypeInsertPoint's sind gleich, wenn ihre point's gleich sind
|
||||||
|
* eingefuegt damit man TypeReplaceMarker vergleichen kann
|
||||||
|
* @see java.lang.Object#equals(java.lang.Object)
|
||||||
|
*/
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if(!(obj instanceof TypeInsertPoint)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return ((TypeInsertPoint)obj).point.equals(this.point) &&
|
||||||
|
((TypeInsertPoint)obj).insertString.equals(this.insertString);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public String toString() {
|
||||||
|
return point.toString() + " " + insertString.toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
@ -10,9 +10,9 @@ class OL {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class OLMain {
|
class OLMain {
|
||||||
|
|
||||||
main(x) {
|
java.lang.Integer main(x) {
|
||||||
var ol;
|
var ol;
|
||||||
ol = new OL();
|
ol = new OL();
|
||||||
return ol.m(x);
|
return ol.m(x);
|
||||||
|
@ -74,15 +74,15 @@ public class UnifyTest {
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
|
|
||||||
|
/*
|
||||||
@Test
|
@Test
|
||||||
public void matrix() throws IOException, ClassNotFoundException {
|
public void matrix() throws IOException, ClassNotFoundException {
|
||||||
execute(new File(rootDirectory+"Matrix.jav"));
|
execute(new File(rootDirectory+"Matrix.jav"));
|
||||||
//JavaTXCompiler compiler = new JavaTXCompiler(new File(rootDirectory+"Matrix.jav"));
|
//JavaTXCompiler compiler = new JavaTXCompiler(new File(rootDirectory+"Matrix.jav"));
|
||||||
//compiler.generateBytecode();
|
//compiler.generateBytecode();
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@Test
|
@Test
|
||||||
|
Loading…
Reference in New Issue
Block a user