run clang-format

they changed the * location for multivar decls...

Author: undingen

src/analysis/function_analysis.h

@@ -65,7 +65,7 @@ class DefinednessAnalysis {
     typedef llvm::DenseSet<InternedString> RequiredSet;
 
 private:
-    llvm::DenseMap<CFGBlock*, llvm::DenseMap<InternedString, DefinitionLevel>> defined_at_beginning, defined_at_end;
+    llvm::DenseMap<CFGBlock *, llvm::DenseMap<InternedString, DefinitionLevel>> defined_at_beginning, defined_at_end;
     llvm::DenseMap<CFGBlock*, RequiredSet> defined_at_end_sets;
 
 public:

src/asm_writing/assembler.h

@@ -69,7 +69,7 @@ enum class MovType {
 
 class Assembler {
 private:
-    uint8_t* const start_addr, *const end_addr;
+    uint8_t *const start_addr, *const end_addr;
     uint8_t* addr;
     bool failed; // if the rewrite failed at the assembly-generation level for some reason
 

src/asm_writing/icinfo.h

@@ -131,7 +131,7 @@ class ICInfo {
            int slot_size, llvm::CallingConv::ID calling_conv, LiveOutSet live_outs,
            assembler::GenericRegister return_register, TypeRecorder* type_recorder);
     ~ICInfo();
-    void* const start_addr, *const slowpath_rtn_addr, *const continue_addr;
+    void *const start_addr, *const slowpath_rtn_addr, *const continue_addr;
 
     int getSlotSize() { return slot_size; }
     int getNumSlots() { return num_slots; }

src/asm_writing/mc_writer.cpp

@@ -117,7 +117,7 @@ const int OPCODE_ADD = 0b000, OPCODE_SUB = 0b101;
 class X86MCWriter : public MCWriter {
 private:
     uint8_t* addr;
-    uint8_t* const start_addr, *const end_addr;
+    uint8_t *const start_addr, *const end_addr;
     int pops_required;
 
     inline void _emitByte(uint8_t b) {

src/capi/abstract.cpp

@@ -62,7 +62,7 @@ extern "C" PyObject* PyObject_Type(PyObject* o) noexcept {
 
 extern "C" Py_ssize_t _PyObject_LengthHint(PyObject* o, Py_ssize_t defaultvalue) noexcept {
     static PyObject* hintstrobj = NULL;
-    PyObject* ro, *hintmeth;
+    PyObject *ro, *hintmeth;
     Py_ssize_t rv;
 
     /* try o.__len__() */
@@ -164,8 +164,8 @@ extern "C" int PyBuffer_IsContiguous(Py_buffer* view, char fort) noexcept {
 extern "C" int PyBuffer_ToContiguous(void* buf, Py_buffer* view, Py_ssize_t len, char fort) noexcept {
     int k;
     void (*addone)(int, Py_ssize_t*, const Py_ssize_t*);
-    Py_ssize_t* indices, elements;
-    char* dest, *ptr;
+    Py_ssize_t *indices, elements;
+    char *dest, *ptr;
 
     if (len > view->len) {
         len = view->len;
@@ -263,7 +263,7 @@ extern "C" void PyBuffer_Release(Py_buffer* view) noexcept {
 static PyObject* objargs_mktuple(va_list va) noexcept {
     int i, n = 0;
     va_list countva;
-    PyObject* result, *tmp;
+    PyObject *result, *tmp;
 
 #ifdef VA_LIST_IS_ARRAY
     memcpy(countva, va, sizeof(va_list));
@@ -508,7 +508,7 @@ extern "C" int PyObject_IsInstance(PyObject* inst, PyObject* cls) noexcept {
 }
 
 extern "C" PyObject* PyObject_CallFunctionObjArgs(PyObject* callable, ...) noexcept {
-    PyObject* args, *tmp;
+    PyObject *args, *tmp;
     va_list vargs;
 
     if (callable == NULL)
@@ -666,7 +666,7 @@ extern "C" PyObject* PyObject_CallMethod(PyObject* o, const char* name, const ch
 }
 
 extern "C" PyObject* PyObject_CallMethodObjArgs(PyObject* callable, PyObject* name, ...) noexcept {
-    PyObject* args, *tmp;
+    PyObject *args, *tmp;
     va_list vargs;
 
     if (callable == NULL || name == NULL)
@@ -943,8 +943,8 @@ extern "C" void _Py_add_one_to_index_C(int nd, Py_ssize_t* index, const Py_ssize
 extern "C" int PyObject_CopyData(PyObject* dest, PyObject* src) noexcept {
     Py_buffer view_dest, view_src;
     int k;
-    Py_ssize_t* indices, elements;
-    char* dptr, *sptr;
+    Py_ssize_t *indices, elements;
+    char *dptr, *sptr;
 
     if (!PyObject_CheckBuffer(dest) || !PyObject_CheckBuffer(src)) {
         PyErr_SetString(PyExc_TypeError, "both destination and source must have the "
@@ -1131,7 +1131,7 @@ static PyObject* binary_iop(PyObject* v, PyObject* w, const int iop_slot, const
  */
 
 static PyObject* ternary_op(PyObject* v, PyObject* w, PyObject* z, const int op_slot, const char* op_name) noexcept {
-    PyNumberMethods* mv, *mw, *mz;
+    PyNumberMethods *mv, *mw, *mz;
     PyObject* x = NULL;
     ternaryfunc slotv = NULL;
     ternaryfunc slotw = NULL;
@@ -1180,7 +1180,7 @@ static PyObject* ternary_op(PyObject* v, PyObject* w, PyObject* z, const int op_
 
     if (!NEW_STYLE_NUMBER(v) || !NEW_STYLE_NUMBER(w) || (z != Py_None && !NEW_STYLE_NUMBER(z))) {
         /* we have an old style operand, coerce */
-        PyObject* v1, *z1, *w2, *z2;
+        PyObject *v1, *z1, *w2, *z2;
         int c;
 
         c = PyNumber_Coerce(&v, &w);
@@ -1473,7 +1473,7 @@ extern "C" PyObject* PySequence_Repeat(PyObject* o, Py_ssize_t count) noexcept {
        have an nb_multiply slot, not an sq_repeat slot. so we fall back
        to nb_multiply if o appears to be a sequence. */
     if (PySequence_Check(o)) {
-        PyObject* n, *result;
+        PyObject *n, *result;
         n = PyInt_FromSsize_t(count);
         if (n == NULL)
             return NULL;
@@ -1520,7 +1520,7 @@ extern "C" PyObject* PySequence_InPlaceRepeat(PyObject* o, Py_ssize_t count) noe
         return m->sq_repeat(o, count);
 
     if (PySequence_Check(o)) {
-        PyObject* n, *result;
+        PyObject *n, *result;
         n = PyInt_FromSsize_t(count);
         if (n == NULL)
             return NULL;
@@ -1556,7 +1556,7 @@ extern "C" PyObject* PySequence_GetItem(PyObject* s, Py_ssize_t i) noexcept {
 }
 
 PyObject* _PySlice_FromIndices(Py_ssize_t istart, Py_ssize_t istop) {
-    PyObject* start, *end, *slice;
+    PyObject *start, *end, *slice;
     start = PyInt_FromSsize_t(istart);
     if (!start)
         return NULL;
@@ -1794,7 +1794,7 @@ extern "C" int PyMapping_HasKey(PyObject* o, PyObject* key) noexcept {
 }
 
 extern "C" PyObject* PyMapping_GetItemString(PyObject* o, char* key) noexcept {
-    PyObject* okey, *r;
+    PyObject *okey, *r;
 
     if (key == NULL)
         return null_error();

src/capi/codecs.cpp

@@ -114,7 +114,7 @@ static PyObject* normalizestring(const char* string) {
 
 PyObject* _PyCodec_Lookup(const char* encoding) noexcept {
     // PyInterpreterState *interp; Pyston change
-    PyObject* result, * args = NULL, *v;
+    PyObject *result, *args = NULL, *v;
     Py_ssize_t i, len;
 
     if (encoding == NULL) {
@@ -234,7 +234,7 @@ static PyObject* codec_getitem(const char* encoding, int index) {
 /* Helper function to create an incremental codec. */
 
 static PyObject* codec_getincrementalcodec(const char* encoding, const char* errors, const char* attrname) {
-    PyObject* codecs, *ret, *inccodec;
+    PyObject *codecs, *ret, *inccodec;
 
     codecs = _PyCodec_Lookup(encoding);
     if (codecs == NULL)
@@ -254,7 +254,7 @@ static PyObject* codec_getincrementalcodec(const char* encoding, const char* err
 /* Helper function to create a stream codec. */
 
 static PyObject* codec_getstreamcodec(const char* encoding, PyObject* stream, const char* errors, const int index) {
-    PyObject* codecs, *streamcodec, *codeccls;
+    PyObject *codecs, *streamcodec, *codeccls;
 
     codecs = _PyCodec_Lookup(encoding);
     if (codecs == NULL)
@@ -306,7 +306,7 @@ PyObject* PyCodec_StreamWriter(const char* encoding, PyObject* stream, const cha
 
 PyObject* PyCodec_Encode(PyObject* object, const char* encoding, const char* errors) noexcept {
     PyObject* encoder = NULL;
-    PyObject* args = NULL, * result = NULL;
+    PyObject *args = NULL, *result = NULL;
     PyObject* v;
 
     encoder = PyCodec_Encoder(encoding);
@@ -348,7 +348,7 @@ PyObject* PyCodec_Encode(PyObject* object, const char* encoding, const char* err
 
 PyObject* PyCodec_Decode(PyObject* object, const char* encoding, const char* errors) noexcept {
     PyObject* decoder = NULL;
-    PyObject* args = NULL, * result = NULL;
+    PyObject *args = NULL, *result = NULL;
     PyObject* v;
 
     decoder = PyCodec_Decoder(encoding);

src/capi/errors.cpp

@@ -138,7 +138,7 @@ extern "C" void PyErr_SetNone(PyObject* exception) noexcept {
 /* Call when an exception has occurred but there is no way for Python
    to handle it.  Examples: exception in __del__ or during GC. */
 extern "C" void PyErr_WriteUnraisable(PyObject* obj) noexcept {
-    PyObject* f, *t, *v, *tb;
+    PyObject *f, *t, *v, *tb;
     PyErr_Fetch(&t, &v, &tb);
     f = PySys_GetObject("stderr");
     if (f != NULL) {
@@ -273,7 +273,7 @@ extern "C" void PyErr_Display(PyObject* exception, PyObject* value, PyObject* tb
             err = PyTraceBack_Print(tb, f);
         if (err == 0 && PyObject_HasAttrString(value, "print_file_and_line")) {
             PyObject* message;
-            const char* filename, *text;
+            const char *filename, *text;
             int lineno, offset;
             if (!parse_syntax_error(value, &message, &filename, &lineno, &offset, &text))
                 PyErr_Clear();
@@ -352,7 +352,7 @@ extern "C" void PyErr_Display(PyObject* exception, PyObject* value, PyObject* tb
 }
 
 static void handle_system_exit(void) noexcept {
-    PyObject* exception, *value, *tb;
+    PyObject *exception, *value, *tb;
     int exitcode = 0;
 
     if (Py_InspectFlag)
@@ -404,7 +404,7 @@ static void handle_system_exit(void) noexcept {
 }
 
 extern "C" void PyErr_PrintEx(int set_sys_last_vars) noexcept {
-    PyObject* exception, *v, *tb, *hook;
+    PyObject *exception, *v, *tb, *hook;
 
     if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
         handle_system_exit();
@@ -426,7 +426,7 @@ extern "C" void PyErr_PrintEx(int set_sys_last_vars) noexcept {
         PyObject* args = PyTuple_Pack(3, exception, v, tb ? tb : Py_None);
         PyObject* result = PyEval_CallObject(hook, args);
         if (result == NULL) {
-            PyObject* exception2, *v2, *tb2;
+            PyObject *exception2, *v2, *tb2;
             if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
                 handle_system_exit();
             }

src/capi/modsupport.cpp

@@ -280,7 +280,7 @@ static PyObject* do_mkdict(const char** p_format, va_list* p_va, int endchar, in
     /* Note that we can't bail immediately on error as this will leak
        refcounts on any 'N' arguments. */
     for (i = 0; i < n; i += 2) {
-        PyObject* k, *v;
+        PyObject *k, *v;
         int err;
         k = do_mkvalue(p_format, p_va, flags);
         if (k == NULL) {

src/capi/object.cpp

@@ -645,7 +645,7 @@ extern "C" void Py_ReprLeave(PyObject* obj) noexcept {
 static int adjust_tp_compare(int c) {
     if (PyErr_Occurred()) {
         if (c != -1 && c != -2) {
-            PyObject* t, *v, *tb;
+            PyObject *t, *v, *tb;
             PyErr_Fetch(&t, &v, &tb);
             if (PyErr_Warn(PyExc_RuntimeWarning, "tp_compare didn't return -1 or -2 "
                                                  "for exception") < 0) {
@@ -832,7 +832,7 @@ static int try_3way_compare(PyObject* v, PyObject* w) {
 */
 /* Pyston change: static*/ int default_3way_compare(PyObject* v, PyObject* w) {
     int c;
-    const char* vname, *wname;
+    const char *vname, *wname;
 
     if (v->cls == w->cls) {
         /* When comparing these pointers, they must be cast to