From 802927e06ecd95b2f43049094fce5d7d375b8dcb Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Sat, 13 Feb 2016 18:46:41 +0200
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D1=81=D0=B2=D0=B0=D0=B8?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=B0=D0=BA=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 program.own                                   |  5 ++-
 src/com/annimon/ownlang/parser/Parser.java    | 45 +++++++++++++------
 ...atement.java => AssignmentExpression.java} |  7 +--
 ...ava => ContainerAssignmentExpression.java} | 22 +++++----
 .../annimon/ownlang/parser/ast/Visitor.java   |  4 +-
 .../parser/visitors/AbstractVisitor.java      |  4 +-
 .../parser/visitors/AssignValidator.java      |  2 +-
 .../parser/visitors/VariablePrinter.java      |  2 +-
 8 files changed, 59 insertions(+), 32 deletions(-)
 rename src/com/annimon/ownlang/parser/ast/{AssignmentStatement.java => AssignmentExpression.java} (77%)
 rename src/com/annimon/ownlang/parser/ast/{ContainerAssignmentStatement.java => ContainerAssignmentExpression.java} (64%)

diff --git a/program.own b/program.own
index b94c859..bd365f0 100644
--- a/program.own
+++ b/program.own
@@ -217,4 +217,7 @@ def funcWithOptionalArgs(str, count = 5, prefix = "<", suffix = ">") = prefix +
 
 println funcWithOptionalArgs("*")
 println funcWithOptionalArgs("+", 2)
