Index: src/parser/xhpast/__tests__/PHPASTParserTestCase.php
===================================================================
--- src/parser/xhpast/__tests__/PHPASTParserTestCase.php
+++ src/parser/xhpast/__tests__/PHPASTParserTestCase.php
@@ -53,6 +53,9 @@
           }
           $type = $key;
           break;
+        case 'comment':
+          // Human readable comment providing test case information.
+          break;
         default:
           throw new Exception(
             pht(
Index: src/parser/xhpast/__tests__/data/php-comments.php.expect
===================================================================
--- /dev/null
+++ src/parser/xhpast/__tests__/data/php-comments.php.expect
@@ -0,0 +1,59 @@
+{
+  "tree"   : [
+    9000,
+    0,
+    8,
+    [
+      [
+        9006,
+        0,
+        0,
+        [
+          [
+            9007,
+            0,
+            0
+          ]
+        ]
+      ]
+    ]
+  ],
+  "stream" : [
+    [
+      371,
+      6
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      369,
+      10
+    ],
+    [
+      369,
+      11
+    ],
+    [
+      369,
+      13
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      370,
+      18
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      369,
+      24
+    ]
+  ]
+}
Index: src/parser/xhpast/__tests__/data/php-comments.php.test
===================================================================
--- /dev/null
+++ src/parser/xhpast/__tests__/data/php-comments.php.test
@@ -0,0 +1,10 @@
+# pass
+<?php
+
+# comment
+// comment
+/* comment */
+/**
+ * comment
+ */
+/* unterminated comment
Index: src/parser/xhpast/__tests__/data/php-literals.php.expect
===================================================================
--- /dev/null
+++ src/parser/xhpast/__tests__/data/php-literals.php.expect
@@ -0,0 +1,351 @@
+{
+  "tree"   : [
+    9000,
+    0,
+    39,
+    [
+      [
+        9006,
+        0,
+        38,
+        [
+          [
+            9007,
+            0,
+            0
+          ],
+          [
+            9004,
+            2,
+            3,
+            [
+              [
+                9086,
+                2,
+                2
+              ]
+            ]
+          ],
+          [
+            9004,
+            5,
+            6,
+            [
+              [
+                9086,
+                5,
+                5
+              ]
+            ]
+          ],
+          [
+            9004,
+            8,
+            10,
+            [
+              [
+                9075,
+                8,
+                9,
+                [
+                  [
+                    9081,
+                    8,
+                    8
+                  ],
+                  [
+                    9086,
+                    9,
+                    9
+                  ]
+                ]
+              ]
+            ]
+          ],
+          [
+            9004,
+            12,
+            14,
+            [
+              [
+                9075,
+                12,
+                13,
+                [
+                  [
+                    9081,
+                    12,
+                    12
+                  ],
+                  [
+                    9086,
+                    13,
+                    13
+                  ]
+                ]
+              ]
+            ]
+          ],
+          [
+            9004,
+            16,
+            17,
+            [
+              [
+                9086,
+                16,
+                16
+              ]
+            ]
+          ],
+          [
+            9004,
+            19,
+            20,
+            [
+              [
+                9086,
+                19,
+                19
+              ]
+            ]
+          ],
+          [
+            9004,
+            22,
+            23,
+            [
+              [
+                9087,
+                22,
+                22
+              ]
+            ]
+          ],
+          [
+            9004,
+            25,
+            26,
+            [
+              [
+                9087,
+                25,
+                25
+              ]
+            ]
+          ],
+          [
+            9004,
+            28,
+            29,
+            [
+              [
+                9084,
+                28,
+                28
+              ]
+            ]
+          ],
+          [
+            9004,
+            31,
+            32,
+            [
+              [
+                9087,
+                31,
+                31
+              ]
+            ]
+          ],
+          [
+            9004,
+            34,
+            35,
+            [
+              [
+                9087,
+                34,
+                34
+              ]
+            ]
+          ],
+          [
+            9014,
+            37,
+            38,
+            [
+              [
+                9013,
+                37,
+                37
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  ],
+  "stream" : [
+    [
+      371,
+      6
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      307,
+      1
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      308,
+      3
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      45,
+      1
+    ],
+    [
+      307,
+      1
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      45,
+      1
+    ],
+    [
+      308,
+      3
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      308,
+      3
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      307,
+      4
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      317,
+      3
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      317,
+      3
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      318,
+      3
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      317,
+      4
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      317,
+      4
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      309,
+      3
+    ],
+    [
+      58,
+      1
+    ],
+    [
+      375,
+      1
+    ]
+  ]
+}
Index: src/parser/xhpast/__tests__/data/php-literals.php.test
===================================================================
--- /dev/null
+++ src/parser/xhpast/__tests__/data/php-literals.php.test
@@ -0,0 +1,15 @@
+# pass
+<?php
+
+1;
+1.1;
+-1;
+-1.1;
+1e1;
+0xFF;
+'a';
+"a";
+`a`;
+b'a';
+b"a";
+lbl:
Index: src/parser/xhpast/__tests__/data/php-tags.php.expect
===================================================================
--- /dev/null
+++ src/parser/xhpast/__tests__/data/php-tags.php.expect
@@ -0,0 +1,203 @@
+{
+  "tree"   : [
+    9000,
+    0,
+    20,
+    [
+      [
+        9006,
+        0,
+        20,
+        [
+          [
+            9007,
+            0,
+            0
+          ],
+          [
+            9004,
+            1,
+            2,
+            [
+              [
+                9086,
+                1,
+                1
+              ]
+            ]
+          ],
+          [
+            9004,
+            4,
+            4,
+            [
+              [
+                9005
+              ]
+            ]
+          ],
+          [
+            9007,
+            5,
+            5
+          ],
+          [
+            9004,
+            7,
+            8,
+            [
+              [
+                9086,
+                7,
+                7
+              ]
+            ]
+          ],
+          [
+            9004,
+            10,
+            10,
+            [
+              [
+                9005
+              ]
+            ]
+          ],
+          [
+            9007,
+            11,
+            11
+          ],
+          [
+            9004,
+            13,
+            14,
+            [
+              [
+                9086,
+                13,
+                13
+              ]
+            ]
+          ],
+          [
+            9004,
+            16,
+            16,
+            [
+              [
+                9005
+              ]
+            ]
+          ],
+          [
+            9034,
+            17,
+            17
+          ],
+          [
+            9034,
+            18,
+            18
+          ],
+          [
+            9034,
+            19,
+            19
+          ],
+          [
+            9034,
+            20,
+            20
+          ]
+        ]
+      ]
+    ]
+  ],
+  "stream" : [
+    [
+      371,
+      6
+    ],
+    [
+      307,
+      1
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      374,
+      3
+    ],
+    [
+      371,
+      2
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      307,
+      1
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      374,
+      3
+    ],
+    [
+      372,
+      3
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      307,
+      1
+    ],
+    [
+      59,
+      1
+    ],
+    [
+      375,
+      1
+    ],
+    [
+      374,
+      3
+    ],
+    [
+      313,
+      1
+    ],
+    [
+      313,
+      5
+    ],
+    [
+      313,
+      1
+    ],
+    [
+      313,
+      5
+    ]
+  ]
+}
Index: src/parser/xhpast/__tests__/data/php-tags.php.test
===================================================================
--- /dev/null
+++ src/parser/xhpast/__tests__/data/php-tags.php.test
@@ -0,0 +1,6 @@
+# pass, comment="Omits ASP tags since parser support is off as built."
+<?php 1; ?>
+<? 1; ?>
+<?= 1; ?>
+<a />
+<b ?>