Skip to content

Commit fe66378

Browse files
author
Dwight Guth
committed
significant improvements to new parser
Former-commit-id: f90254a1367df7923c9b5f4372c7e6c129c34888 [formerly 1333ce1e5110d6ff59395147376aa237ca7bf907] Former-commit-id: 930d8858f2ca4273df7bfce6aa99246d5b8774a7
1 parent a33c106 commit fe66378

92 files changed

Lines changed: 1249 additions & 1670 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java-backend/src/main/java/org/kframework/backend/java/kil/JavaSymbolicObject.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import org.kframework.backend.java.symbolic.Visitable;
1111
import org.kframework.backend.java.util.Utils;
1212
import org.kframework.kil.ASTNode;
13-
import org.kframework.kil.Location;
14-
import org.kframework.kil.Source;
13+
import org.kframework.attributes.Location;
14+
import org.kframework.attributes.Source;
1515
import org.kframework.kil.visitors.Visitor;
1616

1717
import java.io.Serializable;

‎java-backend/src/main/java/org/kframework/backend/java/kil/KItem.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import org.kframework.utils.errorsystem.KException.ExceptionType;
1717
import org.kframework.utils.errorsystem.KExceptionManager;
1818
import org.kframework.utils.errorsystem.KExceptionManager.KEMException;
19+
import org.kframework.attributes.Source;
20+
import org.kframework.attributes.Location;
1921

2022
import java.io.IOException;
2123
import java.io.ObjectOutputStream;

‎java-backend/src/main/java/org/kframework/backend/java/kil/Term.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
package org.kframework.backend.java.kil;
33

44
import org.kframework.attributes.Att;
5+
import org.kframework.attributes.Source;
6+
import org.kframework.attributes.Location;
57
import org.kframework.backend.java.indexing.IndexingPair;
68
import org.kframework.backend.java.symbolic.BottomUpVisitor;
79
import org.kframework.backend.java.symbolic.CopyOnShareSubstAndEvalTransformer;
@@ -11,8 +13,6 @@
1113
import org.kframework.backend.java.symbolic.Transformable;
1214
import org.kframework.backend.java.symbolic.Unifiable;
1315
import org.kframework.backend.java.util.Utils;
14-
import org.kframework.kil.Location;
15-
import org.kframework.kil.Source;
1616

1717
import java.util.ArrayList;
1818
import java.util.Collections;
@@ -248,4 +248,7 @@ public final int hashCode() {
248248
public Att att() {
249249
return Att.apply();
250250
}
251+
252+
public Location location() { return getLocation(); }
253+
public Source source() { return getSource(); }
251254
}

‎java-backend/src/main/java/org/kframework/backend/java/rewritemachine/RHSInstruction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import org.kframework.backend.java.kil.Kind;
99
import org.kframework.backend.java.kil.Term;
1010
import org.kframework.backend.java.kil.Variable;
11-
import org.kframework.kil.Location;
12-
import org.kframework.kil.Source;
11+
import org.kframework.attributes.Source;
12+
import org.kframework.attributes.Location;
1313

1414
public final class RHSInstruction implements Serializable {
1515

‎java-backend/src/main/java/org/kframework/backend/java/symbolic/BinderSubstitutionTransformer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import org.kframework.backend.java.kil.TermContext;
1313
import org.kframework.backend.java.kil.Variable;
1414
import org.kframework.kil.ASTNode;
15-
import org.kframework.kil.Location;
16-
import org.kframework.kil.Source;
15+
import org.kframework.attributes.Source;
16+
import org.kframework.attributes.Location;
1717

1818

1919
/**

‎java-backend/src/main/java/org/kframework/backend/java/symbolic/JavaSymbolicBackend.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ public CompilerSteps<Definition> getCompilationSteps() {
164164
steps.add(new AddOptionalTags(context));
165165
steps.add(new DeclareCellLabels(context));
166166

167-
/* remove rules that are from k dist */
168-
steps.add(new RemovePreincludedRules(context));
169-
170167
steps.add(new AddLocalRewritesUnderCells(context));
171168
steps.add(new GenerateKRewriteMachineInstructions(context));
172169

‎java-backend/src/main/java/org/kframework/backend/java/symbolic/RuleAuditing.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static void setAuditingRule(JavaExecutionOptions options, int currentStep
5050
continue;
5151
}
5252
if (rule.getSource().toString().contains(options.auditingFile)
53-
&& rule.getLocation().lineStart == options.auditingLine) {
53+
&& rule.getLocation().startLine() == options.auditingLine) {
5454
matchedRules.add(rule);
5555
}
5656
}

‎java-backend/src/main/java/org/kframework/backend/java/util/Coverage.java‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
package org.kframework.backend.java.util;
33

44
import org.kframework.backend.java.kil.*;
5-
import org.kframework.kil.FileSource;
6-
import org.kframework.kil.Location;
7-
import org.kframework.kil.Source;
5+
import org.kframework.attributes.Source;
6+
import org.kframework.attributes.Location;
87
import org.kframework.utils.errorsystem.KExceptionManager;
98

109
import java.io.File;
@@ -83,31 +82,15 @@ private static String getSourceLocation(Term term) {
8382
}
8483
if (t instanceof KItem) {
8584
Source source = t.getSource();
86-
if (source instanceof FileSource) {
87-
s = toString((FileSource) source) + ":" + toString(t.getLocation());
88-
}
85+
s = source.toString() + ":" + t.getLocation().toString();
8986
}
9087
return s;
9188
}
9289

9390
private static String getSourceLocation(Rule rule) {
9491
String s = null; // Return null, if location information is not available.
9592
Source source = rule.getSource();
96-
if (source instanceof FileSource) {
97-
s = toString((FileSource) source) + ":" + toString(rule.getLocation());
98-
}
93+
s = source.toString() + ":" + rule.getLocation().toString();
9994
return s;
10095
}
101-
102-
// Customized toString method for FileSource.
103-
private static String toString(FileSource source) {
104-
return source.getFile().getAbsolutePath();
105-
}
106-
107-
// Customized toString method for Location.
108-
private static String toString(Location location) {
109-
return location.lineStart + ":" + location.columnStart
110-
+ ":" + location.lineEnd + ":" + location.columnEnd;
111-
}
112-
11396
}

‎java-backend/src/main/java/org/kframework/backend/java/util/JavaTransition.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import org.kframework.backend.java.symbolic.BackendJavaKILtoKILTransformer;
77
import org.kframework.kil.ASTNode;
8-
import org.kframework.kil.Location;
9-
import org.kframework.kil.Source;
8+
import org.kframework.attributes.Source;
9+
import org.kframework.attributes.Location;
1010
import org.kframework.kil.Term;
1111
import org.kframework.kil.Variable;
1212
import org.kframework.kil.loader.Context;

0 commit comments

Comments
 (0)