(*
- * 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
*)
+# 0 "./visitor_ast.ml"
module Ast0 = Ast0_cocci
module Ast = Ast_cocci
and ident i =
let k i =
match Ast.unwrap i with
- Ast.Id(name) -> string_mcode name
- | Ast.MetaId(name,_,_,_) -> meta_mcode name
- | Ast.MetaFunc(name,_,_,_) -> meta_mcode name
- | Ast.MetaLocalFunc(name,_,_,_) -> meta_mcode name
- | Ast.OptIdent(id) -> ident id
- | Ast.UniqueIdent(id) -> ident id in
- identfn all_functions k i
+ Ast.Id(name) -> string_mcode name
+ | Ast.MetaId(name,_,_,_) -> meta_mcode name
+ | Ast.MetaFunc(name,_,_,_) -> meta_mcode name
+ | Ast.MetaLocalFunc(name,_,_,_) -> meta_mcode name
+ | Ast.AsIdent(id,asid) -> bind (ident id) (ident asid)
+ | Ast.DisjId(id_list) -> multibind (List.map ident id_list)
+ | Ast.OptIdent(id) -> ident id
+ | Ast.UniqueIdent(id) -> ident id in
+ identfn all_functions k i
and expression e =
let k e =
string_mcode rp]
| Ast.Assignment(left,op,right,simple) ->
multibind [expression left; assign_mcode op; expression right]
+ | Ast.Sequence(left,op,right) ->
+ multibind [expression left; string_mcode op; expression right]
| Ast.CondExpr(exp1,why,exp2,colon,exp3) ->
multibind [expression exp1; string_mcode why;
get_option expression exp2; string_mcode colon;
multibind
[string_mcode szf; string_mcode lp; fullType ty; string_mcode rp]
| Ast.TypeExp(ty) -> fullType ty
+ | Ast.Constructor(lp,ty,rp,init) ->
+ multibind
+ [string_mcode lp; fullType ty; string_mcode rp; initialiser init]
| Ast.MetaErr(name,_,_,_)
| Ast.MetaExpr(name,_,_,_,_,_)
| Ast.MetaExprList(name,_,_,_) -> meta_mcode name
+ | Ast.AsExpr(exp,asexp) -> bind (expression exp) (expression asexp)
| Ast.EComma(cm) -> string_mcode cm
| Ast.DisjExpr(exp_list) -> multibind (List.map expression exp_list)
| Ast.NestExpr(starter,expr_dots,ender,whencode,multi) ->
and fullType ft =
let k ft =
match Ast.unwrap ft with
- Ast.Type(cv,ty) -> bind (get_option cv_mcode cv) (typeC ty)
+ Ast.Type(_,cv,ty) -> bind (get_option cv_mcode cv) (typeC ty)
+ | Ast.AsType(ty,asty) -> bind (fullType ty) (fullType asty)
| Ast.DisjType(types) -> multibind (List.map fullType types)
| Ast.OptType(ty) -> fullType ty
| Ast.UniqueType(ty) -> fullType ty in
and named_type ty id =
match Ast.unwrap ty with
- Ast.Type(None,ty1) ->
+ Ast.Type(_,None,ty1) ->
(match Ast.unwrap ty1 with
Ast.FunctionPointer(ty,lp1,star,rp1,lp2,params,rp2) ->
function_pointer (ty,lp1,star,rp1,lp2,params,rp2) [ident id]
and declaration d =
let k d =
match Ast.unwrap d with
- Ast.MetaDecl(name,_,_) | Ast.MetaField(name,_,_) -> meta_mcode name
+ Ast.MetaDecl(name,_,_) | Ast.MetaField(name,_,_)
+ | Ast.MetaFieldList(name,_,_,_) ->
+ meta_mcode name
+ | Ast.AsDecl(decl,asdecl) ->
+ bind (declaration decl) (declaration asdecl)
| Ast.Init(stg,ty,id,eq,ini,sem) ->
bind (get_option storage_mcode stg)
(bind (named_type ty id)
multibind
[ident name; string_mcode lp; expression_dots args;
string_mcode rp; string_mcode sem]
+ | Ast.MacroDeclInit(name,lp,args,rp,eq,ini,sem) ->
+ multibind
+ [ident name; string_mcode lp; expression_dots args;
+ string_mcode rp; string_mcode eq; initialiser ini;
+ string_mcode sem]
| Ast.TyDecl(ty,sem) -> bind (fullType ty) (string_mcode sem)
| Ast.Typedef(stg,ty,id,sem) ->
bind (string_mcode stg)
let k i =
match Ast.unwrap i with
Ast.MetaInit(name,_,_) -> meta_mcode name
+ | Ast.MetaInitList(name,_,_,_) -> meta_mcode name
+ | Ast.AsInit(init,asinit) ->
+ bind (initialiser init) (initialiser asinit)
| Ast.InitExpr(exp) -> expression exp
| Ast.ArInitList(lb,initlist,rb) ->
multibind
| Ast.SeqStart(brace) -> string_mcode brace
| Ast.SeqEnd(brace) -> string_mcode brace
| Ast.ExprStatement(exp,sem) ->
- bind (expression exp) (string_mcode sem)
+ bind (get_option expression exp) (string_mcode sem)
| Ast.IfHeader(iff,lp,exp,rp) ->
multibind [string_mcode iff; string_mcode lp; expression exp;
string_mcode rp]
| Ast.Ty(ty) -> fullType ty
| Ast.TopInit(init) -> initialiser init
| Ast.Include(inc,name) -> bind (string_mcode inc) (inc_file_mcode name)
+ | Ast.Undef(def,id) ->
+ multibind [string_mcode def; ident id]
| Ast.DefineHeader(def,id,params) ->
multibind [string_mcode def; ident id; define_parameters params]
| Ast.Default(def,colon) -> bind (string_mcode def) (string_mcode colon)
statement_dots body; rule_elem rbrace]
| Ast.Define(header,body) ->
bind (rule_elem header) (statement_dots body)
+ | Ast.AsStmt(stm,asstm) ->
+ bind (statement stm) (statement asstm)
| Ast.Dots(d,whn,_,_) | Ast.Circles(d,whn,_,_) | Ast.Stars(d,whn,_,_) ->
bind (string_mcode d)
(multibind (List.map (whencode statement_dots statement) whn))
match Ast.unwrap t with
Ast.FILEINFO(old_file,new_file) ->
bind (string_mcode old_file) (string_mcode new_file)
- | Ast.DECL(stmt) -> statement stmt
+ | Ast.NONDECL(stmt) -> statement stmt
| Ast.CODE(stmt_dots) -> statement_dots stmt_dots
| Ast.ERRORWORDS(exps) -> multibind (List.map expression exps) in
topfn all_functions k t
Ast.MetaFunc(meta_mcode name,constraints,keep,inherited)
| Ast.MetaLocalFunc(name,constraints,keep,inherited) ->
Ast.MetaLocalFunc(meta_mcode name,constraints,keep,inherited)
+ | Ast.AsIdent(id,asid) -> Ast.AsIdent(ident id,ident asid)
+ | Ast.DisjId(id_list) -> Ast.DisjId(List.map ident id_list)
| Ast.OptIdent(id) -> Ast.OptIdent(ident id)
| Ast.UniqueIdent(id) -> Ast.UniqueIdent(ident id)) in
identfn all_functions k i
| Ast.Assignment(left,op,right,simple) ->
Ast.Assignment(expression left, assign_mcode op, expression right,
simple)
+ | Ast.Sequence(left,op,right) ->
+ Ast.Sequence(expression left, string_mcode op, expression right)
| Ast.CondExpr(exp1,why,exp2,colon,exp3) ->
Ast.CondExpr(expression exp1, string_mcode why,
get_option expression exp2, string_mcode colon,
Ast.SizeOfType(string_mcode szf,string_mcode lp, fullType ty,
string_mcode rp)
| Ast.TypeExp(ty) -> Ast.TypeExp(fullType ty)
+ | Ast.Constructor(lp,ty,rp,init) ->
+ Ast.Constructor(string_mcode lp, fullType ty, string_mcode rp,
+ initialiser init)
| Ast.MetaErr(name,constraints,keep,inherited) ->
Ast.MetaErr(meta_mcode name,constraints,keep,inherited)
| Ast.MetaExpr(name,constraints,keep,ty,form,inherited) ->
Ast.MetaExpr(meta_mcode name,constraints,keep,ty,form,inherited)
| Ast.MetaExprList(name,lenname_inh,keep,inherited) ->
Ast.MetaExprList(meta_mcode name,lenname_inh,keep,inherited)
+ | Ast.AsExpr(exp,asexp) -> Ast.AsExpr(expression exp,expression asexp)
| Ast.EComma(cm) -> Ast.EComma(string_mcode cm)
| Ast.DisjExpr(exp_list) -> Ast.DisjExpr(List.map expression exp_list)
| Ast.NestExpr(starter,expr_dots,ender,whencode,multi) ->
let k ft =
Ast.rewrap ft
(match Ast.unwrap ft with
- Ast.Type(cv,ty) -> Ast.Type (get_option cv_mcode cv, typeC ty)
+ Ast.Type(allminus,cv,ty) ->
+ Ast.Type (allminus,get_option cv_mcode cv, typeC ty)
+ | Ast.AsType(ty,asty) -> Ast.AsType(fullType ty,fullType asty)
| Ast.DisjType(types) -> Ast.DisjType(List.map fullType types)
| Ast.OptType(ty) -> Ast.OptType(fullType ty)
| Ast.UniqueType(ty) -> Ast.UniqueType(fullType ty)) in
Ast.MetaDecl(meta_mcode name,keep,inherited)
| Ast.MetaField(name,keep,inherited) ->
Ast.MetaField(meta_mcode name,keep,inherited)
+ | Ast.MetaFieldList(name,lenname_inh,keep,inherited) ->
+ Ast.MetaFieldList(meta_mcode name,lenname_inh,keep,inherited)
+ | Ast.AsDecl(decl,asdecl) ->
+ Ast.AsDecl(declaration decl,declaration asdecl)
| Ast.Init(stg,ty,id,eq,ini,sem) ->
Ast.Init(get_option storage_mcode stg, fullType ty, ident id,
string_mcode eq, initialiser ini, string_mcode sem)
| Ast.MacroDecl(name,lp,args,rp,sem) ->
Ast.MacroDecl(ident name, string_mcode lp, expression_dots args,
string_mcode rp,string_mcode sem)
+ | Ast.MacroDeclInit(name,lp,args,rp,eq,ini,sem) ->
+ Ast.MacroDeclInit
+ (ident name, string_mcode lp, expression_dots args,
+ string_mcode rp,string_mcode eq,initialiser ini,
+ string_mcode sem)
| Ast.TyDecl(ty,sem) -> Ast.TyDecl(fullType ty, string_mcode sem)
| Ast.Typedef(stg,ty,id,sem) ->
Ast.Typedef(string_mcode stg, fullType ty, typeC id,
(match Ast.unwrap i with
Ast.MetaInit(name,keep,inherited) ->
Ast.MetaInit(meta_mcode name,keep,inherited)
+ | Ast.MetaInitList(name,lenname_inh,keep,inherited) ->
+ Ast.MetaInitList(meta_mcode name,lenname_inh,keep,inherited)
+ | Ast.AsInit(ini,asini) ->
+ Ast.AsInit(initialiser ini,initialiser asini)
| Ast.InitExpr(exp) -> Ast.InitExpr(expression exp)
| Ast.ArInitList(lb,initlist,rb) ->
Ast.ArInitList(string_mcode lb, initialiser_dots initlist,
| Ast.SeqStart(brace) -> Ast.SeqStart(string_mcode brace)
| Ast.SeqEnd(brace) -> Ast.SeqEnd(string_mcode brace)
| Ast.ExprStatement(exp,sem) ->
- Ast.ExprStatement (expression exp, string_mcode sem)
+ Ast.ExprStatement (get_option expression exp, string_mcode sem)
| Ast.IfHeader(iff,lp,exp,rp) ->
Ast.IfHeader(string_mcode iff, string_mcode lp, expression exp,
string_mcode rp)
| Ast.TopInit(init) -> Ast.TopInit(initialiser init)
| Ast.Include(inc,name) ->
Ast.Include(string_mcode inc,inc_file_mcode name)
+ | Ast.Undef(def,id) ->
+ Ast.Undef(string_mcode def,ident id)
| Ast.DefineHeader(def,id,params) ->
Ast.DefineHeader(string_mcode def,ident id,
define_parameters params)
statement_dots body, rule_elem rbrace)
| Ast.Define(header,body) ->
Ast.Define(rule_elem header,statement_dots body)
+ | Ast.AsStmt(stm,asstm) -> Ast.AsStmt(statement stm,statement asstm)
| Ast.Dots(d,whn,bef,aft) ->
Ast.Dots(string_mcode d,
List.map (whencode statement_dots statement) whn,bef,aft)
(match Ast.unwrap t with
Ast.FILEINFO(old_file,new_file) ->
Ast.FILEINFO (string_mcode old_file, string_mcode new_file)
- | Ast.DECL(stmt) -> Ast.DECL(statement stmt)
+ | Ast.NONDECL(stmt) -> Ast.NONDECL(statement stmt)
| Ast.CODE(stmt_dots) -> Ast.CODE(statement_dots stmt_dots)
| Ast.ERRORWORDS(exps) -> Ast.ERRORWORDS (List.map expression exps)) in
topfn all_functions k t
HCoop / bpt / coccinelle.git / blobdiff