Улучшен вывод АСД

Author: aNNiMON

src/com/annimon/ownlang/Main.java

@@ -92,7 +92,7 @@ public static void main(String[] args) throws IOException {
                     } else {
                         options.optimizationLevel = 2;
                     }
-                    return;
+                    break;
 
                 case "-r":
                 case "--repl":

src/com/annimon/ownlang/lib/UserDefinedFunction.java

@@ -62,6 +62,9 @@ public Value execute(Value... values) {
 
     @Override
     public String toString() {
-        return String.format("function %s %s", arguments.toString(), body.toString());
+        if (body instanceof ReturnStatement) {
+            return String.format("def%s = %s", arguments, ((ReturnStatement)body).expression);
+        }
+        return String.format("def%s %s", arguments, body);
     }
 }

src/com/annimon/ownlang/parser/ast/Arguments.java

@@ -44,8 +44,12 @@ public Iterator<Argument> iterator() {
     public String toString() {
         final StringBuilder result = new StringBuilder();
         result.append('(');
-        for (Argument arg : arguments) {
-            result.append(arg).append(", ");
+        final Iterator<Argument> it = arguments.iterator();
+        if (it.hasNext()) {
+            result.append(it.next());
+            while (it.hasNext()) {
+                result.append(", ").append(it.next());
+            }
         }
         result.append(')');
         return result.toString();

src/com/annimon/ownlang/parser/ast/DestructuringAssignmentStatement.java

@@ -70,6 +70,18 @@ public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
 
     @Override
     public String toString() {
-        return variables.toString();
+        final StringBuilder sb = new StringBuilder();
+        sb.append("extract(");
+        final Iterator<String> it = variables.iterator();
+        if (it.hasNext()) {
+            String variable = it.next();
+            sb.append(variable == null ? "" : variable);
+            while (it.hasNext()) {
+                variable = it.next();
+                sb.append(", ").append(variable == null ? "" : variable);
+            }
+        }
+        sb.append(") = ").append(containerExpression);
+        return sb.toString();
     }
 }

src/com/annimon/ownlang/parser/ast/FunctionDefineStatement.java

@@ -36,6 +36,9 @@ public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
 
     @Override
     public String toString() {
+        if (body instanceof ReturnStatement) {
+            return String.format("def %s%s = %s", name, arguments, ((ReturnStatement)body).expression);
+        }
         return String.format("def %s%s %s", name, arguments, body);
     }
 }

src/com/annimon/ownlang/parser/ast/FunctionalExpression.java

@@ -4,6 +4,7 @@
 import com.annimon.ownlang.exceptions.UnknownFunctionException;
 import com.annimon.ownlang.lib.*;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -78,6 +79,20 @@ public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
 
     @Override
     public String toString() {
-        return functionExpr + "(" + arguments.toString() + ")";
+        final StringBuilder sb = new StringBuilder();
+        if (functionExpr instanceof ValueExpression && ((ValueExpression)functionExpr).value.type() == Types.STRING) {
+            sb.append(((ValueExpression)functionExpr).value.asString()).append('(');
+        } else {
+            sb.append(functionExpr).append('(');
+        }
+        final Iterator<Expression> it = arguments.iterator();
+        if (it.hasNext()) {
+            sb.append(it.next());
+            while (it.hasNext()) {
+                sb.append(", ").append(it.next());
+            }
+        }
+        sb.append(')');
+        return sb.toString();
     }
 }

src/com/annimon/ownlang/parser/ast/MapExpression.java

@@ -2,6 +2,7 @@
 
 import com.annimon.ownlang.lib.MapValue;
 import com.annimon.ownlang.lib.Value;
+import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -38,6 +39,19 @@ public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
 
     @Override
     public String toString() {
-        return elements.toString();
+        final StringBuilder sb = new StringBuilder();
+        sb.append('{');
+        Iterator<Map.Entry<Expression, Expression>> it = elements.entrySet().iterator();
+        if (it.hasNext()) {
+            Map.Entry<Expression, Expression> entry = it.next();
+            sb.append(entry.getKey()).append(" : ").append(entry.getValue());
+            while (it.hasNext()) {
+                entry = it.next();
+                sb.append(", ");
+                sb.append(entry.getKey()).append(" : ").append(entry.getValue());
+            }
+        }
+        sb.append('}');
+        return sb.toString();
     }
 }

src/com/annimon/ownlang/parser/ast/PrintStatement.java

@@ -16,7 +16,7 @@ public PrintStatement(Expression expression) {
 
     @Override
     public void execute() {
-        Console.print(expression.eval());
+        Console.print(expression.eval().asString());
     }
 
     @Override

src/com/annimon/ownlang/parser/ast/PrintlnStatement.java

@@ -16,7 +16,7 @@ public PrintlnStatement(Expression expression) {
 
     @Override
     public void execute() {
-        Console.println(expression.eval());
+        Console.println(expression.eval().asString());
     }
 
     @Override

src/com/annimon/ownlang/parser/ast/ValueExpression.java

@@ -4,6 +4,7 @@
 import com.annimon.ownlang.lib.FunctionValue;
 import com.annimon.ownlang.lib.NumberValue;
 import com.annimon.ownlang.lib.StringValue;
+import com.annimon.ownlang.lib.Types;
 import com.annimon.ownlang.lib.Value;
 
 /**
@@ -47,6 +48,9 @@ public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
 
     @Override
     public String toString() {
-        return value.asString();
+        if (value.type() == Types.STRING) {
+            return "\"" + value.asString() + "\"";
+        }
+        return value.toString();
     }
 }