Commit non-functional changes

SoniEx2 · Dec 18, 2014 · b279aeb · b279aeb
1 parent 54293c0
commit b279aeb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 /src/luac
 /src/lua
 /src/liblua.a
+/install
+/tests
diff --git a/src/lparser.c b/src/lparser.c
@@ -895,13 +895,8 @@ static void primaryexp (LexState *ls, expdesc *v) {
   }
 }
 
-
-static void suffixedexp (LexState *ls, expdesc *v) {
-  /* suffixedexp ->
-       primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | ':[' exp ']' funcargs | funcargs } */
+static void indexexp (LexState *ls, expdesc *v) {
   FuncState *fs = ls->fs;
-  int line = ls->linenumber;
-  primaryexp(ls, v);
   for (;;) {
     switch (ls->t.token) {
       case '.': {  /* fieldsel */
@@ -915,7 +910,24 @@ static void suffixedexp (LexState *ls, expdesc *v) {
         luaK_indexed(fs, v, &key);
         break;
       }
-      case ':': {  /* `:' NAME funcargs */
+      default: return;
+    }
+  }
+}
+
+static void suffixedexp (LexState *ls, expdesc *v) {
+  /* suffixedexp ->
+       primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | ':[' exp ']' funcargs | funcargs } */
+  FuncState *fs = ls->fs;
+  int line = ls->linenumber;
+  primaryexp(ls, v);
+  for (;;) {
+    switch (ls->t.token) {
+      case '.': case '[': {  /* fieldsel | `[' exp1 `]' */
+        indexexp(ls, v);
+        break;
+      }
+      case ':': {  /* `:' NAME funcargs | `:[' exp1 `]' funcargs */
         expdesc key;
         int flag = 0;
         luaX_next(ls);
@@ -928,6 +940,7 @@ static void suffixedexp (LexState *ls, expdesc *v) {
           checkname(ls, &key);
         luaK_self(fs, v, &key);
         if (flag) ls->fs->freereg++;
+        indexexp(ls, v);
         funcargs(ls, v, line);
         break;
       }