Re: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend_language_scanner.l

At 20:11 16.07.2002, Andi Gutmans wrote:

andi            Tue Jul 16 15:11:14 2002 EDT

Modified files:

    /ZendEngine2        zend_language_scanner.l

Log: - Syntactic sugar - Add "public" as a synonym for "var". - Now we have the three P's. You can do: <?

        class MyClass {
                public $a;
                private $b;
                protected $c;
        }

?> Index: ZendEngine2/zend_language_scanner.l diff -u ZendEngine2/zend_language_scanner.l:1.53 ZendEngine2/zend_language_scanner.l:1.54

--- ZendEngine2/zend_language_scanner.l:1.53    Mon Jul 15 14:09:56 2002

+++ ZendEngine2/zend_language_scanner.l Tue Jul 16 15:11:14 2002 @@ -713,6 +713,11 @@

        return T_PROTECTED;

} +<ST_IN_SCRIPTING>"public" {

+       return T_VAR;

+} + + <ST_IN_SCRIPTING>"unset" {

        return T_UNSET;

}

It would be better to return T_PUBLIC instead of T_VAR and handle T_PUBLIC in the parser since we want to have public,protected and private member functions. See patch is below: Index: Zend/zend_language_parser.y =================================================================== RCS file: /repository/ZendEngine2/zend_language_parser.y,v retrieving revision 1.79 diff -u -r1.79 zend_language_parser.y

--- Zend/zend_language_parser.y 24 Nov 2002 20:32:49 -0000      1.79

+++ Zend/zend_language_parser.y 28 Nov 2002 16:35:17 -0000 @@ -114,7 +114,7 @@ %token T_ABSTRACT %token T_PRIVATE %token T_PROTECTED +%token T_PUBLIC %token T_VAR %token T_UNSET %token T_ISSET @@ -468,6 +469,7 @@

        |       T_STATIC        { $$.op_type = T_STATIC; }
        |       T_PRIVATE       { $$.op_type = T_PRIVATE; }
        |       T_PROTECTED     { $$.op_type = T_PROTECTED; }
+       |       T_PUBLIC        { $$.op_type = T_VAR; }

; class_constant_declaration: Index: Zend/zend_language_scanner.l =================================================================== RCS file: /repository/ZendEngine2/zend_language_scanner.l,v retrieving revision 1.66 diff -u -r1.66 zend_language_scanner.l

--- Zend/zend_language_scanner.l        20 Nov 2002 18:00:23 -0000      1.66
+++ Zend/zend_language_scanner.l        28 Nov 2002 16:35:20 -0000

@@ -739,7 +739,7 @@ } <ST_IN_SCRIPTING>"public" {

-       return T_VAR;
+       return T_PUBLIC;

} <ST_IN_SCRIPTING>"unset" {