i21023/JavaTXCompilerInJavaTX
2
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

Richtiges Einsetzen ohne Speichern.

Browse Source
This commit is contained in:
Michael Uhl 2019-04-19 20:49:28 +02:00
parent 905d9e25a2
commit 23c37a8cc2
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertPoint.java
View File

@ -4,6 +4,7 @@ import org.antlr.v4.runtime.Token;
import de.dhbwstuttgart.typeinference.unify.model.ReferenceType; import de.dhbwstuttgart.typeinference.unify.model.ReferenceType;
import java.time.OffsetDateTime;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -33,6 +34,10 @@ public class TypeInsertPoint {
this.extraOffset += toAdd; this.extraOffset += toAdd;
} }
public int getPositionInCode() {
return point.getStartIndex() + extraOffset;
}
/* PL 2018-06-19 /* PL 2018-06-19
* Zwei TypeInsertPoint's sind gleich, wenn ihre point's gleich sind * Zwei TypeInsertPoint's sind gleich, wenn ihre point's gleich sind
* eingefuegt damit man TypeReplaceMarker vergleichen kann * eingefuegt damit man TypeReplaceMarker vergleichen kann

15
src/main/java/de/dhbwstuttgart/typeinference/result/ResultPairMap.java
View File

@ -5,9 +5,13 @@ import java.util.Map;
import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.Token;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table;
public class ResultPairMap { public class ResultPairMap {
private Map<Token, ResultPair<?,?>> indexMap = new HashMap<>(); private Table<Token, String, ResultPair<?,?>> indexMap = HashBasedTable.create();
private Map<Token, ResultPair<?, ?>> inner = new HashMap<>();
public static final ResultPairMap RESULT_PAIRS = new ResultPairMap(); public static final ResultPairMap RESULT_PAIRS = new ResultPairMap();
@ -15,11 +19,12 @@ public class ResultPairMap {
// Nothing to do here. // Nothing to do here.
} }
public void put(Token tkn, ResultPair<?, ?> resultPair) { public void put(Token tkn, String insertString, ResultPair<?, ?> resultPair) {
indexMap.put(tkn, resultPair); indexMap.put(tkn, insertString.trim(), resultPair);
inner.put(tkn, resultPair);
} }
public ResultPair<?,?> get(Token tkn) { public ResultPair<?,?> get(Token tkn, String insertString) {
return indexMap.get(tkn); return inner.get(tkn);
} }
} }

3
src/main/java/de/dhbwstuttgart/typeinference/result/ResultSet.java
View File

@ -65,8 +65,6 @@ class Resolver implements ResultSetVisitor {
resolved = null; resolved = null;
System.out.println(tph.toString()); System.out.println(tph.toString());
for(ResultPair<?,?> resultPair : result.results) { for(ResultPair<?,?> resultPair : result.results) {
RESULT_PAIRS.put(resultPair.getRight().getOffset(), resultPair);
RESULT_PAIRS.put(resultPair.getLeft().getOffset(), resultPair);
if(resultPair instanceof PairTPHEqualTPH && ((PairTPHEqualTPH) resultPair).getLeft().equals(toResolve)){ if(resultPair instanceof PairTPHEqualTPH && ((PairTPHEqualTPH) resultPair).getLeft().equals(toResolve)){
return resolve(((PairTPHEqualTPH) resultPair).getRight()); return resolve(((PairTPHEqualTPH) resultPair).getRight());
} }
@ -95,6 +93,7 @@ class Resolver implements ResultSetVisitor {
public void visit(PairTPHequalRefTypeOrWildcardType p) { public void visit(PairTPHequalRefTypeOrWildcardType p) {
if(p.left.equals(toResolve)){ if(p.left.equals(toResolve)){
resolved = p.right; resolved = p.right;
RESULT_PAIRS.put(p.left.getOffset(), p.right.toString(), p);
RelatedTypeWalker related = new RelatedTypeWalker(null, result); RelatedTypeWalker related = new RelatedTypeWalker(null, result);
p.right.accept(related); p.right.accept(related);
additionalTPHs.addAll(related.relatedTPHs); additionalTPHs.addAll(related.relatedTPHs);