Merge pull request #196 from zephir-lang/#195-trait-support

#195 - Add traits support

Author: Jeckerson

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.0] - 2026-07-03
+### Added
+- Add trait support: top-level `trait Name { }` declarations (AST `type: "trait"`) and in-class `use A, B;` statement. ([zephir-lang/php-zephir-parser#195](https://github.com/zephir-lang/php-zephir-parser/issues/195)).
+
+### Changed
+- `trait` is now a reserved keyword; identifiers named `trait` are a syntax error.
+
 ## [2.0.4] - 2026-06-04
 ### Fixed
 - A `-` glued to a digit right after a value (e.g. `len-1`, `5-1`, `arr[0]-1`, `len -1`) is now scanned as the binary subtraction operator instead of the sign of a negative literal, which previously produced a `Syntax error`. Unary negative literals (after `=`, `(`, `,`, `return`, etc.) are unchanged, so parameter defaults, constants and array keys keep their negative-literal AST

VERSION

@@ -1 +1 @@
-2.0.4
+2.1.0

package.xml

@@ -12,28 +12,29 @@
         <email>anton@phalcon.io</email>
         <active>yes</active>
     </lead>
-    <date>2026-06-04</date>
+    <date>2026-07-03</date>
     <time>10:00:00</time>
     <version>
-        <release>2.0.4</release>
-        <api>2.0.4</api>
+        <release>2.1.0</release>
+        <api>2.1.0</api>
     </version>
     <stability>
         <release>stable</release>
         <api>stable</api>
     </stability>
     <license uri="https://github.com/zephir-lang/php-zephir-parser/blob/development/LICENSE">MIT</license>
     <notes>
-        Thu, Jun 04, 2026 - Zephir Parser 2.0.4
+        Fri, Jul 03, 2026 - Zephir Parser 2.1.0
 
-        = Fixed:
+        = Added:
 
-        - A `-` glued to a digit right after a value (e.g. `len-1`, `5-1`,
-          `arr[0]-1`, `len -1`) is now scanned as the binary subtraction
-          operator instead of the sign of a negative literal, which previously
-          produced a `Syntax error`. Unary negative literals (after `=`, `(`,
-          `,`, `return`, etc.) are unchanged, so parameter defaults, constants
-          and array keys keep their negative-literal AST.
+        - Trait support: top-level `trait Name { }` declarations and in-class
+          `use A, B;` statements (zephir-lang/zephir#504). Traits accept no
+          modifiers and cannot extends/implements, matching PHP.
+
+        = Changed:
+
+        - `trait` is now a reserved keyword.
     </notes>
     <contents>
         <dir name="/">

parser/base.c

@@ -145,6 +145,9 @@ void xx_parse_program(zval *return_value, char *program, size_t program_length,
 			case XX_T_INTERFACE:
 				xx_(xx_parser, XX_INTERFACE, NULL, parser_status);
 				break;
+			case XX_T_TRAIT:
+				xx_(xx_parser, XX_TRAIT, NULL, parser_status);
+				break;
 			case XX_T_EXTENDS:
 				xx_(xx_parser, XX_EXTENDS, NULL, parser_status);
 				break;

parser/parser.h

@@ -324,7 +324,41 @@ static void xx_ret_interface(zval *ret, xx_parser_token *T, zval *interface_defi
 	parser_add_int(ret, "char", state->class_char);
 }
 
-static void xx_ret_class_definition(zval *ret, zval *properties, zval *methods, zval *constants, xx_scanner_state *state)
+static void xx_ret_trait(zval *ret, xx_parser_token *T, zval *trait_definition, xx_scanner_state *state)
+{
+	array_init(ret);
+
+	parser_add_str(ret, "type", "trait");
+	parser_add_str_free(ret, "name", T->token);
+	efree(T);
+
+	if (trait_definition) {
+		parser_add_zval(ret, "definition", trait_definition);
+	}
+
+	parser_add_str(ret, "file", state->active_file);
+	parser_add_int(ret, "line", state->class_line);
+	parser_add_int(ret, "char", state->class_char);
+}
+
+static void xx_ret_use_trait(zval *ret, zval *traits_list, xx_parser_token *D, xx_scanner_state *state)
+{
+	array_init(ret);
+
+	parser_add_str(ret, "type", "use-trait");
+	parser_add_zval(ret, "traits", traits_list);
+
+	if (D) {
+		parser_add_str_free(ret, "docblock", D->token);
+		efree(D);
+	}
+
+	parser_add_str(ret, "file", state->active_file);
+	parser_add_int(ret, "line", state->active_line);
+	parser_add_int(ret, "char", state->active_char);
+}
+
+static void xx_ret_class_definition(zval *ret, zval *properties, zval *methods, zval *constants, zval *uses, xx_scanner_state *state)
 {
 	array_init(ret);
 
@@ -337,6 +371,9 @@ static void xx_ret_class_definition(zval *ret, zval *properties, zval *methods,
 	if (constants) {
 		parser_add_zval(ret, "constants", constants);
 	}
+	if (uses) {
+		parser_add_zval(ret, "uses", uses);
+	}
 
 	parser_add_str(ret, "file", state->active_file);
 	parser_add_int(ret, "line", state->class_line);
@@ -350,13 +387,14 @@ static void xx_ret_class_definition(zval *ret, zval *properties, zval *methods,
  */
 static void xx_ret_class_definition_from_list(zval *ret, zval *list, xx_scanner_state *state)
 {
-	zval properties, methods, constants;
+	zval properties, methods, constants, uses;
 	zval *member, *type_zval;
 	const char *type_str;
 
 	ZVAL_UNDEF(&properties);
 	ZVAL_UNDEF(&methods);
 	ZVAL_UNDEF(&constants);
+	ZVAL_UNDEF(&uses);
 
 	if (list && Z_TYPE_P(list) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(list), member) {
@@ -384,6 +422,11 @@ static void xx_ret_class_definition_from_list(zval *ret, zval *list, xx_scanner_
 					array_init(&methods);
 				}
 				parser_array_append(&methods, member);
+			} else if (strcmp(type_str, "use-trait") == 0) {
+				if (Z_TYPE(uses) == IS_UNDEF) {
+					array_init(&uses);
+				}
+				parser_array_append(&uses, member);
 			} else {
 				/* Unknown member type — undo the addref */
 				Z_TRY_DELREF_P(member);
@@ -397,6 +440,7 @@ static void xx_ret_class_definition_from_list(zval *ret, zval *list, xx_scanner_
 		Z_TYPE(properties) != IS_UNDEF ? &properties : NULL,
 		Z_TYPE(methods)    != IS_UNDEF ? &methods    : NULL,
 		Z_TYPE(constants)  != IS_UNDEF ? &constants  : NULL,
+		Z_TYPE(uses)       != IS_UNDEF ? &uses       : NULL,
 		state
 	);
 }

parser/scanner.h

@@ -101,6 +101,7 @@
 #define XX_T_DEPRECATED 399
 #define XX_T_REQUIRE_ONCE 459
 #define XX_T_YIELD 460
+#define XX_T_TRAIT 461
 
 /* Operators */
 #define XX_T_AT '@'

parser/scanner.re

@@ -145,6 +145,14 @@ int xx_get_token(xx_scanner_state *s, xx_scanner_token *token) {
 			return 0;
 		}
 
+		'trait' {
+			s->active_char += sizeof("trait")-1;
+			s->class_line = s->active_line;
+			s->class_char = s->active_char;
+			token->opcode = XX_T_TRAIT;
+			return 0;
+		}
+
 		'extends' {
 			s->active_char += sizeof("extends")-1;
 			token->opcode = XX_T_EXTENDS;

parser/zephir.lemon

@@ -147,6 +147,10 @@ xx_top_statement(R) ::= xx_interface_def(T) . {
 	R = T;
 }
 
+xx_top_statement(R) ::= xx_trait_def(T) . {
+	R = T;
+}
+
 xx_top_statement(R) ::= xx_comment(T) . {
 	R = T;
 }
@@ -315,6 +319,15 @@ xx_interface_def(R) ::= INTERFACE CONSTANT(I) EXTENDS xx_implements_list(L) xx_i
 	xx_ret_interface(&R, I, &B, &L, status->scanner_state);
 }
 
+/* Traits take no modifiers and cannot extend or implement (as in PHP) */
+xx_trait_def(R) ::= TRAIT IDENTIFIER(I) xx_class_body(B) . {
+	xx_ret_trait(&R, I, &B, status->scanner_state);
+}
+
+xx_trait_def(R) ::= TRAIT CONSTANT(I) xx_class_body(B) . {
+	xx_ret_trait(&R, I, &B, status->scanner_state);
+}
+
 xx_class_def(R) ::= CLASS IDENTIFIER(I) xx_class_body(B) . {
 	xx_ret_class(&R, I, &B, 0, 0, NULL, NULL, status->scanner_state);
 }
@@ -504,6 +517,19 @@ xx_class_member(R) ::= xx_class_method_definition(M) . {
 	R = M;
 }
 
+xx_class_member(R) ::= xx_use_trait_statement(U) . {
+	R = U;
+}
+
+/* In-class trait use: `use A;` or `use A, B;` — reuses the implements name list */
+xx_use_trait_statement(R) ::= USE xx_implements_list(L) DOTCOMMA . {
+	xx_ret_use_trait(&R, &L, NULL, status->scanner_state);
+}
+
+xx_use_trait_statement(R) ::= COMMENT(D) USE xx_implements_list(L) DOTCOMMA . {
+	xx_ret_use_trait(&R, &L, D, status->scanner_state);
+}
+
 /* A flat list of class members in any order */
 xx_class_member_list(R) ::= xx_class_member_list(L) xx_class_member(M) . {
 	xx_ret_list(&R, &L, &M, status->scanner_state);

tests/classes/trait-all-caps.phpt

@@ -0,0 +1,47 @@
+--TEST--
+Trait declaration with an all-caps name (CONSTANT token) (zephir#504)
+--SKIPIF--
+<?php include(__DIR__ . '/../skipif.inc'); ?>
+--FILE--
+<?php
+$code =<<<ZEP
+namespace Test;
+
+trait CSV
+{
+	public function parse() -> int
+	{
+		return 1;
+	}
+}
+ZEP;
+
+$ir = zephir_parse_file($code, '(eval code)');
+$trait = $ir[1];
+
+echo "type: " . $trait["type"] . "\n";
+echo "name: " . $trait["name"] . "\n";
+echo "methods count: " . count($trait["definition"]["methods"]) . "\n";
+
+$code =<<<ZEP
+namespace Test;
+
+trait Empty1
+{
+}
+ZEP;
+
+$ir = zephir_parse_file($code, '(eval code)');
+$trait = $ir[1];
+
+echo "type: " . $trait["type"] . "\n";
+echo "name: " . $trait["name"] . "\n";
+echo "definition set: " . var_export(isset($trait["definition"]), true) . "\n";
+?>
+--EXPECT--
+type: trait
+name: CSV
+methods count: 1
+type: trait
+name: Empty1
+definition set: false

tests/classes/trait-syntax-errors.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Traits reject modifiers, extends, implements; interfaces reject `use` — syntax errors, as in PHP (zephir#504)
+--SKIPIF--
+<?php include(__DIR__ . '/../skipif.inc'); ?>
+--FILE--
+<?php
+$cases = [
+	'final trait'      => "trait X {\n}\nfinal trait Y {\n}",
+	'abstract trait'   => "abstract trait Y {\n}",
+	'trait extends'    => "trait Y extends Z {\n}",
+	'trait implements' => "trait Y implements Z {\n}",
+	'use in interface' => "interface I {\n\tuse T;\n}",
+];
+
+foreach ($cases as $label => $zep) {
+	$ir = zephir_parse_file("namespace Test;\n" . $zep, '(eval code)');
+	echo $label . ": " . $ir["type"] . "\n";
+}
+?>
+--EXPECT--
+final trait: error
+abstract trait: error
+trait extends: error
+trait implements: error
+use in interface: error