Release coccinelle-0.2.2-rc1

[bpt/coccinelle.git] / parsing_cocci / parser_cocci_menhir.mli

diff --git a/parsing_cocci/parser_cocci_menhir.mli b/parsing_cocci/parser_cocci_menhir.mli
index d0c52e8..85287f3 100644 (file)
--- a/parsing_cocci/parser_cocci_menhir.mli
+++ b/parsing_cocci/parser_cocci_menhir.mli
@@ -17,6 +17,7 @@ type token =
   | Tinline of (Data.clt)
   | Tfloat of (Data.clt)
   | Textern of (Data.clt)
+  | Tenum of (Data.clt)
   | Tdouble of (Data.clt)
   | Tconst of (Data.clt)
   | Tchar of (Data.clt)
@@ -30,10 +31,13 @@ type token =
   | TWhenTrue of (Data.clt)
   | TWhenFalse of (Data.clt)
   | TWhen of (Data.clt)
+  | TVirtual
   | TUsing
   | TTypedef
   | TTypeId of (string * Data.clt)
   | TType
+  | TTildeExclEq of (Data.clt)
+  | TTildeEq of (Data.clt)
   | TTilde of (Data.clt)
   | TSwitch of (Data.clt)
   | TString of (string * Data.clt)
@@ -45,12 +49,11 @@ type token =
   | TScript
   | TRuleName of (string)
   | TRightIso
-  | TReverse
   | TReturn of (Data.clt)
   | TPure
   | TPtrOp of (Data.clt)
   | TPtVirg of (Data.clt)
-  | TPragma of (string)
+  | TPragma of (Ast_cocci.added_string * Data.clt)
   | TPosition
   | TPosAny
   | TPlusFile of (string * Data.clt)
@@ -84,17 +87,18 @@ type token =
   | TMetaPos of (Parse_aux.pos_info)
   | TMetaParamList of (Parse_aux.list_info)
   | TMetaParam of (Parse_aux.info)
-  | TMetaLocalIdExp of (Parse_aux.typed_info)
+  | TMetaLocalIdExp of (Parse_aux.typed_expinfo)
   | TMetaLocalFunc of (Parse_aux.idinfo)
   | TMetaIterator of (Parse_aux.idinfo)
-  | TMetaIdExp of (Parse_aux.typed_info)
+  | TMetaInit of (Parse_aux.info)
+  | TMetaIdExp of (Parse_aux.typed_expinfo)
   | TMetaId of (Parse_aux.idinfo)
   | TMetaFunc of (Parse_aux.idinfo)
   | TMetaExpList of (Parse_aux.list_info)
-  | TMetaExp of (Parse_aux.typed_info)
+  | TMetaExp of (Parse_aux.typed_expinfo)
   | TMetaErr of (Parse_aux.expinfo)
   | TMetaDeclarer of (Parse_aux.idinfo)
-  | TMetaConst of (Parse_aux.typed_info)
+  | TMetaConst of (Parse_aux.typed_expinfo)
   | TMPtVirg
   | TLogOp of (Ast_cocci.logicalOp * Data.clt)
   | TLocal
@@ -103,6 +107,7 @@ type token =
   | TIterator
   | TIsoType
   | TIsoTopLevel
+  | TIsoToTestExpression
   | TIsoTestExpression
   | TIsoStatement
   | TIsoExpression
@@ -111,6 +116,8 @@ type token =
   | TIso
   | TInvalid
   | TInt of (string * Data.clt)
+  | TInitialize
+  | TInitialiser
   | TIncludeNL of (string * Data.clt)
   | TIncludeL of (string * Data.clt)
   | TInc of (Data.clt)
@@ -119,12 +126,14 @@ type token =
   | TIdent of (string * Data.clt)
   | TIdExpression
   | TGoto of (Data.clt)
+  | TGenerated
   | TFunction
   | TFunDecl of (Data.clt)
   | TFresh
   | TForall
   | TFor of (Data.clt)
   | TFloat of (string * Data.clt)
+  | TFinalize
   | TExtends
   | TExpression
   | TExists
@@ -140,12 +149,13 @@ type token =
   | TDmOp of (Ast_cocci.arithOp * Data.clt)
   | TDisable
   | TDepends
-  | TDefineParam of (Data.clt * token * int)
+  | TDefineParam of (Data.clt * token * int * int)
   | TDefine of (Data.clt * token)
   | TDefault of (Data.clt)
   | TDeclarerId of (string * Data.clt)
   | TDeclarer
   | TDec of (Data.clt)
+  | TCppConcatOp
   | TContinue of (Data.clt)
   | TContext
   | TConstant
@@ -169,7 +179,7 @@ type token =
   | EOF
 
 
-val script_meta_main: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (string * (string * string))
+val script_meta_main: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (string * Ast_cocci.meta_name)
 val rule_name: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (Ast_cocci.rulename)
 val reinit: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (unit)
 val plus_main: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (Ast0_cocci.rule)
@@ -181,4 +191,4 @@ val meta_main: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> ((Ast_cocci.metavar,
 val iso_rule_name: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (Ast_cocci.rulename)
 val iso_meta_main: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> ((Ast_cocci.metavar,Ast_cocci.metavar) Common.either list)
 val iso_main: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (Ast0_cocci.anything list list)
-val include_main: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> ((string,string) Common.either list)
\ No newline at end of file
+val include_main: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (Data.incl_iso list)
\ No newline at end of file