wip

Author: desIstUrGuad

Zend/zend_language_scanner.l

@@ -1538,12 +1538,12 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 	RETURN_TOKEN_WITH_IDENT(T_PRINT);
 }
 
-<ST_IN_FUNC_DEF,ST_IN_GENERIC> "<" {
+<ST_IN_FUNC_DEF,ST_IN_GENERIC,ST_IN_CLASS_DEF> "<" {
     yy_push_state(ST_IN_GENERIC);
     RETURN_TOKEN(T_GENERIC_START);
 }
 
-<ST_IN_FUNC_DEF,ST_IN_GENERIC> ">" {
+<ST_IN_FUNC_DEF,ST_IN_GENERIC,ST_IN_CLASS_DEF> ">" {
     yy_pop_state();
     RETURN_TOKEN(T_GENERIC_END);
 }
@@ -1554,9 +1554,19 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 
 
 <ST_IN_SCRIPTING>"class" {
+    yy_push_state(ST_IN_CLASS_DEF);
 	RETURN_TOKEN_WITH_IDENT(T_CLASS);
 }
 
+
+
+<ST_IN_CLASS_DEF>"{" {
+    yy_pop_state();
+    yy_push_state(ST_IN_SCRIPTING);
+    enter_nesting('{');
+    RETURN_TOKEN('{');
+}
+
 <ST_IN_SCRIPTING>"interface" {
 	RETURN_TOKEN_WITH_IDENT(T_INTERFACE);
 }
@@ -1578,11 +1588,11 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 	RETURN_TOKEN_WITH_IDENT(T_ENUM);
 }
 
-<ST_IN_SCRIPTING>"extends" {
+<ST_IN_CLASS_DEF>"extends" {
 	RETURN_TOKEN_WITH_IDENT(T_EXTENDS);
 }
 
-<ST_IN_SCRIPTING>"implements" {
+<ST_IN_CLASS_DEF>"implements" {
 	RETURN_TOKEN_WITH_IDENT(T_IMPLEMENTS);
 }
 
@@ -1596,7 +1606,7 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 	RETURN_TOKEN(T_NULLSAFE_OBJECT_OPERATOR);
 }
 
-<ST_IN_SCRIPTING,ST_LOOKING_FOR_PROPERTY, ST_IN_FUNC_DEF>{WHITESPACE}+ {
+<ST_IN_SCRIPTING,ST_LOOKING_FOR_PROPERTY,ST_IN_FUNC_DEF,ST_IN_GENERIC,ST_IN_CLASS_DEF>{WHITESPACE}+ {
 	goto return_whitespace;
 }
 
@@ -1738,9 +1748,14 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 }
 
 <ST_IN_SCRIPTING>"private" {
+    yy_push_state(ST_IN_PROPERTY_TYPE_DEF);
 	RETURN_TOKEN_WITH_IDENT(T_PRIVATE);
 }
 
+<ST_IN_PROPERTY_TYPE_DEF> {
+
+}
+
 <ST_IN_SCRIPTING>"protected" {
 	RETURN_TOKEN_WITH_IDENT(T_PROTECTED);
 }
@@ -1925,8 +1940,13 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 }
 
 <ST_IN_FUNC_DEF>"(" {
-    enter_nesting('(');
     yy_pop_state();
+    enter_nesting(yytext[0]);
+    RETURN_TOKEN(yytext[0]);
+}
+
+<ST_IN_GENERIC>":"|"," {
+	RETURN_TOKEN(yytext[0]);
 }
 
 <ST_IN_SCRIPTING>{TOKENS} {
@@ -2415,7 +2435,7 @@ inline_char_handler:
 	RETURN_TOKEN(T_NS_SEPARATOR);
 }
 
-<ST_IN_SCRIPTING,ST_VAR_OFFSET,ST_IN_FUNC_DEF>{LABEL} {
+<ST_IN_SCRIPTING,ST_VAR_OFFSET,ST_IN_FUNC_DEF,ST_IN_CLASS_DEF>{LABEL} {
 	RETURN_TOKEN_WITH_STR(T_STRING, 0);
 }
 

le-test/simple.php le-test/simple-class.phple-test/simple.php renamed to le-test/simple-class.php

@@ -1,8 +1,6 @@
 <?php
 
-function
-
-class GenericTestClass<T> {
+class GenericTestClass<T: Serializable> {
     // T can be used as type alias inside of 'GenericTestClass'
     public function __construct(
         private T $property

t.php

@@ -1,6 +1,6 @@
 <?php
 
-class RandomAssSerializableContaier!🥖T, K : Serializer!🥖T, K, A!🥥!🥥 {
+class RandomAssSerializableContaier<T, K : Serialize<T, K, A>> {
 
     private array $content = [];
 

tree.php

@@ -1,5 +1,10 @@
 <?php
-$tokens = token_get_all('<?php
-function noOp(): void {}');
+$classTokens = token_get_all(
+'<?php
+class Test<T: Serializable, K> {
+    public Serializable<T> $test;
+    function __construct<T>() {}
+}
+');
 
-var_export($tokens);
+var_export($classTokens);