02-cpp-comments-to-c-comments.patch 6.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178
  1. ---
  2. expr.c | 42 +++++++++++++++++++++---------------------
  3. 1 file changed, 21 insertions(+), 21 deletions(-)
  4. Index: config/expr.c
  5. ===================================================================
  6. --- config.orig/expr.c
  7. +++ config/expr.c
  8. @@ -331,7 +331,7 @@
  9. e->right.expr = expr_trans_bool(e->right.expr);
  10. break;
  11. case E_UNEQUAL:
  12. - // FOO!=n -> FOO
  13. + /* FOO!=n -> FOO */
  14. if (e->left.sym->type == S_TRISTATE) {
  15. if (e->right.sym == &symbol_no) {
  16. e->type = E_SYMBOL;
  17. @@ -380,19 +380,19 @@
  18. if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
  19. ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
  20. (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) {
  21. - // (a='y') || (a='m') -> (a!='n')
  22. + /* (a='y') || (a='m') -> (a!='n') */
  23. return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_no);
  24. }
  25. if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
  26. ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
  27. (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes))) {
  28. - // (a='y') || (a='n') -> (a!='m')
  29. + /* (a='y') || (a='n') -> (a!='m') */
  30. return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_mod);
  31. }
  32. if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
  33. ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
  34. (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) {
  35. - // (a='m') || (a='n') -> (a!='y')
  36. + /* (a='m') || (a='n') -> (a!='y') */
  37. return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes);
  38. }
  39. }
  40. @@ -443,29 +443,29 @@
  41. if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_yes) ||
  42. (e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_yes))
  43. - // (a) && (a='y') -> (a='y')
  44. + /* (a) && (a='y') -> (a='y') */
  45. return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
  46. if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_no) ||
  47. (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_no))
  48. - // (a) && (a!='n') -> (a)
  49. + /* (a) && (a!='n') -> (a) */
  50. return expr_alloc_symbol(sym1);
  51. if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_mod) ||
  52. (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_mod))
  53. - // (a) && (a!='m') -> (a='y')
  54. + /* (a) && (a!='m') -> (a='y') */
  55. return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
  56. if (sym1->type == S_TRISTATE) {
  57. if (e1->type == E_EQUAL && e2->type == E_UNEQUAL) {
  58. - // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
  59. + /* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */
  60. sym2 = e1->right.sym;
  61. if ((e2->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
  62. return sym2 != e2->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
  63. : expr_alloc_symbol(&symbol_no);
  64. }
  65. if (e1->type == E_UNEQUAL && e2->type == E_EQUAL) {
  66. - // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
  67. + /* (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' */
  68. sym2 = e2->right.sym;
  69. if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
  70. return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
  71. @@ -474,19 +474,19 @@
  72. if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
  73. ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
  74. (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes)))
  75. - // (a!='y') && (a!='n') -> (a='m')
  76. + /* (a!='y') && (a!='n') -> (a='m') */
  77. return expr_alloc_comp(E_EQUAL, sym1, &symbol_mod);
  78. if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
  79. ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
  80. (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes)))
  81. - // (a!='y') && (a!='m') -> (a='n')
  82. + /* (a!='y') && (a!='m') -> (a='n') */
  83. return expr_alloc_comp(E_EQUAL, sym1, &symbol_no);
  84. if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
  85. ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
  86. (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod)))
  87. - // (a!='m') && (a!='n') -> (a='m')
  88. + /* (a!='m') && (a!='n') -> (a='m') */
  89. return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
  90. if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||
  91. @@ -579,7 +579,7 @@
  92. switch (e1->type) {
  93. case E_OR:
  94. expr_eliminate_dups2(e1->type, &e1, &e1);
  95. - // (FOO || BAR) && (!FOO && !BAR) -> n
  96. + /* (FOO || BAR) && (!FOO && !BAR) -> n */
  97. tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
  98. tmp2 = expr_copy(e2);
  99. tmp = expr_extract_eq_and(&tmp1, &tmp2);
  100. @@ -594,7 +594,7 @@
  101. break;
  102. case E_AND:
  103. expr_eliminate_dups2(e1->type, &e1, &e1);
  104. - // (FOO && BAR) || (!FOO || !BAR) -> y
  105. + /* (FOO && BAR) || (!FOO || !BAR) -> y */
  106. tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
  107. tmp2 = expr_copy(e2);
  108. tmp = expr_extract_eq_or(&tmp1, &tmp2);
  109. @@ -703,7 +703,7 @@
  110. case E_NOT:
  111. switch (e->left.expr->type) {
  112. case E_NOT:
  113. - // !!a -> a
  114. + /* !!a -> a */
  115. tmp = e->left.expr->left.expr;
  116. free(e->left.expr);
  117. free(e);
  118. @@ -712,14 +712,14 @@
  119. break;
  120. case E_EQUAL:
  121. case E_UNEQUAL:
  122. - // !a='x' -> a!='x'
  123. + /* !a='x' -> a!='x' */
  124. tmp = e->left.expr;
  125. free(e);
  126. e = tmp;
  127. e->type = e->type == E_EQUAL ? E_UNEQUAL : E_EQUAL;
  128. break;
  129. case E_OR:
  130. - // !(a || b) -> !a && !b
  131. + /* !(a || b) -> !a && !b */
  132. tmp = e->left.expr;
  133. e->type = E_AND;
  134. e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
  135. @@ -728,7 +728,7 @@
  136. e = expr_transform(e);
  137. break;
  138. case E_AND:
  139. - // !(a && b) -> !a || !b
  140. + /* !(a && b) -> !a || !b */
  141. tmp = e->left.expr;
  142. e->type = E_OR;
  143. e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
  144. @@ -738,7 +738,7 @@
  145. break;
  146. case E_SYMBOL:
  147. if (e->left.expr->left.sym == &symbol_yes) {
  148. - // !'y' -> 'n'
  149. + /* !'y' -> 'n' */
  150. tmp = e->left.expr;
  151. free(e);
  152. e = tmp;
  153. @@ -747,7 +747,7 @@
  154. break;
  155. }
  156. if (e->left.expr->left.sym == &symbol_mod) {
  157. - // !'m' -> 'm'
  158. + /* !'m' -> 'm' */
  159. tmp = e->left.expr;
  160. free(e);
  161. e = tmp;
  162. @@ -756,7 +756,7 @@
  163. break;
  164. }
  165. if (e->left.expr->left.sym == &symbol_no) {
  166. - // !'n' -> 'y'
  167. + /* !'n' -> 'y' */
  168. tmp = e->left.expr;
  169. free(e);
  170. e = tmp;