Todd Nowacki
6d8999b7c1
Some simple changes for HPHP to help make it clang friendly ---hphp/compiler/package.cpp ---hphp/compiler/package.h ---hphp/runtime/ext/ext_curl.cpp ---hphp/runtime/ext/pdo_mysql.cpp ---hphp/tools/tc-print/offline-x86-code.h ---hphp/util/async_func.cpp ---hphp/util/async_func.h ---hphp/util/compression.cpp ---hphp/util/compression.h ---hphp/util/db_conn.cpp ---hphp/util/db_conn.h Deleted unused private fields ~~~hphp/compiler/analysis/symbol_table.h Static assert had to be outside the union +++hphp/runtime/TARGETS Added clang specific flag to supress unneded declaration warning ~~~hphp/runtime/base/datatype.h Use of logical '&&' with constant operand. Added !=0 to remove warning, ~~~hphp/runtime/base/string_data.h Static fields cannot be declared in an anonymous struct/union ~~~hphp/runtime/ext/bcmath/TARGETS Moved gcc specific flag from preprocessor_flags to compiler_specific_flags ~---hphp/runtime/ext/pdo_mysql.cpp Removed unnecessary self asignment for row_count ~~~hphp/runtime/vm/bytecode.h Added default return statement ~---hphp/runtime/vm/jit/codegen.cpp spillSlotsToSize was unused ~~~hphp/runtime/vm/jit/irtranslator.cpp ~~~hphp/runtime/vm/jit/linearscan.cpp The c++ standard states default arguments shall not be specified in the parameter-declaration-clause of a lambda-declarator. ~~~hphp/runtime/vm/jit/vectortranslator-internal.h Clang had some issues determining the correct cast when these macros were used A simple '!= 0' check was added to make things explicit for clang. ~~~hphp/tools/tc-print/perf-events.h Added parens to make clang happy +++hphp/util/asm-x64.h The constexpr needed to be initialized +++hphp/util/base.h Clang also supports tr1 libraries ~~~hphp/util/bits.h Again, clang had issues with implicit casting to bool. added != 0 check ~~~hphp/util/malloc_size_class.h Ambiguous operator precedence. Added parentheses. ~~~hphp/util/thread_local.h Misspelled function
93 linhas
3.5 KiB
C++
93 linhas
3.5 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifndef incl_HPHP_PACKAGE_H_
|
|
#define incl_HPHP_PACKAGE_H_
|
|
|
|
#include "hphp/compiler/hphp.h"
|
|
#include "hphp/util/string_bag.h"
|
|
#include "hphp/util/file_cache.h"
|
|
#include "hphp/util/mutex.h"
|
|
|
|
namespace HPHP {
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
DECLARE_BOOST_TYPES(ServerData);
|
|
DECLARE_BOOST_TYPES(AnalysisResult);
|
|
|
|
/**
|
|
* A package contains a list of directories and files that will be parsed
|
|
* and analyzed together. No files outside of a package will be considered
|
|
* in type inferences. One single AnalysisResult will be generated and it
|
|
* contains all classes, functions, variables, constants and their types.
|
|
* Therefore, a package is really toppest entry point for parsing.
|
|
*/
|
|
class Package {
|
|
public:
|
|
explicit Package(const char *root,
|
|
bool bShortTags = true,
|
|
bool bAspTags = false);
|
|
|
|
void addAllFiles(bool force); // add from Option::PackageDirectories/Files
|
|
|
|
void addSourceFile(const char *fileName, bool check = false);
|
|
void addInputList(const char *listFileName);
|
|
void addStaticFile(const char *fileName);
|
|
void addDirectory(const std::string &path, bool force);
|
|
void addDirectory(const char *path, bool force);
|
|
void addStaticDirectory(const std::string path);
|
|
void addPHPDirectory(const char *path, bool force);
|
|
|
|
bool parse(bool check);
|
|
bool parse(const char *fileName);
|
|
bool parseImpl(const char *fileName);
|
|
|
|
AnalysisResultPtr getAnalysisResult() { return m_ar;}
|
|
int getFileCount() const { return m_files.size();}
|
|
int getLineCount() const { return m_lineCount;}
|
|
int getCharCount() const { return m_charCount;}
|
|
void getFiles(std::vector<std::string> &files) const;
|
|
|
|
void saveStatsToFile(const char *filename, int totalSeconds) const;
|
|
int saveStatsToDB(ServerDataPtr server, int totalSeconds,
|
|
const std::string &branch, int revision) const;
|
|
void commitStats(ServerDataPtr server, int runId) const;
|
|
|
|
const std::string& getRoot() const { return m_root;}
|
|
FileCachePtr getFileCache();
|
|
|
|
private:
|
|
std::string m_root;
|
|
std::set<std::string> m_filesToParse;
|
|
StringBag m_files;
|
|
void *m_dispatcher;
|
|
|
|
Mutex m_mutex;
|
|
AnalysisResultPtr m_ar;
|
|
int m_lineCount;
|
|
int m_charCount;
|
|
|
|
FileCachePtr m_fileCache;
|
|
std::set<std::string> m_directories;
|
|
std::set<std::string> m_staticDirectories;
|
|
std::set<std::string> m_extraStaticFiles;
|
|
std::map<std::string,std::string> m_discoveredStaticFiles;
|
|
};
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
}
|
|
#endif // incl_HPHP_PACKAGE_H_
|