wip

Author: lcarilla

Dockerfile.php

@@ -0,0 +1,8 @@
+FROM ubuntu:noble
+
+RUN apt update && apt install -y pkg-config build-essential autoconf bison re2c \
+                        libxml2-dev libsqlite3-dev cmake gdb
+WORKDIR /app
+
+COPY ./sapi/cli/php php
+RUN chmod +x /app/php

LE.md

@@ -144,16 +144,17 @@ struct _zend_inheritance_cache_entry {
 	zend_class_entry             *traits_and_interfaces[1];
 };
 
-typedef struct _zend_generic_type {
+typedef struct _zend_type_parameter {
 	struct _zend_generic_type *elements;
 	size_t element_count;
-	char *type;
-} zend_generic_type;
+	zend_string *name;
+} zend_type_parameter;
 
 struct _zend_class_entry {
   	// TYPE HERE
 	char type;
-	zend_generic_type *generic_type;
+	size_t generic_type_count;
+	zend_type_parameter *generic_type;
 	zend_string *name;
 	/* class_entry or string depending on ZEND_ACC_LINKED */
 	union {

Zend/zend.h

@@ -156,6 +156,8 @@ enum _zend_ast_kind {
 	ZEND_AST_NAMED_ARG,
 	ZEND_AST_PARENT_PROPERTY_HOOK_CALL,
 
+	ZEND_AST_GENERIC_TYPE,
+
 	/* 3 child nodes */
 	ZEND_AST_METHOD_CALL = 3 << ZEND_AST_NUM_CHILDREN_SHIFT,
 	ZEND_AST_NULLSAFE_METHOD_CALL,

Zend/zend_ast.h

@@ -483,9 +483,11 @@ typedef struct _zend_internal_arg_info {
 } zend_internal_arg_info;
 
 /* arg_info for user functions */
+//LEHP-RELEVANT
 typedef struct _zend_arg_info {
 	zend_string *name;
 	zend_type type;
+    //LEHP-ASSUMPTION: LEPHP code evaluated at runtime
 	zend_string *default_value;
 } zend_arg_info;
 

Zend/zend_compile.h

@@ -1537,30 +1537,14 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 	RETURN_TOKEN_WITH_IDENT(T_PRINT);
 }
 
-<ST_IN_SCRIPTING>"<"{LABEL}">" {
-    yyless(1);
-    yy_push_state(ST_GENERIC);
+<ST_IN_SCRIPTING> "!🥖" {
     RETURN_TOKEN(T_GENERIC_START);
 }
 
-<ST_GENERIC>{LABEL} {
-    RETURN_TOKEN_WITH_STR(T_STRING, 0);
-}
-
-<ST_GENERIC>"," {
-    RETURN_TOKEN(',');
-}
-
-<ST_GENERIC>">" {
-    yy_pop_state();
+<ST_IN_SCRIPTING> "!🥥" {
     RETURN_TOKEN(T_GENERIC_END);
 }
 
-<ST_GENERIC>{WHITESPACE} {
-    HANDLE_NEWLINES(yytext, yyleng);
-    RETURN_TOKEN(T_WHITESPACE);
-}
-
 <ST_IN_SCRIPTING>"class" {
 	RETURN_TOKEN_WITH_IDENT(T_CLASS);
 }

Zend/zend_language_scanner.l

@@ -142,6 +142,7 @@ typedef struct {
 	zend_type types[1];
 } zend_type_list;
 
+//LEHP-RELEVANT new generic type
 #define _ZEND_TYPE_EXTRA_FLAGS_SHIFT 25
 #define _ZEND_TYPE_MASK ((1u << 25) - 1)
 /* Only one of these bits may be set. */
@@ -553,11 +554,20 @@ typedef struct _HashTableIterator {
 	uint32_t      next_copy; // circular linked list via index into EG(ht_iterators)
 } HashTableIterator;
 
+typedef struct _zend_generic_value {
+	struct _zend_generic_value *elements;
+	size_t element_count;
+	zend_string *name;
+} zend_generic_value;
+
 struct _zend_object {
 	zend_refcounted_h gc;
 	uint32_t          handle; // TODO: may be removed ???
 	uint32_t          extra_flags; /* OBJ_EXTRA_FLAGS() */
 	zend_class_entry *ce;
+    //LEHP-OPTIMIZATION: COPY THIS FROM _zend_class_entry
+	size_t generic_value_count;
+	zend_generic_value *generic_values;
 	const zend_object_handlers *handlers;
 	HashTable        *properties;
 	zval              properties_table[1];

Zend/zend_types.h

@@ -0,0 +1,19 @@
+<?php
+class test!🥖K!🥖!🥖bruh!🥥!🥥{
+    public function __construct(
+    public K $lol
+){
+    }
+}
+
+class bruh {
+    public function __construct(
+    public array!🥖bruh!🥥 $le
+    ){}
+
+    public function test(test!🥖bruh!🥥 $le): test!🥖bruh!🥥 {
+    }
+};
+
+
+echo "hi\n";

t.php

@@ -0,0 +1,9 @@
+<?php
+class test<K>{
+    public function __construct(
+    public K $lol
+){
+    }
+}
+
+echo "hi\n";

t2.php

@@ -0,0 +1,18 @@
+<?php
+$tokens = token_get_all('<?php
+
+                         class test!🥖K!🥥{
+                             public function __construct(
+                             public !🥖K!🥥 $lol
+                         ){
+                             }
+                         }
+
+                         $t = new test!🥖bruh!🥥(new bruh(4));
+
+
+                        $le = [new bruh()]
+                        array_map(fn (test!🥖bruh!🥥 $klfe)=>, $le)
+                         echo "hi\n";');
+
+var_export($tokens);