initial commit

rjhdby · rjhdby · commit fc5fdf7dc771 · 2019-01-14T17:42:22.000+03:00
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
@@ -396,6 +396,47 @@ ZEND_API zend_ast * ZEND_FASTCALL zend_ast_list_add(zend_ast *ast, zend_ast *op)
 	return (zend_ast *) list;
 }
 
+ZEND_API zend_ast * ZEND_FASTCALL zend_ast_add_constructor(zend_ast *ast, uint32_t start_lineno, zend_ast *params) {
+    zend_ast_list* par_list = (zend_ast_list *) params;
+    int i;
+	zend_ast* body_ast = zend_ast_create_list(0, ZEND_AST_STMT_LIST);
+
+    for(i=0; i < par_list->children; i++){
+		zval *param = zend_ast_get_zval(par_list->child[i]->child[1]);
+		char* param_name = Z_STRVAL_P(param);
+
+		zend_ast *class_prop = zend_ast_create(
+				ZEND_AST_PROP,
+				zend_ast_create(
+						ZEND_AST_VAR,
+						zend_ast_create_zval_from_str(zend_string_init("this", strlen("this"), 0))
+				),
+				zend_ast_create_zval_from_str(zend_string_init(param_name, strlen(param_name), 0))
+		);
+
+		zend_ast *constructor_param = zend_ast_create(
+				ZEND_AST_VAR,
+				zend_ast_create_zval_from_str(zend_string_init(param_name, strlen(param_name), 0))
+		);
+
+		zend_ast *assignment = zend_ast_create(ZEND_AST_ASSIGN, class_prop, constructor_param);
+		zend_ast_list_add(body_ast, assignment);
+    }
+
+	zend_ast *constructor = zend_ast_create_decl(
+			ZEND_AST_METHOD,
+			ZEND_ACC_PUBLIC,
+			start_lineno,
+			NULL,
+			zend_string_init("__construct", strlen("__construct"), 0),
+			params,
+			NULL,
+			body_ast,
+			NULL
+			);
+	return zend_ast_list_add(ast, constructor);
+}
+
 static int zend_ast_add_array_element(zval *result, zval *offset, zval *expr)
 {
 	switch (Z_TYPE_P(offset)) {
diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h
@@ -261,6 +261,7 @@ ZEND_API zend_ast *zend_ast_create_list(uint32_t init_children, zend_ast_kind ki
 #endif
 
 ZEND_API zend_ast * ZEND_FASTCALL zend_ast_list_add(zend_ast *list, zend_ast *op);
+ZEND_API zend_ast * ZEND_FASTCALL zend_ast_add_constructor(zend_ast *ast, uint32_t start_lineno, zend_ast *params);
 
 ZEND_API zend_ast *zend_ast_create_decl(
 	zend_ast_kind kind, uint32_t flags, uint32_t start_lineno, zend_string *doc_comment,
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -503,9 +503,14 @@ class_declaration_statement:
 		class_modifiers T_CLASS { $<num>$ = CG(zend_lineno); }
 		T_STRING extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 			{ $$ = zend_ast_create_decl(ZEND_AST_CLASS, $1, $<num>3, $7, zend_ast_get_str($4), $5, $6, $9, NULL); }
-	|	T_CLASS { $<num>$ = CG(zend_lineno); }
+	|	T_CLASS
 		T_STRING extends_from implements_list backup_doc_comment '{' class_statement_list '}'
-			{ $$ = zend_ast_create_decl(ZEND_AST_CLASS, 0, $<num>2, $6, zend_ast_get_str($3), $4, $5, $8, NULL); }
+			{ $$ = zend_ast_create_decl(ZEND_AST_CLASS, 0, CG(zend_lineno), $5, zend_ast_get_str($2), $3, $4, $7, NULL); }
+	|	T_CLASS
+		T_STRING  '(' parameter_list ')' extends_from implements_list backup_doc_comment '{' class_statement_list '}'
+			{ $$ = zend_ast_create_decl(ZEND_AST_CLASS, 0, CG(zend_lineno), $8, zend_ast_get_str($2), $6,
+			            $7, zend_ast_add_constructor($10, CG(zend_lineno), $4), NULL);
+			}
 ;
 
 class_modifiers:
@@ -714,7 +719,6 @@ class_statement_list:
 			{ $$ = zend_ast_create_list(0, ZEND_AST_STMT_LIST); }
 ;
 
-
 class_statement:
 		variable_modifiers property_list ';'
 			{ $$ = $2; $$->attr = $1; }
