Merge pull request #52 from adamjimenez/patch-6

unexpected T_CONSTANT_ENCAPSED_STRING, expecting T_OBJECT_OPERATOR

Author: niklasvh

PHP.js

@@ -7088,9 +7088,9 @@ PHP.Lexer = function( src, ini ) {
 
                             var re;
                             if ( curlyOpen > 0) {
-                                re = /^([^\\\$"{}\]]|\\.)+/g;
+                                re = /^([^\\\$"{}\]\)\->]|\\.)+/g;
                             } else {
-                                re = /^([^\\\$"{]|\\.|{[^\$])+/g;
+                                re = /^([^\\\$"{]|\\.|{[^\$]|\$(?=[^a-zA-Z_\x7f-\uffff]))+/g;
                             }
 
                             while(( match = result.match( re )) !== null ) {
@@ -7103,7 +7103,7 @@ PHP.Lexer = function( src, ini ) {
 
 
                                 results.push([
-                                    parseInt(( curlyOpen > 0 ) ? PHP.Constants.T_CONSTANT_ENCAPSED_STRING : PHP.Constants.T_ENCAPSED_AND_WHITESPACE, 10),
+                                    parseInt(( curlyOpen > 0 ) ? PHP.Constants.T_STRING : PHP.Constants.T_ENCAPSED_AND_WHITESPACE, 10),
                                     match[ 0 ].replace(/\n/g,"\\n").replace(/\r/g,""),
                                     line
                                     ]);
@@ -7114,6 +7114,15 @@ PHP.Lexer = function( src, ini ) {
 
                             }
 
+                            if( curlyOpen > 0 && result.match(/^\->/) !== null ) {
+                                results.push([
+                                    parseInt(PHP.Constants.T_OBJECT_OPERATOR, 10),
+                                    '->',
+                                    line
+                                    ]);
+                                result = result.substring( 2 );
+                            }
+
                             if( result.match(/^{\$/) !== null ) {
 
                                 results.push([