(* --------------------------------------------------------------------- *)
(* Modified code *)
-type added_string = Noindent of string | Indent of string
+type added_string = Noindent of string | Indent of string | Space of string
type info = { line : int; column : int;
strbef : (added_string * int (* line *) * int (* col *)) list;
bef_aft : dots_bef_aft;
pos_info : meta_name mcode option; (* pos info, try not to duplicate *)
true_if_test_exp : bool;(* true if "test_exp from iso", only for exprs *)
+ (* the following is only for declarations *)
+ safe_for_multi_decls : bool;
(* isos relevant to the term; ultimately only used for rule_elems *)
iso_info : (string*anything) list }
| 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 (* ++ *)
and arity = UNIQUE | OPT | MULTI | NONE
and metavar =
- MetaIdDecl of arity * meta_name (* name *)
+ MetaMetaDecl of arity * meta_name (* name *)
+ | MetaIdDecl of arity * meta_name (* name *)
| 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*) * 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 *)
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 *)
+ | MetaFieldListDecl of arity * meta_name (* name *) * list_len (*len*)
| MetaStmDecl of arity * meta_name (* name *)
| MetaStmListDecl of arity * meta_name (* name *)
| MetaFuncDecl of arity * meta_name (* name *)
| 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
| MetaFunc of meta_name mcode * idconstraint * keep_binding * inherited
| MetaLocalFunc of meta_name mcode * idconstraint * keep_binding * inherited
+ | DisjId of ident list
| OptIdent of ident
| UniqueIdent of ident
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 *)
| 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 *)
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 unaryOp = GetRef | GetRefLabel | DeRef | UnPlus | UnMinus | Tilde | Not
and assignOp = SimpleAssign | OpAssign of arithOp
and fixOp = Dec | Inc
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 (* } *)
and typeC = base_typeC wrap
and baseType = VoidType | CharType | ShortType | IntType | DoubleType
- | FloatType | LongType | LongLongType
+ | FloatType | LongType | LongLongType | SizeType | SSizeType | PtrDiffType
and structUnion = Struct | Union
| 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
| 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
| InitExpr of expression
- | InitList of bool (* true if all are - *) *
+ | 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
| InitGccName of ident (* name *) * string mcode (*:*) *
initialiser
| IComma of string mcode (* , *)
+ | Idots of string mcode (* ... *) * initialiser option (* whencode *)
| OptIni of initialiser
| UniqueIni of initialiser
| 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
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 *)
| Ty of fullType (* only at top level *)
| TopInit of initialiser (* only at top level *)
| Include of string mcode (*#include*) * inc_file mcode (*file *)
+ | Undef of string mcode (* #define *) * ident (* name *)
| DefineHeader of string mcode (* #define *) * ident (* name *) *
define_parameters (*params*)
| Case of string mcode (* case *) * expression * string mcode (*:*)
| 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
(dependency * string list (* dropped isos *) * exists) *
top_level list * bool list (* true if generates an exp *) * ruletype
| ScriptRule of string (* name *) *
- string * dependency * (string * meta_name * metavar) list * string
+ 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 *)
| AntiDep of string (* rule doesn't apply for the current binding *)
val set_pos : 'a wrap -> meta_name mcode option -> 'a wrap
val get_test_exp : 'a wrap -> bool
val set_test_exp : expression -> expression
+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