fix glayzzle#15

Author: ichiriac

src/parser/function.js

@@ -108,6 +108,7 @@ module.exports = {
           break;
         } else {
           this.error([',', ')']);
+          break;
         }
       }
     }

src/parser/namespace.js

@@ -20,7 +20,10 @@ module.exports = {
       this.currentNamespace = [''];
       return result([''], this.read_code_block(true));
     } else {
-      if(this.token === this.tok.T_NAMESPACE) this.error(['{', this.tok.T_STRING]);
+      if(this.token === this.tok.T_NAMESPACE) {
+        this.error(['{', this.tok.T_STRING]);
+        this.next(); // ignore namespace token
+      }
       var name = this.read_namespace_name();
       if (this.token == ';') {
         this.currentNamespace = name;
@@ -38,6 +41,11 @@ module.exports = {
         );
       } else {
         this.error(['{', ';']);
+        // graceful mode :
+        this.currentNamespace = name;
+        var body = this.read_top_statements();
+        this.expect(this.EOF);
+        return result(name, body);
       }
     }
   }

src/parser/scalar.js

@@ -109,7 +109,10 @@ module.exports = {
         case '[':             // short array format
           return this.read_array();
         default:
-          this.error('SCALAR');
+          var err = this.error('SCALAR');
+          // graceful mode : ignore token & return error node
+          this.next();
+          return err;
       }
     }
   }

src/parser/statement.js

@@ -147,7 +147,10 @@ module.exports = {
           case this.tok.T_INTERFACE:
             return this.read_interface(flag);
           default:
-            this.error([this.tok.T_CLASS, this.tok.T_INTERFACE]);
+            var err = this.error([this.tok.T_CLASS, this.tok.T_INTERFACE]);
+            // graceful mode : ignore token & go next
+            this.next();
+            return err;
         }
       case this.tok.T_CLASS:
         return this.read_class(0);

src/parser/variable.js

@@ -59,7 +59,9 @@ module.exports = {
       getter = this.text();
       this.next();
     } else {
-      this.error([this.tok.T_VARIABLE, this.tok.T_STRING]);
+      getter = this.error([this.tok.T_VARIABLE, this.tok.T_STRING]);
+      // graceful mode : set getter as error node and continue
+      this.next();
     }
     if (from[0] != 'ns') {
       from = ['lookup', 'class', from];
@@ -131,7 +133,10 @@ module.exports = {
               this.expect('}').next();
               break;
             default:
-              this.error([this.tok.T_STRING, this.tok.T_VARIABLE]);
+              what = this.error([this.tok.T_STRING, this.tok.T_VARIABLE]);
+              // graceful mode : set what as error mode & continue
+              this.next();
+              break;
           }
           result = ['prop', result, what];
           break;
@@ -217,7 +222,9 @@ module.exports = {
           this.next();
           break;
         default:
-          this.error(['{', '$', this.tok.T_VARIABLE]);
+          result = this.error(['{', '$', this.tok.T_VARIABLE]);
+          // graceful mode
+          this.next();
       }
       result = ['lookup', 'var', result];
     }