summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-08-07 11:18:18 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-08-07 11:18:18 +0200
commitb95d1790243c09901fa5175a9ec29fcdce0998a1 (patch)
tree5e5c02810b6fa2fbe04a78ed7751d1146c59cdbf /src/json-export
parent5ba737fbc8edac0eb5ed750d92a5b3158fb2a32e (diff)
...
Diffstat (limited to 'src/json-export')
-rw-r--r--src/json-export/src/tonkadur/jsonexport/InstructionCompiler.java11
-rw-r--r--src/json-export/src/tonkadur/jsonexport/Translator.java3
2 files changed, 7 insertions, 7 deletions
diff --git a/src/json-export/src/tonkadur/jsonexport/InstructionCompiler.java b/src/json-export/src/tonkadur/jsonexport/InstructionCompiler.java
index 00445c7..8f7913b 100644
--- a/src/json-export/src/tonkadur/jsonexport/InstructionCompiler.java
+++ b/src/json-export/src/tonkadur/jsonexport/InstructionCompiler.java
@@ -33,16 +33,19 @@ public class InstructionCompiler implements InstructionVisitor
public void visit_assert (final Assert n)
throws Throwable
{
- final ComputationCompiler cc;
+ final ComputationCompiler cond_cc, msg_cc;
- cc = new ComputationCompiler();
+ cond_cc = new ComputationCompiler();
+ msg_cc = new ComputationCompiler();
- n.get_condition().get_visited_by(cc);
+ n.get_condition().get_visited_by(cond_cc);
+ n.get_message().get_visited_by(msg_cc);
result = new JSONObject();
result.put("category", "assert");
- result.put("condition", cc.get_result());
+ result.put("condition", cond_cc.get_result());
+ result.put("message", msg_cc.get_result());
}
public void visit_display (final Display n)
diff --git a/src/json-export/src/tonkadur/jsonexport/Translator.java b/src/json-export/src/tonkadur/jsonexport/Translator.java
index edd0a7f..cc22e7c 100644
--- a/src/json-export/src/tonkadur/jsonexport/Translator.java
+++ b/src/json-export/src/tonkadur/jsonexport/Translator.java
@@ -36,9 +36,6 @@ public class Translator
out = new PrintWriter(output_file);
out.println(result.toJSONString());
out.close();
-
- System.out.println("JSON Result:");
- System.out.println(result.toJSONString());
}
public static JSONArray get_compiled_variables (final World wyrd_world)