mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-26 16:52:40 +01:00
Revert XHP classtag support in arcanist
Summary: Revert of D715, which allowed you to put xhp classes into libphutil libraries. We're removing support for XHP in resolving T635. According to @ide, removing this won't break anything. Test Plan: Straight revert. Grepped for methods. Reviewers: btrahan, ide, nh, jungejason Reviewed By: ide CC: aran, epriestley Maniphest Tasks: T635 Differential Revision: https://secure.phabricator.com/D1511
This commit is contained in:
parent
0781554a22
commit
3ccb418b93
1 changed files with 1 additions and 12 deletions
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright 2011 Facebook, Inc.
|
* Copyright 2012 Facebook, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -65,7 +65,6 @@ class PhutilModuleRequirements {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function addClassDeclaration(XHPASTNode $where, $name) {
|
public function addClassDeclaration(XHPASTNode $where, $name) {
|
||||||
$name = self::mungeXHPClassName($name);
|
|
||||||
return $this->addDeclaration('class', $where, $name);
|
return $this->addDeclaration('class', $where, $name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,10 +98,8 @@ class PhutilModuleRequirements {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function addClassDependency($child, XHPASTNode $where, $name) {
|
public function addClassDependency($child, XHPASTNode $where, $name) {
|
||||||
$name = self::mungeXHPClassName($name);
|
|
||||||
if ($child !== null) {
|
if ($child !== null) {
|
||||||
if (empty($this->builtins['class'][$name])) {
|
if (empty($this->builtins['class'][$name])) {
|
||||||
$child = self::mungeXHPClassName($child);
|
|
||||||
$this->chain['class'][$child] = $name;
|
$this->chain['class'][$child] = $name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -177,12 +174,4 @@ class PhutilModuleRequirements {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function mungeXHPClassName($name) {
|
|
||||||
if (strlen($name) && $name[0] == ':') {
|
|
||||||
// XHP's semantic actions munge element names without a preceding colon.
|
|
||||||
$name = substr($name, 1);
|
|
||||||
return 'xhp_'.str_replace(array(':', '-'), array('__', '_'), $name);
|
|
||||||
}
|
|
||||||
return $name;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue