(*
- * 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 "./ast_cocci.mli"
(* --------------------------------------------------------------------- *)
(* Modified code *)
| BEFOREAFTER of 'a list list * 'a list list * count
| NOTHING
-and 'a mcode = 'a * info * mcodekind * meta_pos (* pos variable *)
+and 'a replacement = REPLACEMENT of 'a list list * count | NOREPLACEMENT
+
+and 'a mcode = 'a * info * mcodekind * meta_pos list (* pos variables *)
(* pos is an offset indicating where in the C code the mcodekind has an
effect *)
+and adjacency = ALLMINUS | ADJ of int
and mcodekind =
- MINUS of pos * int list * int * anything list list
+ MINUS of pos * int list * adjacency * anything replacement
| CONTEXT of pos * anything befaft
| PLUS of count
and count = ONE (* + *) | MANY (* ++ *)
| MetaFreshIdDecl of meta_name (* name *) * seed (* seed *)
| MetaTypeDecl of arity * meta_name (* name *)
| MetaInitDecl of arity * meta_name (* name *)
+ | MetaInitListDecl of arity * meta_name (* name *) * list_len (*len*)
| MetaListlenDecl of meta_name (* name *)
| MetaParamDecl of arity * meta_name (* name *)
| MetaParamListDecl of arity * meta_name (*name*) * list_len (*len*)
| MetaId of meta_name mcode * idconstraint * keep_binding * inherited
| MetaFunc of meta_name mcode * idconstraint * keep_binding * inherited
| MetaLocalFunc of meta_name mcode * idconstraint * keep_binding * inherited
+ | AsIdent of ident * ident (* as ident, always metavar *)
| DisjId of ident list
| OptIdent of ident
| FunCall of expression * string mcode (* ( *) *
expression dots * string mcode (* ) *)
| Assignment of expression * assignOp mcode * expression * bool
+ | Sequence of expression * string mcode (* , *) * expression
| CondExpr of expression * string mcode (* ? *) * expression option *
string mcode (* : *) * expression
| Postfix of expression * fixOp mcode
| Paren of string mcode (* ( *) * expression *
string mcode (* ) *)
+ | Constructor of string mcode (* ( *) * fullType * string mcode (* ) *) *
+ initialiser
| MetaErr of meta_name mcode * constraints * keep_binding *
inherited
| MetaExpr of meta_name mcode * constraints * keep_binding *
Type_cocci.typeC list option * form * inherited
| MetaExprList of meta_name mcode * listlen *
keep_binding * inherited (* only in arg lists *)
+ | AsExpr of expression * expression (* as expr, always metavar *)
| EComma of string mcode (* only in arg lists *)
| DisjExpr of expression list
| NestExpr of string mcode (* <.../<+... *) *
expression dots *
- string mcode (* ...>/...+> *) *
+ string mcode (* ...>/...+> *) *
expression option * multi
(* can appear in arg lists, and also inside Nest, as in:
| IdRegExpConstraint of reconstraint
and reconstraint =
- | IdRegExp of string * Str.regexp
- | IdNotRegExp of string * Str.regexp
+ | IdRegExp of string * Regexp.regexp
+ | IdNotRegExp of string * Regexp.regexp
and form = ANY | ID | LocalID | CONST (* form for MetaExp *)
| CstListLen of int
| AnyListLen
-and unaryOp = GetRef | DeRef | UnPlus | UnMinus | Tilde | Not
+and unaryOp = GetRef | GetRefLabel | DeRef | UnPlus | UnMinus | Tilde | Not
and assignOp = SimpleAssign | OpAssign of arithOp
and fixOp = Dec | Inc
(* Types *)
and base_fullType =
- Type of const_vol mcode option * typeC
+ Type of bool (* true if all minus *) *
+ const_vol mcode option * typeC
+ | AsType of fullType * fullType (* as type, always metavar *)
| DisjType of fullType list (* only after iso *)
| OptType of fullType
| UniqueType of fullType
and fullType = base_fullType wrap
and typeC = base_typeC wrap
-and baseType = VoidType | CharType | ShortType | IntType | DoubleType
- | FloatType | LongType | LongLongType | SizeType | SSizeType | PtrDiffType
+and baseType = VoidType | CharType | ShortType | ShortIntType | IntType
+| DoubleType | LongDoubleType | FloatType
+| LongType | LongIntType | LongLongType | LongLongIntType
+| SizeType | SSizeType | PtrDiffType
and structUnion = Struct | Union
| TyDecl of fullType * 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*) * fullType * typeC * string mcode (*;*)
| DisjDecl of declaration list
| Ddots of string mcode (* ... *) * declaration option (* whencode *)
| MetaDecl of meta_name mcode * keep_binding * inherited
| MetaField of meta_name mcode * keep_binding * inherited
| MetaFieldList of meta_name mcode * listlen * keep_binding * inherited
+ | AsDecl of declaration * declaration
| OptDecl of declaration
| UniqueDecl of declaration
and base_initialiser =
MetaInit of meta_name mcode * keep_binding * inherited
+ | MetaInitList of meta_name mcode * listlen * keep_binding * inherited
+ | AsInit of initialiser * initialiser (* as init, always metavar *)
| InitExpr of expression
| ArInitList of string mcode (*{*) * initialiser dots * string mcode (*}*)
| StrInitList of bool (* true if all are - *) *
and meta_pos =
MetaPos of meta_name mcode * meta_name list *
meta_collect * keep_binding * inherited
- | NoMetaPos
(* --------------------------------------------------------------------- *)
(* Function declaration *)
| SeqStart of string mcode (* { *)
| SeqEnd of string mcode (* } *)
- | ExprStatement of expression * string mcode (*;*)
+ | ExprStatement of expression option * string mcode (*;*)
| IfHeader of string mcode (* if *) * string mcode (* ( *) *
expression * string mcode (* ) *)
| Else of string mcode (* else *)
| Atomic of rule_elem
| Disj of statement dots list
| Nest of string mcode (* <.../<+... *) * statement dots *
- string mcode (* ...>/...+> *) *
+ string mcode (* ...>/...+> *) *
(statement dots,statement) whencode list * multi *
dots_whencode list * dots_whencode list
| FunDecl of rule_elem (* header *) * rule_elem (* { *) *
statement dots * rule_elem (* } *)
| Define of rule_elem (* header *) * statement dots
+ | AsStmt of statement * statement (* as statement, always metavar *)
| Dots of string mcode (* ... *) *
(statement dots,statement) whencode list *
dots_whencode list * dots_whencode list
| IncDots
and base_top_level =
- DECL of statement
+ NONDECL of statement (* cannot match all of a top-level declaration *)
| CODE of statement dots
| FILEINFO of string mcode (* old file *) * string mcode (* new file *)
| ERRORWORDS of expression list
val get_safe_decl : 'a wrap -> bool
val get_isos : 'a wrap -> (string*anything) list
val set_isos : 'a wrap -> (string*anything) list -> 'a wrap
-val get_pos_var : 'a mcode -> meta_pos
-val set_pos_var : meta_pos -> 'a mcode -> 'a mcode
+val get_pos_var : 'a mcode -> meta_pos list
+val set_pos_var : meta_pos list -> 'a mcode -> 'a mcode
val drop_pos : 'a mcode -> 'a mcode
val get_meta_name : metavar -> meta_name
declaration
val make_term : 'a -> 'a wrap
+val make_inherited_term : 'a -> meta_name list (* inherited vars *) -> 'a wrap
val make_mcode : 'a -> 'a mcode
val equal_pos : fixpos -> fixpos -> bool
HCoop / bpt / coccinelle.git / blobdiff