Mercurial > hg > CbC > CbC_gcc

comparison gcc/c-family/c-pretty-print.c @ 112:ab0bcb71f44d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge gcc 7
author mir3636
date Fri, 10 Nov 2017 19:46:38 +0900
parents 04ced10e8804 a3a2f64cf8f4
children bdf41c9fa0b7
comparison
equal deleted inserted replaced
111:04ced10e8804 112:ab0bcb71f44d
26 #include "stor-layout.h" 26 #include "stor-layout.h"
27 #include "stringpool.h" 27 #include "stringpool.h"
28 #include "attribs.h" 28 #include "attribs.h"
29 #include "intl.h" 29 #include "intl.h"
30 #include "tree-pretty-print.h" 30 #include "tree-pretty-print.h"
31 <<<<<<< local
32 =======
33 #include "tree-iterator.h"
34 #include "diagnostic.h"
35 #ifndef noCbC
36 #include "cbc-tree.h"
37 #endif
38 /* Translate if being used for diagnostics, but not for dump files or
39 __PRETTY_FUNCTION. */
40 #define M_(msgid) (pp_translate_identifiers (pp) ? _(msgid) : (msgid))
41 >>>>>>> other
31 42
32 /* The pretty-printer code is primarily designed to closely follow 43 /* The pretty-printer code is primarily designed to closely follow
33 (GNU) C and C++ grammars. That is to be contrasted with spaghetti 44 (GNU) C and C++ grammars. That is to be contrasted with spaghetti
34 codes we used to have in the past. Following a structured 45 codes we used to have in the past. Following a structured
35 approach (preferably the official grammars) is believed to make it 46 approach (preferably the official grammars) is believed to make it
539 { 550 {
540 if (TREE_CODE (t) == POINTER_TYPE) 551 if (TREE_CODE (t) == POINTER_TYPE)
541 { 552 {
542 if (TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE 553 if (TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE
543 || TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE) 554 || TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE)
555 <<<<<<< local
544 pp_c_right_paren (this); 556 pp_c_right_paren (this);
557 =======
558 pp_c_right_paren (pp);
559 #ifndef noCbC
560 if(IS_RECTYPE(t))
561 return;
562 #endif
563 >>>>>>> other
545 t = TREE_TYPE (t); 564 t = TREE_TYPE (t);
546 } 565 }
547 566
548 direct_abstract_declarator (t); 567 direct_abstract_declarator (t);
549 } 568 }