Skip to content

Commit fbbc6e0

Browse files
traiansftraiansf
committed
SortCells compiles
git-svn-id: http://k-framework.googlecode.com/svn/branches/sortcells@9903 82a86efa-2583-11df-8ea0-49ba94de29ab Former-commit-id: d477b3379c110cefc5f4f068b8949f12fcd9db74 [formerly 207d151446e298303894a67a8b3e37f8527728be] Former-commit-id: 0c0b120c4f5c7e0bc9445f7b002c9ca42bd5acd1
1 parent cc237cc commit fbbc6e0

5 files changed

Lines changed: 206 additions & 265 deletions

File tree

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/bin/kompile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env sh
22
ulimit -s `ulimit -H -s`
3-
java -ss8m -Xms64m -Xmx1G -jar "$(dirname $0)/java/k3.jar" -kompile "$@"
3+
/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home/bin/java -ss8m -Xms64m -Xmx1G -jar "$(dirname $0)/java/k3.jar" -kompile "$@"

‎javasources/KTool/src/org/kframework/backend/java/symbolic/AbstractVisitor.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ public void visit(ConstantKLabel constantKLabel) {
4949
visit((KLabel) constantKLabel);
5050
}
5151

52-
@Override
52+
@Override
53+
public void visit(Hole hole) { }
54+
55+
@Override
5356
public void visit(InjectionKLabel injectionKLabel) {
5457
injectionKLabel.getTerm().accept(this);
5558
visit((KLabel) injectionKLabel);

‎javasources/KTool/src/org/kframework/backend/maude/MaudeFilter.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.kframework.backend.maude;
22

3-
import org.apache.commons.lang3.StringUtils;
43
import org.kframework.backend.BackendFilter;
54
import org.kframework.compile.utils.ConfigurationStructure;
65
import org.kframework.compile.utils.ConfigurationStructureMap;
@@ -336,8 +335,8 @@ private void declareCell(String id, String placeHolders, String sorts, String fo
336335
*/
337336
@Override
338337
public void visit(Cell cell) {
339-
/*
340-
String id = cell.getId();
338+
String id;
339+
id = cell.getId();
341340
result.append("(");
342341
result.append("<" + id + "> ");
343342
if (cell.getContents() != null) {
@@ -347,7 +346,18 @@ public void visit(Cell cell) {
347346
}
348347
result.append(" </" + id + ">");
349348
result.append(")");
350-
*/
349+
350+
if (false) {
351+
id = cell.getId();
352+
result.append("<_>_</_>(" + id + ", ");
353+
if (cell.getContents() != null) {
354+
cell.getContents().accept(this);
355+
} else {
356+
result.append("null");
357+
}
358+
result.append(", " + id + ")");
359+
}
360+
/*
351361
String id = cell.getId();
352362
ConfigurationStructure cellStr = null;
353363
if (id.endsWith("-fragment")) {
@@ -376,6 +386,7 @@ public void visit(Cell cell) {
376386
}
377387
}
378388
result.append(")");
389+
*/
379390
}
380391

381392
@Override

0 commit comments

Comments
 (0)