Master

spec/09-lexical-structure.md

@@ -719,14 +719,17 @@ echo "\$myC->p1 = >$myC->p1<\n";  // → $myC->p1 = >2<
 
 <pre>
   <i>heredoc-string-literal::</i>
-    &lt;&lt;&lt;  <i>hd-start-identifier   new-line   hd-char-sequence<sub>opt</sub>  new-line hd-end-identifier</i>  ;<i><sub>opt</sub>   new-line</i>
+    &lt;&lt;&lt;  <i>hd-start-identifier   new-line   hd-body<sub>opt</sub>   hd-end-identifier</i>  ;<i><sub>opt</sub>   new-line</i>
 
   <i>hd-start-identifier::</i>
     <i>name</i>
 
   <i>hd-end-identifier::</i>
     <i>name</i>
 
+  <i>hd-body::</i>
+    <i>hd-char-sequence</i><sub>opt</sub>   new-line
+
   <i>hd-char-sequence::</i>
     <i>hd-char</i>
     <i>hd-char-sequence   hd-char</i>
@@ -797,12 +800,12 @@ Some more text<
 
 <pre>
   <i>nowdoc-string-literal::</i>
-    &lt;&lt;&lt;  '  <i>hd-start-identifier</i>  '  <i>new-line  hd-char-sequence<sub>opt</sub>   new-line hd-end-identifier</i>  ;<i><sub>opt</sub>   new-line</i>
+    &lt;&lt;&lt;  '  <i>hd-start-identifier</i>  '  <i>new-line  hd-body<sub>opt</sub>   hd-end-identifier</i>  ;<i><sub>opt</sub>   new-line</i>
 </pre>
 
 **Defined elsewhere**
 
