X-Git-Url: http://git.hcoop.net/bpt/coccinelle.git/blobdiff_plain/ae4735db5e7e9386036cf7b496ebdc994514dc53..c491d8eea333ab3273dc415c7d7af192e1d0b682:/parsing_cocci/ast_cocci.mli diff --git a/parsing_cocci/ast_cocci.mli b/parsing_cocci/ast_cocci.mli index bc05c42..361a4d5 100644 --- a/parsing_cocci/ast_cocci.mli +++ b/parsing_cocci/ast_cocci.mli @@ -1,5 +1,7 @@ (* - * Copyright 2005-2010, Ecole des Mines de Nantes, University of Copenhagen + * 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. * @@ -20,19 +22,14 @@ *) -(* Constraints on Meta-* Identifiers, Functions *) -type idconstraint = - IdNoConstraint - | IdNegIdSet of string list - | IdRegExp of string * Str.regexp - | IdNotRegExp of string * Str.regexp - (* --------------------------------------------------------------------- *) (* Modified code *) +type added_string = Noindent of string | Indent of string + type info = { line : int; column : int; - strbef : (string * int (* line *) * int (* col *)) list; - straft : (string * int (* line *) * int (* col *)) list } + strbef : (added_string * int (* line *) * int (* col *)) list; + straft : (added_string * int (* line *) * int (* col *)) list } type line = int type meta_name = string * string type 'a wrap = @@ -92,7 +89,7 @@ and metavar = | MetaInitDecl of arity * meta_name (* name *) | MetaListlenDecl of meta_name (* name *) | MetaParamDecl of arity * meta_name (* name *) - | MetaParamListDecl of arity * meta_name (*name*) * meta_name option (*len*) + | MetaParamListDecl of arity * meta_name (*name*) * list_len (*len*) | MetaConstDecl of arity * meta_name (* name *) * Type_cocci.typeC list option | MetaErrDecl of arity * meta_name (* name *) @@ -102,7 +99,9 @@ and metavar = arity * meta_name (* name *) * Type_cocci.typeC list option | MetaLocalIdExpDecl of arity * meta_name (* name *) * Type_cocci.typeC list option - | MetaExpListDecl of arity * meta_name (*name*) * meta_name option (*len*) + | MetaExpListDecl of arity * meta_name (*name*) * list_len (*len*) + | MetaDeclDecl of arity * meta_name (* name *) + | MetaFieldDecl of arity * meta_name (* name *) | MetaStmDecl of arity * meta_name (* name *) | MetaStmListDecl of arity * meta_name (* name *) | MetaFuncDecl of arity * meta_name (* name *) @@ -111,6 +110,8 @@ and metavar = | MetaDeclarerDecl of arity * meta_name (* name *) | MetaIteratorDecl of arity * meta_name (* name *) +and list_len = AnyLen | MetaLen of meta_name | CstLen of int + and seed = NoVal | StringSeed of string | ListSeed of seed_elem list and seed_elem = SeedString of string | SeedId of meta_name @@ -174,13 +175,16 @@ and base_expression = inherited | MetaExpr of meta_name mcode * constraints * keep_binding * Type_cocci.typeC list option * form * inherited - | MetaExprList of meta_name mcode * listlen option * + | MetaExprList of meta_name mcode * listlen * keep_binding * inherited (* only in arg lists *) | EComma of string mcode (* only in arg lists *) | DisjExpr of expression list - | NestExpr of expression dots * expression option * multi + | NestExpr of string mcode (* <.../<+... *) * + expression dots * + string mcode (* ...>/...+> *) * + expression option * multi (* can appear in arg lists, and also inside Nest, as in: if(< ... X ... Y ...>) @@ -194,14 +198,28 @@ and base_expression = and constraints = NoConstraint - | NotIdCstrt of idconstraint + | NotIdCstrt of reconstraint | NotExpCstrt of expression list + | SubExpCstrt of meta_name list + +(* Constraints on Meta-* Identifiers, Functions *) +and idconstraint = + IdNoConstraint + | IdNegIdSet of string list * meta_name list + | IdRegExpConstraint of reconstraint + +and reconstraint = + | IdRegExp of string * Str.regexp + | IdNotRegExp of string * Str.regexp and form = ANY | ID | LocalID | CONST (* form for MetaExp *) and expression = base_expression wrap -and listlen = meta_name mcode * keep_binding * inherited +and listlen = + MetaListLen of meta_name mcode * keep_binding * inherited + | CstListLen of int + | AnyListLen and unaryOp = GetRef | DeRef | UnPlus | UnMinus | Tilde | Not and assignOp = SimpleAssign | OpAssign of arithOp @@ -240,7 +258,9 @@ and base_typeC = string mcode (* ) *) | Array of fullType * string mcode (* [ *) * expression option * string mcode (* ] *) - | EnumName of string mcode (*enum*) * ident (* name *) + | EnumName of string mcode (*enum*) * ident option (* name *) + | EnumDef of fullType (* either EnumName or metavar *) * + string mcode (* { *) * expression dots * string mcode (* } *) | StructUnionName of structUnion mcode * ident option (* name *) | StructUnionDef of fullType (* either StructUnionName or metavar *) * string mcode (* { *) * declaration dots * string mcode (* } *) @@ -277,6 +297,7 @@ and base_declaration = | Ddots of string mcode (* ... *) * declaration option (* whencode *) | MetaDecl of meta_name mcode * keep_binding * inherited + | MetaField of meta_name mcode * keep_binding * inherited | OptDecl of declaration | UniqueDecl of declaration @@ -289,7 +310,9 @@ and declaration = base_declaration wrap and base_initialiser = MetaInit of meta_name mcode * keep_binding * inherited | InitExpr of expression - | InitList of string mcode (*{*) * initialiser list * string mcode (*}*) * + | ArInitList of string mcode (*{*) * initialiser dots * string mcode (*}*) + | StrInitList of bool (* true if all are - *) * + string mcode (*{*) * initialiser list * string mcode (*}*) * initialiser list (* whencode: elements that shouldn't appear in init *) | InitGccExt of designator list (* name *) * string mcode (*=*) * @@ -297,6 +320,7 @@ and base_initialiser = | InitGccName of ident (* name *) * string mcode (*:*) * initialiser | IComma of string mcode (* , *) + | Idots of string mcode (* ... *) * initialiser option (* whencode *) | OptIni of initialiser | UniqueIni of initialiser @@ -317,8 +341,7 @@ and base_parameterTypeDef = | Param of fullType * ident option | MetaParam of meta_name mcode * keep_binding * inherited - | MetaParamList of meta_name mcode * listlen option * keep_binding * - inherited + | MetaParamList of meta_name mcode * listlen * keep_binding * inherited | PComma of string mcode @@ -449,7 +472,8 @@ and base_statement = statement (*decl*) dots * case_line list * rule_elem(*}*) | Atomic of rule_elem | Disj of statement dots list - | Nest of statement dots * + | Nest of string mcode (* <.../<+... *) * statement dots * + string mcode (* ...>/...+> *) * (statement dots,statement) whencode list * multi * dots_whencode list * dots_whencode list | FunDecl of rule_elem (* header *) * rule_elem (* { *) * @@ -516,9 +540,12 @@ and rulename = | GeneratedRulename of string option * dependency * string list * string list * exists * bool (* true if the whole thing is an expression *) - | ScriptRulename of string * dependency - | InitialScriptRulename of string - | FinalScriptRulename of string + | ScriptRulename of string option (* name *) * string (* language *) * + dependency + | InitialScriptRulename of string option (* name *) * string (* language *) * + dependency + | FinalScriptRulename of string option (* name *) * string (* language *) * + dependency and ruletype = Normal | Generated @@ -526,9 +553,16 @@ and rule = CocciRule of string (* name *) * (dependency * string list (* dropped isos *) * exists) * top_level list * bool list (* true if generates an exp *) * ruletype - | ScriptRule of string * dependency * (string * meta_name) list * string - | InitialScriptRule of string * string - | FinalScriptRule of string * string + | ScriptRule of string (* name *) * + string * dependency * + (script_meta_name * meta_name * metavar) list * + meta_name list (*script vars*) * string + | InitialScriptRule of string (* name *) * + string * dependency * string + | FinalScriptRule of string (* name *) * + string * dependency * string + +and script_meta_name = string option (*string*) * string option (*ast*) and dependency = Dep of string (* rule applies for the current binding *) @@ -564,7 +598,7 @@ and anything = | CaseLineTag of case_line | ConstVolTag of const_vol | Token of string * info option - | Pragma of string list + | Pragma of added_string list | Code of top_level | ExprDotsTag of expression dots | ParamDotsTag of parameterTypeDef dots