Mercurial > hg > CbC > CbC_gcc

comparison gcc/c-family/c-pretty-print.c @ 113:bdf41c9fa0b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove RECTYPE
author mir3636
date Fri, 17 Nov 2017 06:33:55 +0900
parents ab0bcb71f44d
children 367f9f4f266e
comparison
equal deleted inserted replaced
112:ab0bcb71f44d 113:bdf41c9fa0b7
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 31 #ifndef noCbC
36 #include "cbc-tree.h" 32 #include "cbc-tree.h"
37 #endif 33 #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
42 34
43 /* The pretty-printer code is primarily designed to closely follow 35 /* The pretty-printer code is primarily designed to closely follow
44 (GNU) C and C++ grammars. That is to be contrasted with spaghetti 36 (GNU) C and C++ grammars. That is to be contrasted with spaghetti
45 codes we used to have in the past. Following a structured 37 codes we used to have in the past. Following a structured
46 approach (preferably the official grammars) is believed to make it 38 approach (preferably the official grammars) is believed to make it
550 { 542 {
551 if (TREE_CODE (t) == POINTER_TYPE) 543 if (TREE_CODE (t) == POINTER_TYPE)
552 { 544 {
553 if (TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE 545 if (TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE
554 || TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE) 546 || TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE)
555 <<<<<<< local
556 pp_c_right_paren (this); 547 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
564 t = TREE_TYPE (t); 548 t = TREE_TYPE (t);
565 } 549 }
566 550
567 direct_abstract_declarator (t); 551 direct_abstract_declarator (t);
568 } 552 }