Fix typedefs/shapes for whole program optimization

Needed a few cases for KindOfTypedefStatement,
EnableExperimentalHipHopSyntax, and passing it through to the scanner.

hphp/compiler/analysis/alias_manager.cpp

@@ -2003,6 +2003,9 @@ StatementPtr AliasManager::canonicalizeRecur(StatementPtr s, int &ret) {
     break;
   }
 
+  case Statement::KindOfTypedefStatement:
+    break;
+
   case Statement::KindOfCatchStatement:
     clear();
     ret = Converge;

hphp/compiler/analysis/control_flow.cpp

@@ -498,6 +498,7 @@ int ControlFlowBuilder::before(ConstructRawPtr cp) {
           }
 
           case Statement::KindOfEchoStatement:
+          case Statement::KindOfTypedefStatement:
             break;
 
           default:

hphp/compiler/option.cpp

@@ -278,6 +278,11 @@ void Option::Load(Hdf &config) {
   EnableShortTags = config["EnableShortTags"].getBool(true);
   if (EnableShortTags) ScannerType |= Scanner::AllowShortTags;
   else ScannerType &= ~Scanner::AllowShortTags;
+  if (EnableHipHopExperimentalSyntax) {
+    ScannerType |= Scanner::EnableHipHopKeywords;
+  } else {
+    ScannerType &= ~Scanner::EnableHipHopKeywords;
+  }
 
   EnableAspTags = config["EnableAspTags"].getBool();
   if (EnableAspTags) ScannerType |= Scanner::AllowAspTags;

hphp/test/quick/hphp_opts.hip_hop_syntax

@@ -0,0 +1 @@
+-vEnableHipHopSyntax=1 -vEnableHipHopExperimentalSyntax=1

hphp/test/quick/parse_fail_shapes.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/parse_fail_shapes2.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/parse_shapes.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_class.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_class_fail1.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_class_fail2.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_cyclic.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_duplicate.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_duplicate2.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_duplicate3.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_duplicate4.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_duplicate_ok.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_invalid_name.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_mixed_case.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_newtype.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_non_class.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_non_class_fail1.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_non_class_fail2.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_shape.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax

hphp/test/quick/typedef_to_typedef.php.hphp_opts

@@ -0,0 +1 @@
+hphp_opts.hip_hop_syntax