(*
- * 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.
*
*)
+# 0 "./ast0_cocci.ml"
module Ast = Ast_cocci
+module TC = Type_cocci
(* --------------------------------------------------------------------- *)
(* Modified code *)
(* MIXED is like CONTEXT, since sometimes MIXED things have to revert to
CONTEXT - see insert_plus.ml *)
-type count = ONE (* + *) | MANY (* ++ *)
type mcodekind =
- MINUS of (Ast.anything list list * token_info) ref
+ MINUS of (Ast.anything Ast.replacement * token_info) ref
| PLUS of Ast.count
| CONTEXT of (Ast.anything Ast.befaft * token_info * token_info) ref
| MIXED of (Ast.anything Ast.befaft * token_info * token_info) ref
mcode_start : mcodekind list; mcode_end : mcodekind list;
(* the following are only for + code *)
strings_before : (Ast.added_string * position_info) list;
- strings_after : (Ast.added_string * position_info) list }
+ strings_after : (Ast.added_string * position_info) list;
+ isSymbolIdent : bool; (* is the token a symbol identifier or not *) }
(* adjacency index is incremented when we skip over dots or nest delimiters
it is used in deciding how much to remove, when two adjacent code tokens are
removed. *)
type 'a mcode =
- 'a * arity * info * mcodekind * meta_pos ref (* pos, - only *) *
+ 'a * arity * info * mcodekind * anything list ref (* pos, - only *) *
int (* adjacency_index *)
(* int ref is an index *)
and 'a wrap =
info : info;
index : int ref;
mcodekind : mcodekind ref;
- exp_ty : Type_cocci.typeC option ref; (* only for expressions *)
+ exp_ty : TC.typeC option ref; (* only for expressions *)
bef_aft : dots_bef_aft; (* only for statements *)
true_if_arg : bool; (* true if "arg_exp", only for exprs *)
true_if_test : bool; (* true if "test position", only for exprs *)
and base_ident =
Id of string mcode
- | MetaId of Ast.meta_name mcode * Ast.idconstraint * pure
+ | MetaId of Ast.meta_name mcode * Ast.idconstraint * Ast.seed * pure
| MetaFunc of Ast.meta_name mcode * Ast.idconstraint * pure
| MetaLocalFunc of Ast.meta_name mcode * Ast.idconstraint * pure
+ | DisjId of string mcode * ident list *
+ string mcode list (* the |s *) * string mcode
| OptIdent of ident
| UniqueIdent of ident
expression dots * string mcode (* ) *)
| Assignment of expression * Ast.assignOp mcode * expression *
bool (* true if it can match an initialization *)
+ | Sequence of expression * string mcode (* , *) * expression
| CondExpr of expression * string mcode (* ? *) * expression option *
string mcode (* : *) * expression
| Postfix of expression * Ast.fixOp mcode
| SizeOfType of string mcode (* sizeof *) * string mcode (* ( *) *
typeC * string mcode (* ) *)
| TypeExp of typeC (* type name used as an expression, only in args *)
+ | Constructor of string mcode (* ( *) * typeC * string mcode (* ) *) *
+ initialiser
| MetaErr of Ast.meta_name mcode * constraints * pure
| MetaExpr of Ast.meta_name mcode * constraints *
- Type_cocci.typeC list option * Ast.form * pure
+ TC.typeC list option * Ast.form * pure
| MetaExprList of Ast.meta_name mcode (* only in arg lists *) *
listlen * pure
+ | AsExpr of expression * expression (* as expr, always metavar *)
| EComma of string mcode (* only in arg lists *)
| DisjExpr of string mcode * expression list *
string mcode list (* the |s *) * string mcode
and constraints =
NoConstraint
- | NotIdCstrt of Ast.idconstraint
+ | NotIdCstrt of Ast.reconstraint
| NotExpCstrt of expression list
+ | SubExpCstrt of Ast.meta_name list
-and listlen = Ast.meta_name mcode option
+and listlen =
+ MetaListLen of Ast.meta_name mcode
+ | CstListLen of int
+ | AnyListLen
(* --------------------------------------------------------------------- *)
(* Types *)
string mcode (* ) *)
| Array of typeC * string mcode (* [ *) *
expression option * string mcode (* ] *)
- | EnumName of string mcode (*enum*) * ident (* name *)
+ | EnumName of string mcode (*enum*) * ident option (* name *)
+ | EnumDef of typeC (* either StructUnionName or metavar *) *
+ string mcode (* { *) * expression dots * string mcode (* } *)
| StructUnionName of Ast.structUnion mcode * ident option (* name *)
| StructUnionDef of typeC (* either StructUnionName or metavar *) *
string mcode (* { *) * declaration dots * string mcode (* } *)
| TypeName of string mcode
| MetaType of Ast.meta_name mcode * pure
+ | AsType of typeC * typeC (* as type, always metavar *)
| DisjType of string mcode * typeC list * (* only after iso *)
string mcode list (* the |s *) * string mcode
| OptType of typeC
split out into multiple declarations of a single variable each. *)
and base_declaration =
- Init of Ast.storage mcode option * typeC * ident * string mcode (*=*) *
+ MetaDecl of Ast.meta_name mcode * pure (* variables *)
+ (* the following are kept separate from MetaDecls because ultimately
+ they don't match the same thin at all. Consider whether there
+ should be a separate type for fields, as in the C AST *)
+ | MetaField of Ast.meta_name mcode * pure (* structure fields *)
+ | MetaFieldList of Ast.meta_name mcode * listlen * pure (* structure fields *)
+ | AsDecl of declaration * declaration
+ | Init of Ast.storage mcode option * typeC * ident * string mcode (*=*) *
initialiser * string mcode (*;*)
| UnInit of Ast.storage mcode option * typeC * ident * string mcode (* ; *)
| TyDecl of typeC * string mcode (* ; *)
| MacroDecl of ident (* name *) * string mcode (* ( *) *
expression dots * string mcode (* ) *) * string mcode (* ; *)
+ | MacroDeclInit of ident (* name *) * string mcode (* ( *) *
+ expression dots * string mcode (* ) *) * string mcode (*=*) *
+ initialiser * string mcode (* ; *)
| Typedef of string mcode (* typedef *) * typeC * typeC * string mcode (*;*)
| DisjDecl of string mcode * declaration list *
string mcode list (* the |s *) * string mcode
and base_initialiser =
MetaInit of Ast.meta_name mcode * pure
+ | MetaInitList of Ast.meta_name mcode * listlen * pure
+ | AsInit of initialiser * initialiser (* as init, always metavar *)
| InitExpr of expression
- | InitList of string mcode (*{*) * initialiser_list * string mcode (*}*)
+ | InitList of string mcode (*{*) * initialiser_list * string mcode (*}*) *
+ (* true if ordered, as for array, false if unordered, as for struct *)
+ bool
| InitGccExt of
designator list (* name *) * string mcode (*=*) *
initialiser (* gccext: *)
Decl of (info * mcodekind) (* before the decl *) * declaration
| Seq of string mcode (* { *) * statement dots *
string mcode (* } *)
- | ExprStatement of expression * string mcode (*;*)
+ | ExprStatement of expression option * string mcode (*;*)
| IfThen of string mcode (* if *) * string mcode (* ( *) *
expression * string mcode (* ) *) *
statement * (info * mcodekind) (* after info *)
string mcode (* ; *)
| MetaStmt of Ast.meta_name mcode * pure
| MetaStmtList of Ast.meta_name mcode(*only in statement lists*) * pure
+ | AsStmt of statement * statement (* as statement, always metavar *)
| Exp of expression (* only in dotted statement lists *)
| TopExp of expression (* for macros body *)
| Ty of typeC (* only at top level *)
string mcode (* { *) * statement dots *
string mcode (* } *)
| Include of string mcode (* #include *) * Ast.inc_file mcode (* file *)
+ | Undef of string mcode (* #define *) * ident (* name *)
| Define of string mcode (* #define *) * ident (* name *) *
define_parameters (*params*) * statement dots
| OptStm of statement
and meta_pos =
MetaPos of Ast.meta_name mcode * Ast.meta_name list * Ast.meta_collect
- | NoMetaPos
(* --------------------------------------------------------------------- *)
(* Top-level code *)
and base_top_level =
- DECL of statement
+ NONDECL of statement
+ | TOPCODE of statement dots
| CODE of statement dots
| FILEINFO of string mcode (* old file *) * string mcode (* new file *)
| ERRORWORDS of expression list
(rule * Ast.metavar list *
(string list * string list * Ast.dependency * string * Ast.exists)) *
(rule * Ast.metavar list) * Ast.ruletype
- | ScriptRule of
- string * Ast.dependency * (string * Ast.meta_name) list * string
- | InitialScriptRule of string * Ast.dependency * string
- | FinalScriptRule of string * Ast.dependency * string
+ | ScriptRule of string (* name *) *
+ string * Ast.dependency *
+ (Ast.script_meta_name * Ast.meta_name * Ast.metavar) list *
+ Ast.meta_name list (*script vars*) *
+ string
+ | InitialScriptRule of string (* name *) *string * Ast.dependency * string
+ | FinalScriptRule of string (* name *) *string * Ast.dependency * string
+
+(* --------------------------------------------------------------------- *)
+
+and dependency =
+ Dep of string (* rule applies for the current binding *)
+ | AntiDep of dependency (* rule doesn't apply for the current binding *)
+ | EverDep of string (* rule applies for some binding *)
+ | NeverDep of string (* rule never applies for any binding *)
+ | AndDep of dependency * dependency
+ | OrDep of dependency * dependency
+ | NoDep | FailDep
(* --------------------------------------------------------------------- *)
| IsoWhenTTag of expression
| IsoWhenFTag of expression
| MetaPosTag of meta_pos
+ | HiddenVarTag of anything list (* in iso_compile/pattern only *)
let dotsExpr x = DotsExprTag x
let dotsParam x = DotsParamTag x
{ pos_info = pos_info;
attachable_start = true; attachable_end = true;
mcode_start = []; mcode_end = [];
- strings_before = []; strings_after = [] }
+ strings_before = []; strings_after = []; isSymbolIdent = false; }
let default_befaft _ =
MIXED(ref (Ast.NOTHING,default_token_info,default_token_info))
let context_befaft _ =
CONTEXT(ref (Ast.NOTHING,default_token_info,default_token_info))
+ let minus_befaft _ = MINUS(ref (Ast.NOREPLACEMENT,default_token_info))
let wrap x =
{ node = x;
(* --------------------------------------------------------------------- *)
+let rec meta_pos_name = function
+ HiddenVarTag(vars) ->
+ (* totally fake, just drop the rest, only for isos *)
+ meta_pos_name (List.hd vars)
+ | MetaPosTag(MetaPos(name,constraints,_)) -> name
+ | ExprTag(e) ->
+ (match unwrap e with
+ MetaExpr(name,constraints,ty,form,pure) -> name
+ | _ -> failwith "bad metavariable")
+ | TypeCTag(t) ->
+ (match unwrap t with
+ MetaType(name,pure) -> name
+ | _ -> failwith "bad metavariable")
+ | DeclTag(d) ->
+ (match unwrap d with
+ MetaDecl(name,pure) -> name
+ | _ -> failwith "bad metavariable")
+ | InitTag(i) ->
+ (match unwrap i with
+ MetaInit(name,pure) -> name
+ | _ -> failwith "bad metavariable")
+ | StmtTag(s) ->
+ (match unwrap s with
+ MetaStmt(name,pure) -> name
+ | _ -> failwith "bad metavariable")
+ | _ -> failwith "bad metavariable"
+
+(* --------------------------------------------------------------------- *)
+
(* unique indices, for mcode and tree nodes *)
let index_counter = ref 0
let fresh_index _ = let cur = !index_counter in index_counter := cur + 1; cur
let rec ast0_type_to_type ty =
match unwrap ty with
- ConstVol(cv,ty) -> Type_cocci.ConstVol(const_vol cv,ast0_type_to_type ty)
+ ConstVol(cv,ty) -> TC.ConstVol(const_vol cv,ast0_type_to_type ty)
| BaseType(bty,strings) ->
- Type_cocci.BaseType(baseType bty)
+ TC.BaseType(baseType bty)
| Signed(sgn,None) ->
- Type_cocci.SignedT(sign sgn,None)
+ TC.SignedT(sign sgn,None)
| Signed(sgn,Some ty) ->
let bty = ast0_type_to_type ty in
- Type_cocci.SignedT(sign sgn,Some bty)
- | Pointer(ty,_) -> Type_cocci.Pointer(ast0_type_to_type ty)
+ TC.SignedT(sign sgn,Some bty)
+ | Pointer(ty,_) -> TC.Pointer(ast0_type_to_type ty)
| FunctionPointer(ty,_,_,_,_,params,_) ->
- Type_cocci.FunctionPointer(ast0_type_to_type ty)
- | FunctionType _ -> failwith "not supported"
- | Array(ety,_,_,_) -> Type_cocci.Array(ast0_type_to_type ety)
- | EnumName(su,tag) ->
+ TC.FunctionPointer(ast0_type_to_type ty)
+ | FunctionType _ -> TC.Unknown (*failwith "not supported"*)
+ | Array(ety,_,_,_) -> TC.Array(ast0_type_to_type ety)
+ | EnumName(su,Some tag) ->
(match unwrap tag with
Id(tag) ->
- Type_cocci.EnumName(false,unwrap_mcode tag)
- | MetaId(tag,_,_) ->
- (Printf.printf
- "warning: enum with a metavariable name detected.\n";
- Printf.printf
+ TC.EnumName(TC.Name(unwrap_mcode tag))
+ | MetaId(tag,_,_,_) ->
+ (Common.pr2_once
+ "warning: enum with a metavariable name detected.";
+ Common.pr2_once
"For type checking assuming the name of the metavariable is the name of the type\n";
- let (rule,tag) = unwrap_mcode tag in
- Type_cocci.EnumName(true,rule^tag))
+ TC.EnumName(TC.MV(unwrap_mcode tag,TC.Unitary,false)))
| _ -> failwith "unexpected enum type name")
+ | EnumName(su,None) -> TC.EnumName TC.NoName
+ | EnumDef(ty,_,_,_) -> ast0_type_to_type ty
| StructUnionName(su,Some tag) ->
(match unwrap tag with
Id(tag) ->
- Type_cocci.StructUnionName(structUnion su,false,unwrap_mcode tag)
- | MetaId(tag,_,_) ->
- (Common.pr2
- "warning: struct/union with a metavariable name detected.\n";
- Common.pr2
+ TC.StructUnionName(structUnion su,TC.Name(unwrap_mcode tag))
+ | MetaId(tag,Ast.IdNoConstraint,_,_) ->
+ (Common.pr2_once
+ "warning: struct/union with a metavariable name detected.";
+ Common.pr2_once
"For type checking assuming the name of the metavariable is the name of the type\n";
- let (rule,tag) = unwrap_mcode tag in
- Type_cocci.StructUnionName(structUnion su,true,rule^tag))
+ TC.StructUnionName(structUnion su,
+ TC.MV(unwrap_mcode tag,TC.Unitary,false)))
+ | MetaId(tag,_,_,_) ->
+ (* would have to duplicate the type in type_cocci.ml?
+ perhaps polymorphism would help? *)
+ failwith "constraints not supported on struct type name"
| _ -> failwith "unexpected struct/union type name")
- | StructUnionName(su,None) -> failwith "nameless structure - what to do???"
+ | StructUnionName(su,None) -> TC.StructUnionName(structUnion su,TC.NoName)
| StructUnionDef(ty,_,_,_) -> ast0_type_to_type ty
- | TypeName(name) -> Type_cocci.TypeName(unwrap_mcode name)
+ | TypeName(name) -> TC.TypeName(unwrap_mcode name)
| MetaType(name,_) ->
- Type_cocci.MetaType(unwrap_mcode name,Type_cocci.Unitary,false)
+ TC.MetaType(unwrap_mcode name,TC.Unitary,false)
+ | AsType(ty,asty) -> failwith "not created yet"
| DisjType(_,types,_,_) ->
Common.pr2_once
"disjtype not supported in smpl type inference, assuming unknown";
- Type_cocci.Unknown
+ TC.Unknown
| OptType(ty) | UniqueType(ty) ->
ast0_type_to_type ty
and baseType = function
- Ast.VoidType -> Type_cocci.VoidType
- | Ast.CharType -> Type_cocci.CharType
- | Ast.ShortType -> Type_cocci.ShortType
- | Ast.IntType -> Type_cocci.IntType
- | Ast.DoubleType -> Type_cocci.DoubleType
- | Ast.FloatType -> Type_cocci.FloatType
- | Ast.LongType -> Type_cocci.LongType
- | Ast.LongLongType -> Type_cocci.LongLongType
+ Ast.VoidType -> TC.VoidType
+ | Ast.CharType -> TC.CharType
+ | Ast.ShortType -> TC.ShortType
+ | Ast.ShortIntType -> TC.ShortIntType
+ | Ast.IntType -> TC.IntType
+ | Ast.DoubleType -> TC.DoubleType
+ | Ast.LongDoubleType -> TC.LongDoubleType
+ | Ast.FloatType -> TC.FloatType
+ | Ast.LongType -> TC.LongType
+ | Ast.LongIntType -> TC.LongIntType
+ | Ast.LongLongType -> TC.LongLongType
+ | Ast.LongLongIntType -> TC.LongLongIntType
+ | Ast.SizeType -> TC.SizeType
+ | Ast.SSizeType -> TC.SSizeType
+ | Ast.PtrDiffType -> TC.PtrDiffType
and structUnion t =
match unwrap_mcode t with
- Ast.Struct -> Type_cocci.Struct
- | Ast.Union -> Type_cocci.Union
+ Ast.Struct -> TC.Struct
+ | Ast.Union -> TC.Union
and sign t =
match unwrap_mcode t with
- Ast.Signed -> Type_cocci.Signed
- | Ast.Unsigned -> Type_cocci.Unsigned
+ Ast.Signed -> TC.Signed
+ | Ast.Unsigned -> TC.Unsigned
and const_vol t =
match unwrap_mcode t with
- Ast.Const -> Type_cocci.Const
- | Ast.Volatile -> Type_cocci.Volatile
+ Ast.Const -> TC.Const
+ | Ast.Volatile -> TC.Volatile
(* --------------------------------------------------------------------- *)
(* this function is a rather minimal attempt. the problem is that information
has been lost. but since it is only used for metavariable types in the isos,
perhaps it doesn't matter *)
-and make_mcode x = (x,NONE,default_info(),context_befaft(),ref NoMetaPos,-1)
-let make_mcode_info x info = (x,NONE,info,context_befaft(),ref NoMetaPos,-1)
+and make_mcode x = (x,NONE,default_info(),context_befaft(),ref [],-1)
+let make_mcode_info x info = (x,NONE,info,context_befaft(),ref [],-1)
+and make_minus_mcode x =
+ (x,NONE,default_info(),minus_befaft(),ref [],-1)
exception TyConv
let rec reverse_type ty =
match ty with
- Type_cocci.ConstVol(cv,ty) ->
+ TC.ConstVol(cv,ty) ->
ConstVol(reverse_const_vol cv,context_wrap(reverse_type ty))
- | Type_cocci.BaseType(bty) ->
+ | TC.BaseType(bty) ->
BaseType(reverse_baseType bty,[(* not used *)])
- | Type_cocci.SignedT(sgn,None) -> Signed(reverse_sign sgn,None)
- | Type_cocci.SignedT(sgn,Some bty) ->
+ | TC.SignedT(sgn,None) -> Signed(reverse_sign sgn,None)
+ | TC.SignedT(sgn,Some bty) ->
Signed(reverse_sign sgn,Some (context_wrap(reverse_type ty)))
- | Type_cocci.Pointer(ty) ->
+ | TC.Pointer(ty) ->
Pointer(context_wrap(reverse_type ty),make_mcode "*")
- | Type_cocci.EnumName(mv,tag) ->
- if mv
- then
- (* not right... *)
- let rule = "" in
- EnumName
- (make_mcode "enum",
- context_wrap(MetaId(make_mcode (rule,tag),Ast.IdNoConstraint,
- Impure)))
- else
- EnumName(make_mcode "enum",context_wrap(Id(make_mcode tag)))
- | Type_cocci.StructUnionName(su,mv,tag) ->
- if mv
- then
- (* not right... *)
- let rule = "" in
- StructUnionName
- (reverse_structUnion su,
- Some(context_wrap(MetaId(make_mcode (rule,tag),Ast.IdNoConstraint,
- Impure))))
- else
- StructUnionName
- (reverse_structUnion su,
- Some (context_wrap(Id(make_mcode tag))))
- | Type_cocci.TypeName(name) -> TypeName(make_mcode name)
- | Type_cocci.MetaType(name,_,_) ->
+ | TC.EnumName(TC.MV(name,_,_)) ->
+ EnumName
+ (make_mcode "enum",
+ Some (context_wrap(MetaId(make_mcode name,Ast.IdNoConstraint,Ast.NoVal,
+ Impure))))
+ | TC.EnumName(TC.Name tag) ->
+ EnumName(make_mcode "enum",Some(context_wrap(Id(make_mcode tag))))
+ | TC.StructUnionName(su,TC.MV(name,_,_)) ->
+ (* not right?... *)
+ StructUnionName
+ (reverse_structUnion su,
+ Some(context_wrap(MetaId(make_mcode name,Ast.IdNoConstraint,Ast.NoVal,
+ Impure(*not really right*)))))
+ | TC.StructUnionName(su,TC.Name tag) ->
+ StructUnionName
+ (reverse_structUnion su,
+ Some (context_wrap(Id(make_mcode tag))))
+ | TC.TypeName(name) -> TypeName(make_mcode name)
+ | TC.MetaType(name,_,_) ->
MetaType(make_mcode name,Impure(*not really right*))
| _ -> raise TyConv
and reverse_baseType = function
- Type_cocci.VoidType -> Ast.VoidType
- | Type_cocci.CharType -> Ast.CharType
- | Type_cocci.BoolType -> Ast.IntType
- | Type_cocci.ShortType -> Ast.ShortType
- | Type_cocci.IntType -> Ast.IntType
- | Type_cocci.DoubleType -> Ast.DoubleType
- | Type_cocci.FloatType -> Ast.FloatType
- | Type_cocci.LongType -> Ast.LongType
- | Type_cocci.LongLongType -> Ast.LongLongType
+ TC.VoidType -> Ast.VoidType
+ | TC.CharType -> Ast.CharType
+ | TC.BoolType -> Ast.IntType
+ | TC.ShortType -> Ast.ShortType
+ | TC.ShortIntType -> Ast.ShortIntType
+ | TC.IntType -> Ast.IntType
+ | TC.DoubleType -> Ast.DoubleType
+ | TC.LongDoubleType -> Ast.LongDoubleType
+ | TC.FloatType -> Ast.FloatType
+ | TC.LongType -> Ast.LongType
+ | TC.LongIntType -> Ast.LongIntType
+ | TC.LongLongType -> Ast.LongLongType
+ | TC.LongLongIntType -> Ast.LongLongIntType
+ | TC.SizeType -> Ast.SizeType
+ | TC.SSizeType -> Ast.SSizeType
+ | TC.PtrDiffType -> Ast.PtrDiffType
+
and reverse_structUnion t =
make_mcode
(match t with
- Type_cocci.Struct -> Ast.Struct
- | Type_cocci.Union -> Ast.Union)
+ TC.Struct -> Ast.Struct
+ | TC.Union -> Ast.Union)
and reverse_sign t =
make_mcode
(match t with
- Type_cocci.Signed -> Ast.Signed
- | Type_cocci.Unsigned -> Ast.Unsigned)
+ TC.Signed -> Ast.Signed
+ | TC.Unsigned -> Ast.Unsigned)
and reverse_const_vol t =
make_mcode
(match t with
- Type_cocci.Const -> Ast.Const
- | Type_cocci.Volatile -> Ast.Volatile)
+ TC.Const -> Ast.Const
+ | TC.Volatile -> Ast.Volatile)
(* --------------------------------------------------------------------- *)
HCoop / bpt / coccinelle.git / blobdiff