Allow underscore only variables that are longer than 4 characters.

Author: davidofferman

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.3.1] - 2019-05-01
 ### Fixed
 - Fixed `config.m4` to correct install headers
+- Fixed underscore only identifiers to be more than 4 characters
 
 ## [1.3.0] - 2019-04-27
 ### Added

parser/scanner.re

@@ -652,12 +652,7 @@ int xx_get_token(xx_scanner_state *s, xx_scanner_token *token) {
 				}
 			}
 
-			/* This is hack */
-			if ((token->len == 1 && (!memcmp(token->value, "_", sizeof("_")-1)))
-				|| (token->len == 2 && (!memcmp(token->value, "__", sizeof("__")-1)))
-				|| (token->len == 3 && (!memcmp(token->value, "___", sizeof("___")-1)))
-				|| (token->len == 4 && (!memcmp(token->value, "____", sizeof("____")-1)))
-				) {
+			if (strspn(token->value, "_") == token->len) {
 				token->opcode = XX_T_IDENTIFIER;
 				return 0;
 			}

tests/base/variables.phpt

@@ -21,6 +21,7 @@ class Foo\Bar\Bas
     public \$_abc;
     public \_cde;
     public __edc;
+    public ______;
 }
 ZEP;
 
@@ -56,7 +57,7 @@ array(2) {
     ["definition"]=>
     array(4) {
       ["properties"]=>
-      array(9) {
+      array(10) {
         [0]=>
         array(6) {
           ["visibility"]=>
@@ -217,6 +218,24 @@ array(2) {
           ["line"]=>
           int(16)
           ["char"]=>
+          int(10)
+        }
+        [9]=>
+        array(6) {
+          ["visibility"]=>
+          array(1) {
+            [0]=>
+            string(6) "public"
+          }
+          ["type"]=>
+          string(8) "property"
+          ["name"]=>
+          string(6) "______"
+          ["file"]=>
+          string(11) "(eval code)"
+          ["line"]=>
+          int(17)
+          ["char"]=>
           int(1)
         }
       }