- Try to do better pretty printing when array elements are individually

[bpt/coccinelle.git] / parsing_cocci / simple_assignments.ml

diff --git a/parsing_cocci/simple_assignments.ml b/parsing_cocci/simple_assignments.ml
index 7d444ad..12613d4 100644 (file)
--- a/parsing_cocci/simple_assignments.ml
+++ b/parsing_cocci/simple_assignments.ml
@@ -1,29 +1,7 @@
 (*
- * Copyright 2010, INRIA, University of Copenhagen
- * Julia Lawall, Rene Rydhof Hansen, Gilles Muller, Nicolas Palix
- * Copyright 2005-2009, Ecole des Mines de Nantes, University of Copenhagen
- * Yoann Padioleau, Julia Lawall, Rene Rydhof Hansen, Henrik Stuart, Gilles Muller, Nicolas Palix
- * This file is part of Coccinelle.
- *
- * Coccinelle is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, according to version 2 of the License.
- *
- * Coccinelle is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Coccinelle.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The authors reserve the right to distribute this or future versions of
- * Coccinelle under other licenses.
- *)
-
-
-(*
- * Copyright 2010, INRIA, University of Copenhagen
+ * Copyright 2012, INRIA
+ * Julia Lawall, Gilles Muller
+ * Copyright 2010-2011, INRIA, University of Copenhagen
  * Julia Lawall, Rene Rydhof Hansen, Gilles Muller, Nicolas Palix
  * Copyright 2005-2009, Ecole des Mines de Nantes, University of Copenhagen
  * Yoann Padioleau, Julia Lawall, Rene Rydhof Hansen, Henrik Stuart, Gilles Muller, Nicolas Palix
@@ -46,6 +24,7 @@
  *)
 
 
+# 0 "./simple_assignments.ml"
 module Ast0 = Ast0_cocci
 module Ast = Ast_cocci
 module V0 = Visitor_ast0
@@ -80,11 +59,13 @@ let is_simple_ast_assign left op minus_left =
   ((Ast.unwrap_mcode op) = Ast.SimpleAssign)
 
 let warning e msg =
-  Common.pr2
-    ("the simple assignment expression on line "^
-     (string_of_int (Ast0.get_line e))^
-     " contains transformations\n"^
-     "that prevent it from matching a declaration ("^msg^")\n");
+  if not !Flag.sgrep_mode2
+  then
+    Common.pr2
+      ("the simple assignment expression on line "^
+       (string_of_int (Ast0.get_line e))^
+       " contains transformations\n"^
+       "that prevent it from matching a declaration ("^msg^")\n");
   e
 
 let rebuild e1 left right op simple =
@@ -101,7 +82,7 @@ let rec exp mc e1 =
          match mc with
            Ast0.MINUS(mc) ->
              (match !mc with
-               ([[Ast.ExpressionTag(e2)]],_) ->
+               (Ast.REPLACEMENT([[Ast.ExpressionTag(e2)]],_),_) ->
                  (match Ast.unwrap e2 with
                    Ast.Assignment(left',op',_,_) ->
                      if is_simple_ast_assign left' op' left