restore originial implementation

Author: genintho

src/parser/class.js

@@ -234,18 +234,8 @@ module.exports = {
       this.next();
     }
 
-    let type = null;
-    let nullable = false;
-    if (this.version >= 803) {
-      [nullable, type] = this.read_optional_type();
-    }
-    let name = null;
-
-    // read_optional_type can return a "type" even if the constant does not actually have a type.
-    if (type && type.kind === "name" && this.token === "=") {
-      name = type.name;
-      type = null;
-    }
+    const [nullable, type] =
+      this.version >= 803 ? this.read_optional_type() : [false, null];
 
     const result = this.node("classconstant");
     const items = this.read_list(
@@ -266,14 +256,9 @@ module.exports = {
           (this.version >= 700 && this.is("IDENTIFIER"))
         ) {
           constName = this.node("identifier");
-          name = this.text();
+          const name = this.text();
           this.next();
           constName = constName(name);
-        }
-        // read_optional_type is not always returning just a type but
-        else if (name) {
-          constName = this.node("identifier")(name);
-          name = null;
         } else {
           this.expect("IDENTIFIER");
         }
@@ -379,6 +364,11 @@ module.exports = {
     if (nullable) {
       this.next();
     }
+
+    if (this.peek() === "=") {
+      return [false, null];
+    }
+
     let type = this.read_types();
     if (nullable && !type) {
       this.raiseError(