(*
-* Copyright 2005-2009, Ecole des Mines de Nantes, University of Copenhagen
-* Yoann Padioleau, Julia Lawall, Rene Rydhof Hansen, Henrik Stuart, Gilles Muller
-* 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
+ * 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.
+ *)
open Format
+module Ast = Ast_cocci
module Ast0 = Ast0_cocci
module U = Pretty_print_cocci
(* Modified code *)
let mcodekind brackets fn x info mc =
- List.iter (function (s,_) -> print_string s) info.Ast0.strings_before;
+ let print = function Ast.Noindent s | Ast.Indent s -> print_string s in
+ List.iter (function (s,_) -> print s) info.Ast0.strings_before;
(match mc with
Ast0.MINUS(plus_stream) ->
let (lb,rb) =
(function x ->
print_string lb; fn x; print_string rb)
x plus_streams
- | Ast0.PLUS -> print_int (info.Ast0.pos_info.Ast0.column); fn x
+ | Ast0.PLUS _ -> print_int (info.Ast0.pos_info.Ast0.column); fn x
| Ast0.MIXED(plus_streams) ->
let (lb,rb) =
if !quiet
let (plus_streams,_,_) = !plus_streams in
U.print_around (function x -> print_string lb; fn x; print_string rb)
x plus_streams);
- List.iter (function (s,_) -> print_string s) info.Ast0.strings_after
+ List.iter (function (s,_) -> print s) info.Ast0.strings_after
let mcode fn (x,_,info,mc,pos,adj) =
let fn x = fn x; meta_pos !pos in
(Ast0.get_mcodekind x)
let print_meta (ctx,name) =
- if !full_ids then (print_string ctx; print_string ":");
+ (if !full_ids
+ then (print_string ctx; print_string ":"));
print_string name
(* --------------------------------------------------------------------- *)
| Ast0.Array(ty,lb,size,rb) ->
typeC ty; mcode print_string lb; print_option expression size;
mcode print_string rb
- | Ast0.EnumName(kind,name) -> mcode print_string kind; print_string " ";
- ident name
+ | Ast0.EnumName(kind,name) ->
+ mcode print_string kind;
+ print_option (function x -> ident x; print_string " ") name
+ | Ast0.EnumDef(ty,lb,ids,rb) ->
+ typeC ty; mcode print_string lb;
+ dots force_newline expression ids;
+ mcode print_string rb
| Ast0.StructUnionName(kind,name) ->
mcode U.structUnion kind;
print_option (function x -> ident x; print_string " ") name
print_context d
(function _ ->
match Ast0.unwrap d with
- Ast0.Init(stg,ty,id,eq,ini,sem) ->
+ Ast0.MetaDecl(name,_) | Ast0.MetaField(name,_) -> mcode print_meta name
+ | Ast0.Init(stg,ty,id,eq,ini,sem) ->
print_option (mcode U.storage) stg;
print_named_type ty id;
print_string " ";
match Ast0.unwrap i with
Ast0.MetaInit(name,_)-> mcode print_meta name; print_string " "
| Ast0.InitExpr(exp) -> expression exp
- | Ast0.InitList(lb,initlist,rb) ->
+ | Ast0.InitList(lb,initlist,rb,ordered) ->
+ (*doesn't show commas dropped in unordered case*)
mcode print_string lb; open_box 0;
let _ = dots (function _ -> ()) initialiser initlist in
close_box(); mcode print_string rb
close_box(); mcode print_string rp; print_string " ";
statement arity body;
mcode (function _ -> ()) ((),(),info,aft,ref Ast0.NoMetaPos,-1)
- | Ast0.Switch(switch,lp,exp,rp,lb,cases,rb) ->
+ | Ast0.Switch(switch,lp,exp,rp,lb,decls,cases,rb) ->
print_string arity;
mcode print_string switch; print_string " ";
mcode print_string_box lp; expression exp; close_box();
mcode print_string rp; print_string " "; mcode print_string lb;
+ dots force_newline (statement arity) decls;
dots force_newline (case_line arity) cases;
mcode print_string rb
| Ast0.Break(br,sem) ->
whn
| Ast0.Include(inc,s) ->
mcode print_string inc; print_string " "; mcode U.inc_file s
+ | Ast0.Undef(def,id) ->
+ mcode print_string def; print_string " "; ident id
| Ast0.Define(def,id,params,body) ->
mcode print_string def; print_string " "; ident id;
print_define_parameters params;
mcode print_string case; print_string " "; expression exp;
mcode print_string colon; print_string " ";
dots force_newline (statement arity) code
+ | Ast0.DisjCase(starter,case_lines,mids,ender) ->
+ print_string "\n("; force_newline();
+ print_between
+ (function _ -> print_string "\n|"; force_newline())
+ (case_line arity) case_lines;
+ print_string "\n)"
| Ast0.OptCase(case) -> case_line "?" case)
and statement_dots l = dots (function _ -> ()) (statement "") l
| Ast0.DotsStmtTag(d) ->
print_string "StmDots:"; force_newline();
statement_dots d
- | Ast0.DotsDeclTag(d) ->
- declaration_dots d
- | Ast0.DotsCaseTag(d) ->
- case_dots d
- | Ast0.IdentTag(d) ->
- ident d
+ | Ast0.DotsDeclTag(d) -> declaration_dots d
+ | Ast0.DotsCaseTag(d) -> case_dots d
+ | Ast0.IdentTag(d) -> ident d
| Ast0.ExprTag(d) | Ast0.ArgExprTag(d) | Ast0.TestExprTag(d) ->
print_string "Exp:"; force_newline();
expression d
- | Ast0.TypeCTag(d) ->
- typeC d
- | Ast0.ParamTag(d) ->
- parameterTypeDef d
- | Ast0.InitTag(d) ->
- initialiser d
- | Ast0.DeclTag(d) ->
- declaration d
- | Ast0.StmtTag(d) ->
+ | Ast0.TypeCTag(d) -> typeC d
+ | Ast0.ParamTag(d) -> parameterTypeDef d
+ | Ast0.InitTag(d) -> initialiser d
+ | Ast0.DeclTag(d) -> declaration d
+ | Ast0.StmtTag(d) ->
print_string "Stm:"; force_newline();
statement "" d
- | Ast0.CaseLineTag(d) ->
- case_line "" d
- | Ast0.TopTag(d) ->
- top_level d
- | Ast0.IsoWhenTag(x) -> U.print_when_modif x
- | Ast0.IsoWhenTTag(e) -> expression e
- | Ast0.IsoWhenFTag(e) -> expression e
+ | Ast0.CaseLineTag(d) -> case_line "" d
+ | Ast0.TopTag(d) -> top_level d
+ | Ast0.IsoWhenTag(x) -> U.print_when_modif x
+ | Ast0.IsoWhenTTag(e) -> expression e
+ | Ast0.IsoWhenFTag(e) -> expression e
| Ast0.MetaPosTag(var) -> meta_pos var);
quiet := q;
print_newline()