-println funcWithOptionalArgs("*", 10, "<!")
\ No newline at end of file
+println funcWithOptionalArgs("*", 10, "<!")
+
+v1 = v2 = v3 = v4 = 5
+echo(v1, v2, v3, v4)
\ No newline at end of file
diff --git a/src/com/annimon/ownlang/parser/Parser.java b/src/com/annimon/ownlang/parser/Parser.java
index f3a982f..b2d5905 100644
--- a/src/com/annimon/ownlang/parser/Parser.java
+++ b/src/com/annimon/ownlang/parser/Parser.java
@@ -87,9 +87,6 @@ public final class Parser {
         if (match(TokenType.MATCH)) {
             return new ExprStatement(match());
         }
-        if (match(TokenType.EXTRACT)) {
-            return destructuringAssignment();
-        }
         if (lookMatch(0, TokenType.WORD) && lookMatch(1, TokenType.LPAREN)) {
             return new ExprStatement(function(qualifiedName()));
         }
@@ -97,17 +94,12 @@ public final class Parser {
     }
     
     private Statement assignmentStatement() {
-        if (lookMatch(0, TokenType.WORD) && lookMatch(1, TokenType.EQ)) {
-            final String variable = consume(TokenType.WORD).getText();
-            consume(TokenType.EQ);
-            return new AssignmentStatement(variable, expression());
+        if (match(TokenType.EXTRACT)) {
+            return destructuringAssignment();
         }
-        
-        final Expression qualifiedNameExpr = qualifiedName();
-        if (lookMatch(0, TokenType.EQ) && (qualifiedNameExpr instanceof ContainerAccessExpression)) {
-            consume(TokenType.EQ);
-            final ContainerAccessExpression containerExpr = (ContainerAccessExpression) qualifiedNameExpr;
-            return new ContainerAssignmentStatement(containerExpr, expression());
+        final Expression assignment = assignmentStrict();
+        if (assignment != null) {
+            return new ExprStatement(assignment);
         }
         throw new ParseException("Unknown statement: " + get(0));
     }
@@ -330,9 +322,36 @@ public final class Parser {
     }
     
     private Expression expression() {
+        return assignment();
+    }
+    
+    private Expression assignment() {
+        final Expression assignment = assignmentStrict();
+        if (assignment != null) {
+            return assignment;
+        }
         return ternary();
     }
     
+    private Expression assignmentStrict() {
+        if (lookMatch(0, TokenType.WORD) && lookMatch(1, TokenType.EQ)) {
+            final String variable = consume(TokenType.WORD).getText();
+            consume(TokenType.EQ);
+            return new AssignmentExpression(variable, expression());
+        }
+        
+        final int position = pos;
+        final Expression qualifiedNameExpr = qualifiedName();
+        if (lookMatch(0, TokenType.EQ) && (qualifiedNameExpr instanceof ContainerAccessExpression)) {
+            consume(TokenType.EQ);
+            final ContainerAccessExpression containerExpr = (ContainerAccessExpression) qualifiedNameExpr;
+            return new ContainerAssignmentExpression(containerExpr, expression());
+        }
+        pos = position;
+        
+        return null;
+    }
+    
     private Expression ternary() {
         Expression result = logicalOr();
         
diff --git a/src/com/annimon/ownlang/parser/ast/AssignmentStatement.java b/src/com/annimon/ownlang/parser/ast/AssignmentExpression.java
similarity index 77%
rename from src/com/annimon/ownlang/parser/ast/AssignmentStatement.java
rename to src/com/annimon/ownlang/parser/ast/AssignmentExpression.java
index 3293cef..fa489de 100644
--- a/src/com/annimon/ownlang/parser/ast/AssignmentStatement.java
+++ b/src/com/annimon/ownlang/parser/ast/AssignmentExpression.java
@@ -7,20 +7,21 @@ import com.annimon.ownlang.lib.Variables;
  *
  * @author aNNiMON
  */
-public final class AssignmentStatement implements Statement {
+public final class AssignmentExpression implements Expression {
 
     public final String variable;
     public final Expression expression;
 
-    public AssignmentStatement(String variable, Expression expression) {
+    public AssignmentExpression(String variable, Expression expression) {
         this.variable = variable;
         this.expression = expression;
     }
     
     @Override
-    public void execute() {
+    public Value eval() {
         final Value result = expression.eval();
         Variables.set(variable, result);
+        return result;
     }
     
     @Override
diff --git a/src/com/annimon/ownlang/parser/ast/ContainerAssignmentStatement.java b/src/com/annimon/ownlang/parser/ast/ContainerAssignmentExpression.java
similarity index 64%
rename from src/com/annimon/ownlang/parser/ast/ContainerAssignmentStatement.java
rename to src/com/annimon/ownlang/parser/ast/ContainerAssignmentExpression.java
index 8fd8d13..577b838 100644
--- a/src/com/annimon/ownlang/parser/ast/ContainerAssignmentStatement.java
+++ b/src/com/annimon/ownlang/parser/ast/ContainerAssignmentExpression.java
@@ -10,29 +10,33 @@ import com.annimon.ownlang.lib.Value;
  *
  * @author aNNiMON
  */
-public final class ContainerAssignmentStatement implements Statement {
+public final class ContainerAssignmentExpression implements Expression {
     
     public final ContainerAccessExpression containerExpr;
     public final Expression expression;
 
-    public ContainerAssignmentStatement(ContainerAccessExpression array, Expression expression) {
+    public ContainerAssignmentExpression(ContainerAccessExpression array, Expression expression) {
         this.containerExpr = array;
         this.expression = expression;
     }
     
     @Override
-    public void execute() {
+    public Value eval() {
         final Value container = containerExpr.getContainer();
         final Value lastIndex = containerExpr.lastIndex();
         switch (container.type()) {
-            case Types.ARRAY:
+            case Types.ARRAY: {
+                final Value result = expression.eval();
                 final int arrayIndex = (int) lastIndex.asNumber();
-                ((ArrayValue) container).set(arrayIndex, expression.eval());
-                return;
+                ((ArrayValue) container).set(arrayIndex, result);
+                return result;
+            }
 
-            case Types.MAP:
-                ((MapValue) container).set(lastIndex, expression.eval());
-                return;
+            case Types.MAP: {
+                final Value result = expression.eval();
+                ((MapValue) container).set(lastIndex, result);
+                return result;
+            }
                 
             default:
                 throw new TypeException("Array or map expected. Got " + container.type());
diff --git a/src/com/annimon/ownlang/parser/ast/Visitor.java b/src/com/annimon/ownlang/parser/ast/Visitor.java
index 16ae8d4..ecfff57 100644
--- a/src/com/annimon/ownlang/parser/ast/Visitor.java
+++ b/src/com/annimon/ownlang/parser/ast/Visitor.java
@@ -7,13 +7,13 @@ package com.annimon.ownlang.parser.ast;
 public interface Visitor {
     
     void visit(ArrayExpression s);
-    void visit(AssignmentStatement s);
+    void visit(AssignmentExpression s);
     void visit(BinaryExpression s);
     void visit(BlockStatement s);
     void visit(BreakStatement s);
     void visit(ConditionalExpression s);
     void visit(ContainerAccessExpression s);
-    void visit(ContainerAssignmentStatement s);
+    void visit(ContainerAssignmentExpression s);
     void visit(ContinueStatement s);
     void visit(DoWhileStatement s);
     void visit(DestructuringAssignmentStatement s);
diff --git a/src/com/annimon/ownlang/parser/visitors/AbstractVisitor.java b/src/com/annimon/ownlang/parser/visitors/AbstractVisitor.java
index 0bf56a7..a75cf57 100644
--- a/src/com/annimon/ownlang/parser/visitors/AbstractVisitor.java
+++ b/src/com/annimon/ownlang/parser/visitors/AbstractVisitor.java
@@ -18,7 +18,7 @@ public abstract class AbstractVisitor implements Visitor {
     }
 
     @Override
-    public void visit(AssignmentStatement s) {
+    public void visit(AssignmentExpression s) {
         s.expression.accept(this);
     }
 
@@ -53,7 +53,7 @@ public abstract class AbstractVisitor implements Visitor {
     }
 
     @Override
-    public void visit(ContainerAssignmentStatement s) {
+    public void visit(ContainerAssignmentExpression s) {
         s.containerExpr.accept(this);
         s.expression.accept(this);
     }
diff --git a/src/com/annimon/ownlang/parser/visitors/AssignValidator.java b/src/com/annimon/ownlang/parser/visitors/AssignValidator.java
index dd11a2b..54ae67b 100644
--- a/src/com/annimon/ownlang/parser/visitors/AssignValidator.java
+++ b/src/com/annimon/ownlang/parser/visitors/AssignValidator.java
@@ -10,7 +10,7 @@ import com.annimon.ownlang.parser.ast.*;
 public final class AssignValidator extends AbstractVisitor {
 
     @Override
-    public void visit(AssignmentStatement s) {
+    public void visit(AssignmentExpression s) {
         super.visit(s);
         if (Variables.isExists(s.variable)) {
             throw new RuntimeException("Cannot assign value to constant");
diff --git a/src/com/annimon/ownlang/parser/visitors/VariablePrinter.java b/src/com/annimon/ownlang/parser/visitors/VariablePrinter.java
index 821b129..e8d7c97 100644
--- a/src/com/annimon/ownlang/parser/visitors/VariablePrinter.java
+++ b/src/com/annimon/ownlang/parser/visitors/VariablePrinter.java
@@ -9,7 +9,7 @@ import com.annimon.ownlang.parser.ast.*;
 public final class VariablePrinter extends AbstractVisitor {
 
     @Override
-    public void visit(AssignmentStatement s) {
+    public void visit(AssignmentExpression s) {
         super.visit(s);
         System.out.println(s.variable);
     }