(*
+ * 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.
+ *
+ * Coccinelle is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, according to version 2 of the License.
+ *
+ * Coccinelle is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Coccinelle. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The authors reserve the right to distribute this or future versions of
+ * Coccinelle under other licenses.
+ *)
+
+
+(*
+ * 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.
module VT0 = Visitor_ast0_types
module Ast = Ast_cocci
module Ast0 = Ast0_cocci
+
+exception Bad_virt of string
+
let pr = Printf.sprintf
(*let pr2 s = prerr_string s; prerr_string "\n"; flush stderr*)
let pr2 s = Printf.printf "%s\n" s
| PC.TExpression -> "expression"
| PC.TIdExpression -> "idexpression"
| PC.TInitialiser -> "initialiser"
+ | PC.TDeclaration -> "declaration"
+ | PC.TField -> "field"
| PC.TStatement -> "statement"
| PC.TPosition -> "position"
| PC.TPosAny -> "any"
| PC.Tfloat(clt) -> "float"^(line_type2c clt)
| PC.Tlong(clt) -> "long"^(line_type2c clt)
| PC.Tvoid(clt) -> "void"^(line_type2c clt)
+ | PC.Tsize_t(clt) -> "size_t"^(line_type2c clt)
+ | PC.Tssize_t(clt) -> "ssize_t"^(line_type2c clt)
+ | PC.Tptrdiff_t(clt) -> "ptrdiff_t"^(line_type2c clt)
| PC.Tstruct(clt) -> "struct"^(line_type2c clt)
| PC.Tunion(clt) -> "union"^(line_type2c clt)
| PC.Tenum(clt) -> "enum"^(line_type2c clt)
| PC.Tconst(clt) -> "const"^(line_type2c clt)
| PC.Tvolatile(clt) -> "volatile"^(line_type2c clt)
- | PC.TPragma(s,_) -> s
+ | PC.TPragma(Ast.Noindent s,_) -> s
+ | PC.TPragma(Ast.Indent s,_) -> s
| PC.TIncludeL(s,clt) -> (pr "#include \"%s\"" s)^(line_type2c clt)
| PC.TIncludeNL(s,clt) -> (pr "#include <%s>" s)^(line_type2c clt)
| PC.TDefine(clt,_) -> "#define"^(line_type2c clt)
| PC.TAnd (clt) -> "&"^(line_type2c clt)
| PC.TEqEq(clt) -> "=="^(line_type2c clt)
| PC.TNotEq(clt) -> "!="^(line_type2c clt)
+ | PC.TSub(clt) -> "<="^(line_type2c clt)
| PC.TTildeEq(clt) -> "~="^(line_type2c clt)
| PC.TTildeExclEq(clt) -> "~!="^(line_type2c clt)
| PC.TLogOp(op,clt) ->
| Ast.SupEq -> ">="
| _ -> failwith "not possible")
^(line_type2c clt)
- | PC.TShOp(op,clt) ->
- (match op with
- Ast.DecLeft -> "<<"
- | Ast.DecRight -> ">>"
- | _ -> failwith "not possible")
- ^(line_type2c clt)
+ | PC.TShLOp(op,clt) -> "<<"^(line_type2c clt)
+ | PC.TShROp(op,clt) -> ">>"^(line_type2c clt)
| PC.TPlus(clt) -> "+"^(line_type2c clt)
| PC.TMinus(clt) -> "-"^(line_type2c clt)
| PC.TMul(clt) -> "*"^(line_type2c clt)
| PC.TMetaId(_,_,_,clt) -> "idmeta"^(line_type2c clt)
| PC.TMetaType(_,_,clt) -> "typemeta"^(line_type2c clt)
| PC.TMetaInit(_,_,clt) -> "initmeta"^(line_type2c clt)
- | PC.TMetaStm(_,_,clt) -> "stmmeta"^(line_type2c clt)
- | PC.TMetaStmList(_,_,clt) -> "stmlistmeta"^(line_type2c clt)
+ | PC.TMetaDecl(_,_,clt) -> "declmeta"^(line_type2c clt)
+ | PC.TMetaField(_,_,clt) -> "fieldmeta"^(line_type2c clt)
+ | PC.TMetaStm(_,_,clt) -> "stmmeta"^(line_type2c clt)
+ | PC.TMetaStmList(_,_,clt) -> "stmlistmeta"^(line_type2c clt)
| PC.TMetaFunc(_,_,_,clt) -> "funcmeta"^(line_type2c clt)
| PC.TMetaLocalFunc(_,_,_,clt) -> "funcmeta"^(line_type2c clt)
| PC.TMetaPos(_,_,_,clt) -> "posmeta"
| PC.TIsoExpression -> "Expression"
| PC.TIsoArgExpression -> "ArgExpression"
| PC.TIsoTestExpression -> "TestExpression"
+ | PC.TIsoToTestExpression -> "ToTestExpression"
| PC.TIsoStatement -> "Statement"
| PC.TIsoDeclaration -> "Declaration"
| PC.TIsoType -> "Type"
+ | PC.TUnderscore -> "_"
| PC.TScriptData s -> s
let print_tokens s tokens =
let plus_attachable only_plus (tok,_) =
match tok with
PC.Tchar(clt) | PC.Tshort(clt) | PC.Tint(clt) | PC.Tdouble(clt)
- | PC.Tfloat(clt) | PC.Tlong(clt) | PC.Tvoid(clt) | PC.Tstruct(clt)
+ | PC.Tfloat(clt) | PC.Tlong(clt)
+ | PC.Tsize_t(clt) | PC.Tssize_t(clt) | PC.Tptrdiff_t(clt)
+ | PC.Tstruct(clt)
| PC.Tunion(clt) | PC.Tenum(clt) | PC.Tunsigned(clt) | PC.Tsigned(clt)
| PC.Tstatic(clt)
| PC.Tinline(clt) | PC.Ttypedef(clt) | PC.Tattr(_,clt)
| PC.TString(_,clt) | PC.TChar(_,clt) | PC.TFloat(_,clt) | PC.TInt(_,clt)
| PC.TOrLog(clt) | PC.TAndLog(clt) | PC.TOr(clt) | PC.TXor(clt)
- | PC.TAnd (clt) | PC.TEqEq(clt) | PC.TNotEq(clt) | PC.TTildeEq(clt) | PC.TLogOp(_,clt)
- | PC.TShOp(_,clt) | PC.TPlus(clt) | PC.TMinus(clt) | PC.TMul(clt)
+ | PC.TAnd (clt) | PC.TEqEq(clt) | PC.TNotEq(clt) | PC.TTildeEq(clt)
+ | PC.TLogOp(_,clt)
+ | PC.TShLOp(_,clt) | PC.TShROp(_,clt)
+ | PC.TPlus(clt) | PC.TMinus(clt) | PC.TMul(clt)
| PC.TDmOp(_,clt) | PC.TTilde (clt)
| PC.TMetaParam(_,_,clt) | PC.TMetaParamList(_,_,_,clt)
| PC.TMetaExpList(_,_,_,clt)
| PC.TMetaId(_,_,_,clt)
| PC.TMetaType(_,_,clt) | PC.TMetaInit(_,_,clt) | PC.TMetaStm(_,_,clt)
- | PC.TMetaStmList(_,_,clt) | PC.TMetaFunc(_,_,_,clt)
- | PC.TMetaLocalFunc(_,_,_,clt)
+ | PC.TMetaStmList(_,_,clt) | PC.TMetaDecl(_,_,clt) | PC.TMetaField(_,_,clt)
+ | PC.TMetaFunc(_,_,_,clt) | PC.TMetaLocalFunc(_,_,_,clt)
| PC.TWhen(clt) | PC.TWhenTrue(clt) | PC.TWhenFalse(clt)
| PC.TAny(clt) | PC.TStrict(clt) | PC.TEllipsis(clt)
(* | PC.TCircles(clt) | PC.TStars(clt) *)
+ | PC.TOEllipsis(clt) | PC.TCEllipsis(clt)
+ | PC.TPOEllipsis(clt) | PC.TPCEllipsis(clt) (* | PC.TOCircles(clt)
+ | PC.TCCircles(clt) | PC.TOStars(clt) | PC.TCStars(clt) *)
| PC.TWhy(clt) | PC.TDotDot(clt) | PC.TBang(clt) | PC.TOPar(clt)
| PC.TCPar(clt)
else if only_plus then NOTPLUS
else if line_type clt = D.CONTEXT then PLUS else NOTPLUS
- | PC.TOPar0(clt) | PC.TMid0(clt) | PC.TCPar0(clt)
- | PC.TOEllipsis(clt) | PC.TCEllipsis(clt)
- | PC.TPOEllipsis(clt) | PC.TPCEllipsis(clt) (* | PC.TOCircles(clt)
- | PC.TCCircles(clt) | PC.TOStars(clt) | PC.TCStars(clt) *) -> NOTPLUS
+ | PC.TOPar0(clt) | PC.TMid0(clt) | PC.TCPar0(clt) -> NOTPLUS
| PC.TMetaPos(nm,_,_,_) -> NOTPLUS
+ | PC.TSub(clt) -> NOTPLUS
| _ -> SKIP
let get_clt (tok,_) =
match tok with
PC.Tchar(clt) | PC.Tshort(clt) | PC.Tint(clt) | PC.Tdouble(clt)
- | PC.Tfloat(clt) | PC.Tlong(clt) | PC.Tvoid(clt) | PC.Tstruct(clt)
+ | PC.Tfloat(clt) | PC.Tlong(clt) | PC.Tvoid(clt)
+ | PC.Tsize_t(clt) | PC.Tssize_t(clt) | PC.Tptrdiff_t(clt)
+ | PC.Tstruct(clt)
| PC.Tunion(clt) | PC.Tenum(clt) | PC.Tunsigned(clt) | PC.Tsigned(clt)
| PC.Tstatic(clt)
| PC.Tinline(clt) | PC.Tattr(_,clt) | PC.Tauto(clt) | PC.Tregister(clt)
| PC.TString(_,clt) | PC.TChar(_,clt) | PC.TFloat(_,clt) | PC.TInt(_,clt)
| PC.TOrLog(clt) | PC.TAndLog(clt) | PC.TOr(clt) | PC.TXor(clt)
- | PC.TAnd (clt) | PC.TEqEq(clt) | PC.TNotEq(clt) | PC.TTildeEq(clt) | PC.TLogOp(_,clt)
- | PC.TShOp(_,clt) | PC.TPlus(clt) | PC.TMinus(clt) | PC.TMul(clt)
+ | PC.TAnd (clt) | PC.TEqEq(clt) | PC.TNotEq(clt) | PC.TTildeEq(clt)
+ | PC.TSub(clt) | PC.TLogOp(_,clt)
+ | PC.TShLOp(_,clt) | PC.TShROp(_,clt)
+ | PC.TPlus(clt) | PC.TMinus(clt) | PC.TMul(clt)
| PC.TDmOp(_,clt) | PC.TTilde (clt)
| PC.TMetaParam(_,_,clt) | PC.TMetaParamList(_,_,_,clt)
| PC.TMetaExpList(_,_,_,clt)
| PC.TMetaId(_,_,_,clt)
| PC.TMetaType(_,_,clt) | PC.TMetaInit(_,_,clt) | PC.TMetaStm(_,_,clt)
- | PC.TMetaStmList(_,_,clt) | PC.TMetaFunc(_,_,_,clt)
- | PC.TMetaLocalFunc(_,_,_,clt) | PC.TMetaPos(_,_,_,clt)
+ | PC.TMetaStmList(_,_,clt) | PC.TMetaDecl(_,_,clt) | PC.TMetaField(_,_,clt)
+ | PC.TMetaFunc(_,_,_,clt) | PC.TMetaLocalFunc(_,_,_,clt)
+ | PC.TMetaPos(_,_,_,clt)
| PC.TWhen(clt) | PC.TWhenTrue(clt) | PC.TWhenFalse(clt) |
PC.TAny(clt) | PC.TStrict(clt) | PC.TEllipsis(clt)
| PC.Tfloat(_) -> (PC.Tfloat(clt),x)
| PC.Tlong(_) -> (PC.Tlong(clt),x)
| PC.Tvoid(_) -> (PC.Tvoid(clt),x)
+ | PC.Tsize_t(_) -> (PC.Tsize_t(clt),x)
+ | PC.Tssize_t(_) -> (PC.Tssize_t(clt),x)
+ | PC.Tptrdiff_t(_) -> (PC.Tptrdiff_t(clt),x)
| PC.Tstruct(_) -> (PC.Tstruct(clt),x)
| PC.Tunion(_) -> (PC.Tunion(clt),x)
| PC.Tenum(_) -> (PC.Tenum(clt),x)
| PC.TEqEq(_) -> (PC.TEqEq(clt),x)
| PC.TNotEq(_) -> (PC.TNotEq(clt),x)
| PC.TTildeEq(_) -> (PC.TTildeEq(clt),x)
+ | PC.TSub(_) -> (PC.TSub(clt),x)
| PC.TLogOp(op,_) -> (PC.TLogOp(op,clt),x)
- | PC.TShOp(op,_) -> (PC.TShOp(op,clt),x)
+ | PC.TShLOp(op,_) -> (PC.TShLOp(op,clt),x)
+ | PC.TShROp(op,_) -> (PC.TShROp(op,clt),x)
| PC.TPlus(_) -> (PC.TPlus(clt),x)
| PC.TMinus(_) -> (PC.TMinus(clt),x)
| PC.TMul(_) -> (PC.TMul(clt),x)
| PC.TMetaId(a,b,c,_) -> (PC.TMetaId(a,b,c,clt),x)
| PC.TMetaType(a,b,_) -> (PC.TMetaType(a,b,clt),x)
| PC.TMetaInit(a,b,_) -> (PC.TMetaInit(a,b,clt),x)
- | PC.TMetaStm(a,b,_) -> (PC.TMetaStm(a,b,clt),x)
- | PC.TMetaStmList(a,b,_) -> (PC.TMetaStmList(a,b,clt),x)
+ | PC.TMetaDecl(a,b,_) -> (PC.TMetaDecl(a,b,clt),x)
+ | PC.TMetaField(a,b,_) -> (PC.TMetaField(a,b,clt),x)
+ | PC.TMetaStm(a,b,_) -> (PC.TMetaStm(a,b,clt),x)
+ | PC.TMetaStmList(a,b,_) -> (PC.TMetaStmList(a,b,clt),x)
| PC.TMetaFunc(a,b,c,_) -> (PC.TMetaFunc(a,b,c,clt),x)
| PC.TMetaLocalFunc(a,b,c,_) -> (PC.TMetaLocalFunc(a,b,c,clt),x)
let split_token ((tok,_) as t) =
match tok with
PC.TIdentifier | PC.TConstant | PC.TExpression | PC.TIdExpression
+ | PC.TDeclaration | PC.TField
| PC.TStatement | PC.TPosition | PC.TPosAny | PC.TInitialiser
| PC.TFunction | PC.TTypedef | PC.TDeclarer | PC.TIterator | PC.TName
| PC.TType | PC.TParameter | PC.TLocal | PC.Tlist | PC.TFresh
| PC.TError | PC.TWords | PC.TGenerated | PC.TNothing -> ([t],[t])
| PC.Tchar(clt) | PC.Tshort(clt) | PC.Tint(clt) | PC.Tdouble(clt)
- | PC.Tfloat(clt) | PC.Tlong(clt) | PC.Tvoid(clt) | PC.Tstruct(clt)
+ | PC.Tfloat(clt) | PC.Tlong(clt) | PC.Tvoid(clt)
+ | PC.Tsize_t(clt) | PC.Tssize_t(clt) | PC.Tptrdiff_t(clt)
+ | PC.Tstruct(clt)
| PC.Tunion(clt) | PC.Tenum(clt) | PC.Tunsigned(clt) | PC.Tsigned(clt)
| PC.Tstatic(clt) | PC.Tauto(clt) | PC.Tregister(clt) | PC.Textern(clt)
| PC.Tinline(clt) | PC.Ttypedef(clt) | PC.Tattr(_,clt)
| PC.TMetaExpList(_,_,_,clt)
| PC.TMetaParam(_,_,clt) | PC.TMetaParamList(_,_,_,clt)
| PC.TMetaId(_,_,_,clt) | PC.TMetaType(_,_,clt) | PC.TMetaInit(_,_,clt)
+ | PC.TMetaDecl(_,_,clt) | PC.TMetaField(_,_,clt)
| PC.TMetaStm(_,_,clt) | PC.TMetaStmList(_,_,clt) | PC.TMetaErr(_,_,_,clt)
| PC.TMetaFunc(_,_,_,clt) | PC.TMetaLocalFunc(_,_,_,clt)
| PC.TMetaDeclarer(_,_,_,clt) | PC.TMetaIterator(_,_,_,clt) -> split t clt
| PC.TFunDecl(clt)
| PC.TWhen(clt) | PC.TWhenTrue(clt) | PC.TWhenFalse(clt)
| PC.TAny(clt) | PC.TStrict(clt) | PC.TLineEnd(clt)
- | PC.TEllipsis(clt) (* | PC.TCircles(clt) | PC.TStars(clt) *) -> split t clt
+ | PC.TEllipsis(clt) (* | PC.TCircles(clt) | PC.TStars(clt) *)
+ | PC.TOEllipsis(clt) | PC.TCEllipsis(clt)
+ | PC.TPOEllipsis(clt) | PC.TPCEllipsis(clt) -> split t clt
- | PC.TOEllipsis(_) | PC.TCEllipsis(_) (* clt must be context *)
- | PC.TPOEllipsis(_) | PC.TPCEllipsis(_) (* clt must be context *)
(*
| PC.TOCircles(_) | PC.TCCircles(_) (* clt must be context *)
| PC.TOStars(_) | PC.TCStars(_) (* clt must be context *)
*)
+
| PC.TBang0 | PC.TPlus0 | PC.TWhy0 ->
([t],[t])
split t clt
| PC.TOrLog(clt) | PC.TAndLog(clt) | PC.TOr(clt) | PC.TXor(clt)
- | PC.TAnd (clt) | PC.TEqEq(clt) | PC.TNotEq(clt) | PC.TTildeEq(clt) | PC.TTildeExclEq(clt) | PC.TLogOp(_,clt)
- | PC.TShOp(_,clt) | PC.TPlus(clt) | PC.TMinus(clt) | PC.TMul(clt)
+ | PC.TAnd (clt) | PC.TEqEq(clt) | PC.TNotEq(clt) | PC.TTildeEq(clt)
+ | PC.TTildeExclEq(clt) | PC.TSub(clt) | PC.TLogOp(_,clt)
+ | PC.TShLOp(_,clt) | PC.TShROp(_,clt)
+ | PC.TPlus(clt) | PC.TMinus(clt) | PC.TMul(clt)
| PC.TDmOp(_,clt) | PC.TTilde (clt) -> split t clt
| PC.TOBrace(clt) | PC.TCBrace(clt) | PC.TOInit(clt) -> split t clt
| PC.TEq(clt) | PC.TAssign(_,clt) | PC.TDot(clt) | PC.TComma(clt)
| PC.TPtVirg(clt) -> split t clt
- | PC.EOF | PC.TInvalid -> ([t],[t])
+ | PC.EOF | PC.TInvalid | PC.TUnderscore -> ([t],[t])
| PC.TIso | PC.TRightIso
| PC.TIsoExpression | PC.TIsoStatement | PC.TIsoDeclaration | PC.TIsoType
- | PC.TIsoTopLevel | PC.TIsoArgExpression | PC.TIsoTestExpression ->
+ | PC.TIsoTopLevel | PC.TIsoArgExpression | PC.TIsoTestExpression
+ | PC.TIsoToTestExpression ->
failwith "unexpected tokens"
| PC.TScriptData s -> ([t],[t])
| (PC.TMetaExpList(_,_,_,_),_)
| (PC.TMetaType(_,_,_),_)
| (PC.TMetaInit(_,_,_),_)
+ | (PC.TMetaDecl(_,_,_),_)
+ | (PC.TMetaField(_,_,_),_)
| (PC.TMetaStm(_,_,_),_)
| (PC.TMetaStmList(_,_,_),_)
| (PC.TMetaPos(_,_,_,_),_) -> in_meta_decls
let token2line (tok,_) =
match tok with
PC.Tchar(clt) | PC.Tshort(clt) | PC.Tint(clt) | PC.Tdouble(clt)
- | PC.Tfloat(clt) | PC.Tlong(clt) | PC.Tvoid(clt) | PC.Tstruct(clt)
+ | PC.Tfloat(clt) | PC.Tlong(clt) | PC.Tvoid(clt)
+ | PC.Tsize_t(clt) | PC.Tssize_t(clt) | PC.Tptrdiff_t(clt)
+ | PC.Tstruct(clt)
| PC.Tunion(clt) | PC.Tenum(clt) | PC.Tunsigned(clt) | PC.Tsigned(clt)
| PC.Tstatic(clt) | PC.Tauto(clt) | PC.Tregister(clt) | PC.Textern(clt)
| PC.Tinline(clt) | PC.Ttypedef(clt) | PC.Tattr(_,clt) | PC.Tconst(clt)
| PC.TOrLog(clt) | PC.TAndLog(clt) | PC.TOr(clt) | PC.TXor(clt)
| PC.TAnd (clt) | PC.TEqEq(clt) | PC.TNotEq(clt) | PC.TLogOp(_,clt)
- | PC.TShOp(_,clt) | PC.TPlus(clt) | PC.TMinus(clt) | PC.TMul(clt)
+ | PC.TShLOp(_,clt) | PC.TShROp(_,clt)
+ | PC.TPlus(clt) | PC.TMinus(clt) | PC.TMul(clt)
| PC.TDmOp(_,clt) | PC.TTilde (clt)
| PC.TMetaParam(_,_,clt) | PC.TMetaParamList(_,_,_,clt)
| PC.TMetaIdExp(_,_,_,_,clt) | PC.TMetaLocalIdExp(_,_,_,_,clt)
| PC.TMetaExpList(_,_,_,clt)
| PC.TMetaId(_,_,_,clt) | PC.TMetaType(_,_,clt) | PC.TMetaInit(_,_,clt)
+ | PC.TMetaDecl(_,_,clt) | PC.TMetaField(_,_,clt)
| PC.TMetaStm(_,_,clt) | PC.TMetaStmList(_,_,clt) | PC.TMetaFunc(_,_,_,clt)
| PC.TMetaLocalFunc(_,_,_,clt) | PC.TMetaPos(_,_,_,clt)
(* ----------------------------------------------------------------------- *)
+(* In a nest, if the nest is -, all of the nested code must also be -.
+All are converted to context, because the next takes care of the -. *)
+let check_nests tokens =
+ let is_minus t =
+ let (line_type,a,b,c,d,e,f,g) = get_clt t in
+ List.mem line_type [D.MINUS;D.OPTMINUS;D.UNIQUEMINUS] in
+ let drop_minus t =
+ let clt = try Some(get_clt t) with Failure _ -> None in
+ match clt with
+ Some (line_type,a,b,c,d,e,f,g) ->
+ (match line_type with
+ D.MINUS -> update_clt t (D.CONTEXT,a,b,c,d,e,f,g)
+ | D.OPTMINUS -> update_clt t (D.OPT,a,b,c,d,e,f,g)
+ | D.UNIQUEMINUS -> update_clt t (D.UNIQUE,a,b,c,d,e,f,g)
+ | _ -> failwith "minus token expected")
+ | None -> t in
+ let rec outside = function
+ [] -> []
+ | ((PC.TPOEllipsis(clt),q) as t)::r when is_minus t -> t :: inside 0 r
+ | t::r -> t :: outside r
+ and inside stack = function
+ [] -> failwith "missing nest end"
+ | ((PC.TPCEllipsis(clt),q) as t)::r ->
+ (drop_minus t)
+ :: (if stack = 0 then outside r else inside (stack - 1) r)
+ | ((PC.TPOEllipsis(clt),q) as t)::r ->
+ (drop_minus t) :: (inside (stack + 1) r)
+ | t :: r -> (drop_minus t) :: (inside stack r) in
+ outside tokens
+
let check_parentheses tokens =
let clt2line (_,line,_,_,_,_,_,_) = line in
let rec loop seen_open = function
(Printf.sprintf
"unexpected close parenthesis in line %d\n" (clt2line clt))
| Common.Left _ :: seen_open -> loop seen_open rest
- | Common.Right open_line :: _ ->
+ | Common.Right open_line :: _ ->
failwith
(Printf.sprintf
"disjunction parenthesis in line %d column 0 matched to normal parenthesis on line %d\n" open_line (clt2line clt)))
(Printf.sprintf
"unexpected close parenthesis in line %d\n" (clt2line clt))
| Common.Right _ :: seen_open -> loop seen_open rest
- | Common.Left open_line :: _ ->
+ | Common.Left open_line :: _ ->
failwith
(Printf.sprintf
"normal parenthesis in line %d matched to disjunction parenthesis on line %d column 0\n" open_line (clt2line clt)))
[] -> []
| x::rest when any_before prev && any_after x ->
(PC.TNothing,i)::x::(loop x rest)
+ | ((PC.TComma(_),_) as c)::x::rest when any_before prev && any_after x ->
+ c::(PC.TNothing,i)::x::(loop x rest)
| x::rest -> x :: (loop x rest) in
match l with
[] -> []
(translate_when_true_false (* after insert_line_end *)
(insert_line_end
(detect_types false
- (find_function_names (detect_attr (check_parentheses tokens))))))
+ (find_function_names
+ (detect_attr
+ (check_nests
+ (check_parentheses tokens)))))))
let prepare_mv_tokens tokens =
detect_types false (detect_attr tokens)
List.iter
(function x ->
if not (List.mem x virt)
- then
- failwith
- (Printf.sprintf "unknown virtual rule %s\n" x))
- !Flag_parsing_cocci.defined_virtual_rules
+ then raise (Bad_virt x))
+ !Flag.defined_virtual_rules
let drop_last extra l = List.rev(extra@(List.tl(List.rev l)))
Ast.CocciRulename (check_name nm,a,b,c,d,e)
| Ast.GeneratedRulename (nm,a,b,c,d,e) ->
Ast.GeneratedRulename (check_name nm,a,b,c,d,e)
- | Ast.ScriptRulename(s,deps) -> Ast.ScriptRulename(s,deps)
- | Ast.InitialScriptRulename(s) -> Ast.InitialScriptRulename(s)
- | Ast.FinalScriptRulename(s) -> Ast.FinalScriptRulename(s)
+ | Ast.ScriptRulename(nm,s,deps) ->
+ Ast.ScriptRulename(check_name nm,s,deps)
+ | Ast.InitialScriptRulename(_,s,deps) ->
+ Ast.InitialScriptRulename(check_name None,s,deps)
+ | Ast.FinalScriptRulename(_,s,deps) ->
+ Ast.FinalScriptRulename(check_name None,s,deps)
else
Ast.CocciRulename(Some(mknm()),Ast.NoDep,[],[],Ast.Undetermined,false) in
Data.in_rule_name := false;
let (more,tokens) =
get_tokens
[PC.TIsoStatement;PC.TIsoExpression;PC.TIsoArgExpression;
- PC.TIsoTestExpression;
+ PC.TIsoTestExpression; PC.TIsoToTestExpression;
PC.TIsoDeclaration;PC.TIsoType;PC.TIsoTopLevel] in
let next_start = List.hd(List.rev tokens) in
let dummy_info = ("",(-1,-1),(-1,-1)) in
let tokens = prepare_tokens (start@tokens) in
(*
print_tokens "iso tokens" tokens;
- *)
+ å*)
let entry = parse_one "iso main" PC.iso_main file tokens in
let entry = List.map (List.map Test_exps.process_anything) entry in
if more
Ast.Dep req | Ast.EverDep req ->
if List.mem req virt
then
- if List.mem req !Flag_parsing_cocci.defined_virtual_rules
+ if List.mem req !Flag.defined_virtual_rules
then Some Ast.NoDep
else None
else Some dep
| Ast.AntiDep antireq | Ast.NeverDep antireq ->
if List.mem antireq virt
then
- if not(List.mem antireq !Flag_parsing_cocci.defined_virtual_rules)
+ if not(List.mem antireq !Flag.defined_virtual_rules)
then Some Ast.NoDep
else None
else Some dep
| Ast.OrDep(d1,d2) ->
(match (loop d1, loop d2) with
(None,None) -> None
- | (Some Ast.NoDep,x) | (x,Some Ast.NoDep) | (None,x) | (x,None) -> x
+ | (Some Ast.NoDep,x) | (x,Some Ast.NoDep) -> Some Ast.NoDep
+ | (None,x) | (x,None) -> x
| (Some x,Some y) -> Some (Ast.OrDep(x,y)))
| Ast.NoDep | Ast.FailDep -> Some dep
in
loop dep
-let rec parse file =
+let parse file =
Lexer_cocci.init();
+ let rec parse_loop file =
+ Lexer_cocci.include_init ();
let table = Common.full_charpos_to_pos file in
Common.with_open_infile file (fun channel ->
let lexbuf = Lexing.from_channel channel in
List.iter (function x -> Hashtbl.add Lexer_cocci.rule_names x ())
virt;
- let (extra_iso_files, extra_rules, extra_virt) =
+ let (extra_iso_files, extra_rules, extra_virt, extra_metas) =
let rec loop = function
- [] -> ([],[],[])
- | (a,b,c)::rest ->
- let (x,y,z) = loop rest in
- (a::x,b::y,c::z) in
- loop (List.map parse include_files) in
+ [] -> ([],[],[],[])
+ | (a,b,c,d)::rest ->
+ let (x,y,z,zz) = loop rest in
+ (a::x,b::y,c::z,d@zz) in
+ loop (List.map parse_loop include_files) in
let parse_cocci_rule ruletype old_metas
(rule_name, dependencies, iso, dropiso, exists, is_expression) =
+ let dropiso = !Flag_parsing_cocci.disabled_isos @ dropiso in
Ast0.rule_name := rule_name;
Data.inheritable_positions :=
rule_name :: !Data.inheritable_positions;
*)
(if not !Flag.sgrep_mode2 &&
- (any_modif minus_res or any_modif plus_res)
+ (any_modif minus_res or any_modif plus_res) &&
+ not(dependencies = Ast.FailDep)
then Data.inheritable_positions := []);
Check_meta.check_meta rule_name old_metas inherited_metavars
toks;
failwith "Malformed script rule" in
- let parse_script_rule language old_metas deps =
+ let parse_script_rule name language old_metas deps =
let get_tokens = tokens_script_all table file false lexbuf in
(* meta-variables *)
Data.call_in_meta
(function _ ->
get_script_metavars PC.script_meta_main table file lexbuf) in
+ let (metavars,script_metavars) =
+ List.fold_left
+ (function (metavars,script_metavars) ->
+ function
+ (script_var,Some(parent,var)) ->
+ ((script_var,parent,var) :: metavars, script_metavars)
+ | ((Some script_var,None),None) ->
+ (metavars, (name,script_var) :: script_metavars)
+ | _ -> failwith "not possible")
+ ([],[]) metavars in
+ let metavars = List.rev metavars in
+ let script_metavars = List.rev script_metavars in
+
+ Hashtbl.add Data.all_metadecls name
+ (List.map (function x -> Ast.MetaIdDecl(Ast.NONE,x))
+ script_metavars);
+ Hashtbl.add Lexer_cocci.rule_names name ();
+ (*TODOHashtbl.add Lexer_cocci.all_metavariables name script_metavars;*)
+(*
let exists_in old_metas (py,(r,m)) =
+ r = "virtual" or
let test (rr,mr) x =
let (ro,vo) = Ast.get_meta_name x in
ro = rr && vo = mr in
"Script references unknown meta-variable: %s"
(meta2c(snd x))))
metavars;
-
+*)
(* script code *)
let (more, tokens) = get_tokens [PC.TArobArob; PC.TArob] in
let data = collect_script_tokens tokens in
- (more,Ast0.ScriptRule(language, deps, metavars, data),[],tokens) in
+ (more,
+ Ast0.ScriptRule(name, language, deps, metavars,
+ script_metavars, data),
+ [],tokens) in
- let parse_if_script_rule k language =
+ let parse_if_script_rule k name language _ deps =
let get_tokens = tokens_script_all table file false lexbuf in
(* script code *)
let (more, tokens) = get_tokens [PC.TArobArob; PC.TArob] in
let data = collect_script_tokens tokens in
- (more,k (language, data),[],tokens) in
+ (more,k (name, language, deps, data),[],tokens) in
let parse_iscript_rule =
parse_if_script_rule
- (function (language,data) ->
- Ast0.InitialScriptRule(language,data)) in
+ (function (name,language,deps,data) ->
+ Ast0.InitialScriptRule(name,language,deps,data)) in
let parse_fscript_rule =
parse_if_script_rule
- (function (language,data) ->
- Ast0.FinalScriptRule(language,data)) in
+ (function (name,language,deps,data) ->
+ Ast0.FinalScriptRule(name,language,deps,data)) in
+
+ let do_parse_script_rule fn name l old_metas deps =
+ match eval_depend deps virt with
+ Some deps -> fn name l old_metas deps
+ | None -> fn name l old_metas Ast.FailDep in
let parse_rule old_metas starts_with_name =
let rulename =
Some (dep) ->
Data.in_generating := true;
let res =
- parse_cocci_rule Ast.Normal old_metas (s,dep,b,c,d,e) in
+ parse_cocci_rule Ast.Generated old_metas
+ (s,dep,b,c,d,e) in
Data.in_generating := false;
res
| None ->
D.ignore_patch_or_match := true;
Data.in_generating := true;
let res =
- parse_cocci_rule Ast.Normal old_metas
+ parse_cocci_rule Ast.Generated old_metas
(s, Ast.FailDep, b, c, d, e) in
D.ignore_patch_or_match := false;
Data.in_generating := false;
res)
- | Ast.ScriptRulename(l,deps) ->
- (match eval_depend deps virt with
- Some deps -> parse_script_rule l old_metas deps
- | None -> parse_script_rule l old_metas Ast.FailDep)
- | Ast.InitialScriptRulename(l) -> parse_iscript_rule l
- | Ast.FinalScriptRulename(l) -> parse_fscript_rule l
+ | Ast.ScriptRulename(Some s,l,deps) ->
+ do_parse_script_rule parse_script_rule s l old_metas deps
+ | Ast.InitialScriptRulename(Some s,l,deps) ->
+ do_parse_script_rule parse_iscript_rule s l old_metas deps
+ | Ast.FinalScriptRulename(Some s,l,deps) ->
+ do_parse_script_rule parse_fscript_rule s l old_metas deps
| _ -> failwith "Malformed rule name" in
let rec loop old_metas starts_with_name =
let (more, rule, metavars, tokens) =
parse_rule old_metas starts_with_name in
+ let all_metas = metavars @ old_metas in
+
if more then
- rule::
- (loop (metavars @ old_metas) (gen_starts_with_name more tokens))
- else [rule] in
+ let (all_rules,all_metas) =
+ loop all_metas (gen_starts_with_name more tokens) in
+ (rule::all_rules,all_metas)
+ else ([rule],all_metas) in
+
+ let (all_rules,all_metas) =
+ loop extra_metas (x = PC.TArob) in
(List.fold_left
(function prev -> function cur -> Common.union_set cur prev)
iso_files extra_iso_files,
(* included rules first *)
List.fold_left (function prev -> function cur -> cur@prev)
- (loop [] (x = PC.TArob)) (List.rev extra_rules),
- List.fold_left (@) virt extra_virt (*no dups allowed*))
+ all_rules (List.rev extra_rules),
+ List.fold_left (@) virt extra_virt (*no dups allowed*),
+ (all_metas : 'a list))
| _ -> failwith "unexpected code before the first rule\n")
| (false,[(PC.TArobArob,_)]) | (false,[(PC.TArob,_)]) ->
- ([],([] : Ast0.parsed_rule list),[] (*virtual rules*))
+ ([],([] : Ast0.parsed_rule list),[] (*virtual rules*), [] (*all metas*))
| _ -> failwith "unexpected code before the first rule\n" in
- res)
+ res) in
+ parse_loop file
(* parse to ast0 and then convert to ast *)
let process file isofile verbose =
let extra_path = Filename.dirname file in
- let (iso_files, rules, virt) = parse file in
+ let (iso_files, rules, virt, _metas) = parse file in
eval_virt virt;
let std_isos =
match isofile with
let parsed =
List.map
(function
- Ast0.ScriptRule (a,b,c,d) -> [([],Ast.ScriptRule (a,b,c,d))]
- | Ast0.InitialScriptRule (a,b) -> [([],Ast.InitialScriptRule (a,b))]
- | Ast0.FinalScriptRule (a,b) -> [([],Ast.FinalScriptRule (a,b))]
+ Ast0.ScriptRule (a,b,c,d,fv,e) ->
+ [([],Ast.ScriptRule (a,b,c,d,fv,e))]
+ | Ast0.InitialScriptRule(a,b,c,d) ->
+ [([],Ast.InitialScriptRule (a,b,c,d))]
+ | Ast0.FinalScriptRule (a,b,c,d) ->
+ [([],Ast.FinalScriptRule (a,b,c,d))]
| Ast0.CocciRule
((minus, metavarsm,
(iso, dropiso, dependencies, rule_name, exists)),
let minus_ast =
Ast0toast.ast0toast rule_name dependencies dropped_isos
exists minus is_exp ruletype in
-
+
match function_prototypes with
None -> [(extra_meta @ metavars, minus_ast)]
| Some mv_fp -> [(extra_meta @ metavars, minus_ast); mv_fp])
if !Flag_parsing_cocci.show_SP
then List.iter Pretty_print_cocci.unparse code;
- let grep_tokens =
- Common.profile_code "get_constants"
- (fun () -> Get_constants.get_constants code) in (* for grep *)
- let glimpse_tokens2 =
+ let search_tokens =
Common.profile_code "get_glimpse_constants" (* for glimpse *)
(fun () -> Get_constants2.get_constants code neg_pos) in
- (metavars,code,fvs,neg_pos,ua,pos,grep_tokens,glimpse_tokens2)
+ (metavars,code,fvs,neg_pos,ua,pos,search_tokens)
HCoop / bpt / coccinelle.git / blobdiff