From 5f71e9a9be87ee09735ed199afd4d9a9168cbbe0 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Sun, 31 Jul 2016 14:09:23 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A6=D0=B5=D0=BF=D0=BE=D1=87=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=BE=D0=B2=20=D1=84=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/annimon/ownlang/parser/Parser.java    | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/annimon/ownlang/parser/Parser.java b/src/main/java/com/annimon/ownlang/parser/Parser.java
index 0490fe4..8c51dc9 100644
--- a/src/main/java/com/annimon/ownlang/parser/Parser.java
+++ b/src/main/java/com/annimon/ownlang/parser/Parser.java
@@ -159,7 +159,7 @@ public final class Parser {
             return new ExprStatement(match());
         }
         if (lookMatch(0, TokenType.WORD) && lookMatch(1, TokenType.LPAREN)) {
-            return new ExprStatement(function(qualifiedName()));
+            return new ExprStatement(functionChain(qualifiedName()));
         }
         return assignmentStatement();
     }
@@ -297,6 +297,23 @@ public final class Parser {
         return statementOrBlock();
     }
     
+    private Expression functionChain(Expression qualifiedNameExpr) {
+        // f1().f2().f3() || f1().key
+        final Expression expr = function(qualifiedNameExpr);
+        if (lookMatch(0, TokenType.DOT)) {
+            final List<Expression> indices = variableSuffix();
+            if (indices == null | indices.isEmpty()) return expr;
+
+            if (lookMatch(0, TokenType.LPAREN)) {
+                // next function call
+                return functionChain(new ContainerAccessExpression(expr, indices));
+            }
+            // container access
+            return new ContainerAccessExpression(expr, indices);
+        }
+        return expr;
+    }
+
     private FunctionalExpression function(Expression qualifiedNameExpr) {
         // function(arg1, arg2, ...)
         consume(TokenType.LPAREN);
@@ -684,18 +701,18 @@ public final class Parser {
         }
         return variable();
     }
-    
+
     private Expression variable() {
         // function(...
         if (lookMatch(0, TokenType.WORD) && lookMatch(1, TokenType.LPAREN)) {
-            return function(new ValueExpression(consume(TokenType.WORD).getText()));
+            return functionChain(new ValueExpression(consume(TokenType.WORD).getText()));
         }
         
         final Expression qualifiedNameExpr = qualifiedName();
         if (qualifiedNameExpr != null) {
             // variable(args) || arr["key"](args) || obj.key(args)
             if (lookMatch(0, TokenType.LPAREN)) {
-                return function(qualifiedNameExpr);
+                return functionChain(qualifiedNameExpr);
             }
             // postfix increment/decrement
             if (match(TokenType.PLUSPLUS)) {
@@ -727,7 +744,7 @@ public final class Parser {
         }
         return new ContainerAccessExpression(current.getText(), indices);
     }
-    
+
     private List<Expression> variableSuffix() {
         // .key1.arr1[expr1][expr2].key2
         if (!lookMatch(0, TokenType.DOT) && !lookMatch(0, TokenType.LBRACKET)) {