-* [*hd-char-sequence*](09-lexical-structure.md#heredoc-string-literals)
+* [*hd-body*](09-lexical-structure.md#heredoc-string-literals)
 * [*hd-end-identifier*](09-lexical-structure.md#heredoc-string-literals)
 * [*hd-start-identifier*](09-lexical-structure.md#heredoc-string-literals)
 * [*new-line*](09-lexical-structure.md#comments)

spec/10-expressions.md

@@ -848,7 +848,7 @@ The *class-type-designator* must not designate an [abstract class](16-classes.md
 
 The *class-type-designator* must not be a [generic type parameter](14-generic-types-methods-and-functions.md#type-parameters).
 
-The *object-creation-expression* will invoke the constructor of the class designated by the *class-type-designator*. 
+The *object-creation-expression* will invoke the constructor of the class designated by the *class-type-designator*.
 
 *argument-expression-list* must contain an argument for each parameter in the
 [constructor's definition](15-functions.md#function-definitions) not having a default value, and each
@@ -1300,7 +1300,7 @@ $anon();  // call the anonymous function
 method of the class designated by *postfix-expression*.
 
 *variable-name* must name a variable which when evaluated produces a string
-containing an instance property or an instance method of the class 
+containing an instance property or an instance method of the class
 designated by *postfix-expression*.
 
 
@@ -1352,14 +1352,14 @@ $p1->move(3, 9);  // calls public instance method move by name
 *name* must designate an instance property or an instance method of the class designated by *postfix-expression*.
 
 *variable-name* must name a variable which when evaluated produces a string
-containing an instance property or an instance method of the class 
+containing an instance property or an instance method of the class
 designated by *postfix-expression*.
 
 **Semantics**
 
-If *postfix-expression* is `null`, no property or method is selected and the 
-resulting value is `null`. Otherwise, the behavior is like that of the 
-[member-selection operator `->`](10-expressions.md#member-selection-operator), 
+If *postfix-expression* is `null`, no property or method is selected and the
+resulting value is `null`. Otherwise, the behavior is like that of the
+[member-selection operator `->`](10-expressions.md#member-selection-operator),
 except that the resulting value is not an lvalue.
 
 ###Postfix Increment and Decrement Operators
@@ -1730,14 +1730,41 @@ error message displayed.
   <i>cast-expression:</i>
     (  <i>cast-type</i>  ) <i>unary-expression</i>
 
-  <i>cast-type: one of</i>
-    bool  int  float  string
+  <i>cast-type:</i>
+    array
+    bool
+    double
+    float
+    int
+    object
+    string
+    <i>name</i>
 </pre>
 
 **Defined elsewhere**
 
+* [*name*](09-lexical-structure.md#names)
 * [*unary-expression*](10-expressions.md#general-4)
 
+**Constraints**
+
+The grammar for the <i>cast-expression</i> introduces certain syntactic
+ambiguities. For example, the expression `(x)-y` could be interpreted as a
+cast of `-y` to type `x`, or as the arithmetical computation of `x-y`.
+
+This ambiguity is resolved as follows:
+
+* If the token inside the parentheses is `array`, `bool`, `double`,
+`float`, `int`, `object` or `string` then the expression is a
+*cast-expression*.
+* Otherwise, if the token following the right parenthesis is `as` or 
+`instanceof` then `(` *name* `)` is a parenthesized expression, not a cast operator.
+* Otherwise, if the token following the right parenthesis is is 
+`$$`, `@`, `~`, `!`, `(`, `+`, `-`, `++`, `--`, or any *name*, *qualified-name*, 
+or *variable-name*, or any numeric, string, Boolean or null literal, or any keyword 
+then the expression is a *cast-expression*.
+* Otherwise, `(` *name* `)` is a parenthesized expression, not a cast operator.
+
 **Semantics**
 
 The

spec/13-enums.md

@@ -9,7 +9,7 @@ An *enumeration* consists of a set of zero or more named, constant values called
 **Syntax**
 <pre>
 <i>enum-declaration:</i>
-  enum  <i>name</i>  <i>enum-base</i>  <i>type-constraint<sub>opt</sub></i>  {  <i>enumerator-list<sub>opt</sub></i>  }
+  <i>attribute-specification</i><sub>opt</sub>   enum  <i>name</i>  <i>enum-base</i>  <i>type-constraint<sub>opt</sub></i>  {  <i>enumerator-list<sub>opt</sub></i>  }
 <i>enum-base:</i>
   :  int
   :  string
@@ -22,7 +22,12 @@ An *enumeration* consists of a set of zero or more named, constant values called
   <i>name</i>
 </pre>
 
-*name* is defined in [§§](09-lexical-structure.md#names); *type-constraint* is defined in [§§](05-types.md#general); and *constant-expression* is defined in [§§](10-expressions.md#constant-expressions).
+**Defined elsewhere**
+
+* [*attribute-specification*](21-attributes.md#attribute-specification)
+* [*constant-expression*](10-expressions.md#constant-expressions)
+* [*name*](09-lexical-structure.md#names)
+* [*type-constraint*](05-types.md#general)
 
 **Constraints**
 

spec/22-grammar.md

@@ -252,14 +252,17 @@ octal-digit
     \X  <i>hexadecimal-digit   hexadecimal-digit<sub>opt</sub></i>
 
   <i>heredoc-string-literal::</i>
-    &lt;&lt;&lt; <i>hd-start-identifier   new-line   hd-char-sequence<sub>opt</sub>  new-line hd-end-identifier</i>  ;<i><sub>opt</sub>   new-line</i>
+    &lt;&lt;&lt; <i>hd-start-identifier   new-line   hd-body<sub>opt</sub>   hd-end-identifier</i>  ;<i><sub>opt</sub>   new-line</i>
 
   <i>hd-start-identifier::</i>
     <i>name</i>
 
   <i>hd-end-identifier::</i>
     <i>name</i>
 
+  <i>hd-body::</i>
+    <i>hd-char-sequence</i><sub>opt</sub>   new-line
+
   <i>hd-char-sequence::</i>
     <i>hd-char</i>
     <i>hd-char-sequence   hd-char</i>
@@ -278,9 +281,8 @@ octal-digit
   <i>hd-simple-escape-sequence:: one of</i>
     \\   \$   \e   \f   \n   \r   \t   \v
 
-
   <i>nowdoc-string-literal::</i>
-    &lt;&lt;&lt; '  <i>hd-start-identifier</i>  '  <i>new-line  hd-char-sequence<sub>opt</sub>   new-line hd-end-identifier</i>  ;<i><sub>opt</sub>   new-line</i>     
+    &lt;&lt;&lt; '  <i>hd-start-identifier</i>  '  <i>new-line   hd-body<sub>opt</sub>   hd-end-identifier</i>  ;<i><sub>opt</sub>   new-line</i>     
 </pre>
 
 ####The Null Literal
@@ -576,7 +578,7 @@ octal-digit
     <i>anonymous-function-parameter-declaration-list</i>
     <i>anonymous-function-parameter-declaration-list</i>  ,
     <i>anonymous-function-parameter-declaration-list</i>  ,  ...
-  
+
   <i>anonymous-function-parameter-declaration-list:</i>
     <i>anonymous-function-parameter-declaration</i>
     <i>anonymous-function-parameter-declaration-list</i>  ,  <i>anonymous-function-parameter-declaration</i>
@@ -732,8 +734,15 @@ octal-digit
   <i>cast-expression:</i>
     (  <i>cast-type</i>  ) <i>unary-expression</i>
 
-  <i>cast-type: one of</i>
-    bool  int  float  string
+  <i>cast-type:</i>
+    array
+    bool
+    double
+    float
+    int
+    object
+    string
+    <i>name</i>
 
   <i>await-expression:</i>
     await  <i>expression</i>
@@ -877,9 +886,6 @@ octal-digit
   <i>simple-assignment-expression:</i>
     <i>unary-expression</i>  =  <i>assignment-expression</i>
 
-  <i>byref-assignment-expression:</i>
-    <i>unary-expression</i>  =  &  <i>assignment-expression</i>
-
   <i>compound-assignment-expression:</i>
     <i>unary-expression   compound-assignment-operator   assignment-expression</i>
 
@@ -1086,7 +1092,7 @@ octal-digit
 
 <pre>
   <i>enum-declaration:</i>
-  enum  <i>name</i>  <i>enum-base</i>  <i>type-constraint<sub>opt</sub></i>  {  <i>enumerator-list<sub>opt</sub></i>  }
+    <i>attribute-specification</i><sub>opt</sub>  enum  <i>name</i>  <i>enum-base</i>  <i>type-constraint<sub>opt</sub></i>  {  <i>enumerator-list<sub>opt</sub></i>  }
 
   <i>enum-base:</i>
     :  int
@@ -1274,7 +1280,7 @@ octal-digit
     <i>attribute-specification<sub>opt</sub></i>  <i>visibility-modifier</i>  function  __destruct  ( )  <i>void-return<sub>opt</sub></i>  <i>compound-statement</i>
 
   <i>void-return</i>:
-    : void 
+    : void
 
   <i>type-constant-declaration:</i>
     <i>abstract-type-constant-declaration</i>