| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/json-export')
3 files changed, 10 insertions, 11 deletions
diff --git a/src/json-export/src/tonkadur/jsonexport/ComputationCompiler.java b/src/json-export/src/tonkadur/jsonexport/ComputationCompiler.java index 1d3122e..3210f73 100644 --- a/src/json-export/src/tonkadur/jsonexport/ComputationCompiler.java +++ b/src/json-export/src/tonkadur/jsonexport/ComputationCompiler.java @@ -142,7 +142,7 @@ public class ComputationCompiler implements ComputationVisitor } } - public void visit_ref (final Ref n) + public void visit_address (final Address n) throws Throwable { final ComputationCompiler cc; @@ -153,12 +153,12 @@ public class ComputationCompiler implements ComputationVisitor result = new JSONObject(); - result.put("category", "ref"); + result.put("category", "address"); result.put("target_type", Translator.compile_type(n.get_type())); result.put("address", cc.get_result()); } - public void visit_relative_ref (final RelativeRef n) + public void visit_relative_address (final RelativeAddress n) throws Throwable { final ComputationCompiler cc, param_cc; @@ -171,7 +171,7 @@ public class ComputationCompiler implements ComputationVisitor result = new JSONObject(); - result.put("category", "relative_ref"); + result.put("category", "relative_address"); result.put("type", Translator.compile_type(n.get_type())); result.put("base", cc.get_result()); result.put("extra", param_cc.get_result()); diff --git a/src/json-export/src/tonkadur/jsonexport/InstructionCompiler.java b/src/json-export/src/tonkadur/jsonexport/InstructionCompiler.java index 8f7913b..8376be4 100644 --- a/src/json-export/src/tonkadur/jsonexport/InstructionCompiler.java +++ b/src/json-export/src/tonkadur/jsonexport/InstructionCompiler.java @@ -103,7 +103,7 @@ public class InstructionCompiler implements InstructionVisitor cc = new ComputationCompiler(); - n.get_reference().get_visited_by(cc); + n.get_address().get_visited_by(cc); result = new JSONObject(); @@ -142,7 +142,7 @@ public class InstructionCompiler implements InstructionVisitor ref_cc = new ComputationCompiler(); val_cc = new ComputationCompiler(); - n.get_reference().get_visited_by(ref_cc); + n.get_address().get_visited_by(ref_cc); n.get_value().get_visited_by(val_cc); result = new JSONObject(); diff --git a/src/json-export/src/tonkadur/jsonexport/Translator.java b/src/json-export/src/tonkadur/jsonexport/Translator.java index cc22e7c..6d7f60e 100644 --- a/src/json-export/src/tonkadur/jsonexport/Translator.java +++ b/src/json-export/src/tonkadur/jsonexport/Translator.java @@ -10,7 +10,7 @@ import org.json.simple.JSONObject; import tonkadur.wyrd.v1.lang.World; import tonkadur.wyrd.v1.lang.type.*; -import tonkadur.wyrd.v1.lang.Variable; +import tonkadur.wyrd.v1.lang.Register; import tonkadur.wyrd.v1.lang.meta.Instruction; @@ -47,16 +47,15 @@ public class Translator for ( - final Map.Entry<String, Variable> e: - wyrd_world.get_variables().entrySet() + final Register e: wyrd_world.get_registers() ) { final JSONObject obj; obj = new JSONObject(); - obj.put("name", e.getKey()); - obj.put("type", compile_type(e.getValue().get_type())); + obj.put("name", e.get_name()); + obj.put("type", compile_type(e.get_type())); result.add(obj); } |