Support unicode property names in as.cpp

paulbiss · fredemmott · commit 3336daa921e4 · 2018-05-10T14:49:11.000-07:00
Summary: Fixes #8192 Reviewed By: fredemmott Differential Revision: D7954911
diff --git a/hphp/runtime/vm/as.cpp b/hphp/runtime/vm/as.cpp
@@ -2616,7 +2616,10 @@ void parse_property(AsmState& as) {
   auto const userTyStr = userTy ? userTy : staticEmptyString();
 
   std::string name;
-  if (!as.in.readword(name)) {
+  as.in.skipSpaceTab();
+  as.in.consumePred(!boost::is_any_of(" \t\r\n#;="),
+                    std::back_inserter(name));
+  if (name.empty()) {
     as.error("expected name for property");
   }
 
diff --git a/hphp/test/quick/unicode-parse.php b/hphp/test/quick/unicode-parse.php
@@ -0,0 +1,18 @@
+<?php
+
+class ಠ_ಠ {
+    public $ИдентификаторТовара;
+    public $το_αναγνωριστικό_του;
+
+    function __construct() {
+      $this->ИдентификаторТовара = 100;
+      $this->το_αναγνωριστικό_του = 200;
+    }
+}
+
+$ಠ_ರೃ = new ಠ_ಠ;
+
+$ಠ_ರೃ->ИдентификаторТовара = 10;
+$ಠ_ರೃ->το_αναγνωριστικό_του = 20;
+
+var_dump($ಠ_ರೃ);
diff --git a/hphp/test/quick/unicode-parse.php.expect b/hphp/test/quick/unicode-parse.php.expect
@@ -0,0 +1,6 @@
+object(ಠ_ಠ)#1 (2) {
+  ["ИдентификаторТовара"]=>
+  int(10)
+  ["το_αναγνωριστικό_του"]=>
+  int(20)
+}
diff --git a/hphp/test/run b/hphp/test/run
@@ -1920,6 +1920,8 @@ function strip_hhas_file($file) {
         || substr($s, 0, 7) === ".strict") {
       continue;
     }
+    // We have separate tests for srclocs, skip over them here
+    if (substr(trim($s), 0, 7) === '.srcloc') continue;
     $buf .= $s;
   }
   fclose($h);
