From a2a076d038aac964c7d91c1cd603debcac05f423 Mon Sep 17 00:00:00 2001
From: harttle <yangjvn@126.com>
Date: Thu, 3 Aug 2017 13:46:00 +0800
Subject: [PATCH] refactor access seq parsing

---
 src/scope.js  | 74 +++++++++++++++++++++++++--------------------------
 test/scope.js |  4 +++
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/scope.js b/src/scope.js
index a65cc32c1..25bc50c41 100644
--- a/src/scope.js
+++ b/src/scope.js
@@ -100,49 +100,47 @@ var Scope = {
   propertyAccessSeq: function (str) {
     var seq = []
     var name = ''
-    for (var i = 0; i < str.length; i++) {
-      if (str[i] === '[') {
-        seq.push(name)
-        name = ''
+    var j
+    var i = 0
+    while (i < str.length) {
+      switch (str[i]) {
+        case '[':
+          push()
 
-        var delemiter = str[i + 1]
-        if (delemiter !== "'" && delemiter !== '"') {
-          // foo[bar.coo]
-          var j = matchRightBracket(str, i + 1)
-          assert(j !== -1, `unbalanced []: ${str}`)
-          name = str.slice(i + 1, j)
-          if (lexical.isInteger(name)) {
-            // foo[1]
-            seq.push(name)
-          } else {
-            // foo["bar"]
-            seq.push(this.get(name))
+          var delemiter = str[i + 1]
+          if (/['"]/.test(delemiter)) { // foo["bar"]
+            j = str.indexOf(delemiter, i + 2)
+            assert(j !== -1, `unbalanced ${delemiter}: ${str}`)
+            name = str.slice(i + 2, j)
+            push()
+            i = j + 2
+          } else { // foo[bar.coo]
+            j = matchRightBracket(str, i + 1)
+            assert(j !== -1, `unbalanced []: ${str}`)
+            name = str.slice(i + 1, j)
+            if (!lexical.isInteger(name)) { // foo[bar] vs. foo[1]
+              name = this.get(name)
+            }
+            push()
+            i = j + 1
           }
-          name = ''
-          i = j
-        } else {
-          // foo["bar"]
-          j = str.indexOf(delemiter, i + 2)
-          assert(j !== -1, `unbalanced ${delemiter}: ${str}`)
-          name = str.slice(i + 2, j)
-          seq.push(name)
-          name = ''
-          i = j + 2
-        }
-      } else if (str[i] === '.') {
-        // foo.bar
-        // foo.bar[0].foo
-        // In the case of foo.bar[0].foo, must check length because
-        // name will be empty after the closing `]` is handled above.
-        if (name.length) seq.push(name)
-        name = ''
-      } else {
-        // foo.bar
-        name += str[i]
+          break
+        case '.':// foo.bar, foo[0].bar
+          push()
+          i++
+          break
+        default:// foo.bar
+          name += str[i]
+          i++
       }
     }
-    if (name.length) seq.push(name)
+    push()
     return seq
+
+    function push () {
+      if (name.length) seq.push(name)
+      name = ''
+    }
   }
 }
 
diff --git a/test/scope.js b/test/scope.js
index de6ab3e3f..97f5d9c5a 100644
--- a/test/scope.js
+++ b/test/scope.js
@@ -42,6 +42,10 @@ describe('scope', function () {
       expect(scope.propertyAccessSeq('bar["foo"].zoo'))
         .to.deep.equal(['bar', 'foo', 'zoo'])
     })
+    it('should handle nested access 4', function () {
+      expect(scope.propertyAccessSeq('foo[0].bar'))
+        .to.deep.equal(['foo', '0', 'bar'])
+    })
   })
 
   describe('#get()', function () {