permit multiline comments and strings in macros

[bpt/coccinelle.git] / flag_cocci.ml

diff --git a/flag_cocci.ml b/flag_cocci.ml
index 26ad3bc..f8878f7 100644 (file)
--- a/flag_cocci.ml
+++ b/flag_cocci.ml
@@ -1,27 +1,9 @@
 (*
- * Copyright 2005-2010, 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 2005-2010, Ecole des Mines de Nantes, 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
  * This file is part of Coccinelle.
  *
@@ -42,12 +24,14 @@
  *)
 
 
+# 0 "./flag_cocci.ml"
 (* the inputs *)
 let show_c = ref false
 let show_cocci = ref false
 
 (* the output *)
 let show_diff = ref true
+let force_diff = ref false (*show diff even if thhere are only space changes*)
 
 (* the derived inputs *)
 let show_flow = ref false
@@ -72,7 +56,8 @@ let popl = ref false
 let ifdef_to_if = ref true(*false*)
 
 type include_options =
-    I_UNSPECIFIED | I_NO_INCLUDES | I_NORMAL_INCLUDES | I_ALL_INCLUDES
+    I_UNSPECIFIED | I_NO_INCLUDES | I_NORMAL_INCLUDES
+  | I_ALL_INCLUDES | I_REALLY_ALL_INCLUDES
 let include_options = ref I_UNSPECIFIED
 
 let include_path = ref ([] : string list)
@@ -82,6 +67,10 @@ let include_path = ref ([] : string list)
 
 let relax_include_path = ref false
 
+let extra_includes = ref ([] : string list)
+
 let timeout = ref (None : int option)
 
 let worth_trying_opt = ref true
+
+let use_saved_typedefs = ref true (* hack! *)