X-Git-Url: https://git.hcoop.net/bpt/coccinelle.git/blobdiff_plain/0708f913629519b5dbc99f68b6f3ea5ab068230c..1eddfd5052863e93b723b26a1d1266471882f234:/parsing_cocci/parser_cocci_menhir.mli

diff --git a/parsing_cocci/parser_cocci_menhir.mli b/parsing_cocci/parser_cocci_menhir.mli
index c93d0eb..c497adc 100644
--- a/parsing_cocci/parser_cocci_menhir.mli
+++ b/parsing_cocci/parser_cocci_menhir.mli
@@ -8,9 +8,12 @@ type token =
   | Ttypedef of (Data.clt)
   | Tstruct of (Data.clt)
   | Tstatic of (Data.clt)
+  | Tssize_t of (Data.clt)
+  | Tsize_t of (Data.clt)
   | Tsigned of (Data.clt)
   | Tshort of (Data.clt)
   | Tregister of (Data.clt)
+  | Tptrdiff_t of (Data.clt)
   | Tlong of (Data.clt)
   | Tlist
   | Tint of (Data.clt)
@@ -31,27 +34,32 @@ type token =
   | TWhenTrue of (Data.clt)
   | TWhenFalse of (Data.clt)
   | TWhen of (Data.clt)
+  | TVirtual
   | TUsing
+  | TUnderscore
   | TTypedef
   | TTypeId of (string * Data.clt)
   | TType
+  | TTildeExclEq of (Data.clt)
+  | TTildeEq of (Data.clt)
   | TTilde of (Data.clt)
   | TSwitch of (Data.clt)
+  | TSub of (Data.clt)
   | TString of (string * Data.clt)
   | TStrict of (Data.clt)
   | TStatement
   | TSizeof of (Data.clt)
-  | TShOp of (Ast_cocci.arithOp * Data.clt)
+  | TShROp of (Ast_cocci.arithOp * Data.clt)
+  | TShLOp of (Ast_cocci.arithOp * Data.clt)
   | TScriptData of (string)
   | TScript
   | TRuleName of (string)
   | TRightIso
-  | TReverse
   | TReturn of (Data.clt)
   | TPure
   | TPtrOp of (Data.clt)
   | TPtVirg of (Data.clt)
-  | TPragma of (string * Data.clt)
+  | TPragma of (Ast_cocci.added_string * Data.clt)
   | TPosition
   | TPosAny
   | TPlusFile of (string * Data.clt)
@@ -85,18 +93,20 @@ 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)
   | TMetaInit of (Parse_aux.info)
-  | TMetaIdExp of (Parse_aux.typed_info)
+  | TMetaIdExp of (Parse_aux.typed_expinfo)
   | TMetaId of (Parse_aux.idinfo)
   | TMetaFunc of (Parse_aux.idinfo)
+  | TMetaField of (Parse_aux.info)
   | 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)
+  | TMetaDecl of (Parse_aux.info)
+  | TMetaConst of (Parse_aux.typed_expinfo)
   | TMPtVirg
   | TLogOp of (Ast_cocci.logicalOp * Data.clt)
   | TLocal
@@ -105,6 +115,7 @@ type token =
   | TIterator
   | TIsoType
   | TIsoTopLevel
+  | TIsoToTestExpression
   | TIsoTestExpression
   | TIsoStatement
   | TIsoExpression
@@ -113,6 +124,7 @@ type token =
   | TIso
   | TInvalid
   | TInt of (string * Data.clt)
+  | TInitialize
   | TInitialiser
   | TIncludeNL of (string * Data.clt)
   | TIncludeL of (string * Data.clt)
@@ -129,6 +141,8 @@ type token =
   | TForall
   | TFor of (Data.clt)
   | TFloat of (string * Data.clt)
+  | TFinalize
+  | TField
   | TExtends
   | TExpression
   | TExists
@@ -144,12 +158,14 @@ 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
+  | TDeclaration
   | TDec of (Data.clt)
+  | TCppConcatOp
   | TContinue of (Data.clt)
   | TContext
   | TConstant
@@ -173,7 +189,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 option (*string*) * string option (*ast*)) * (Ast_cocci.meta_name * Ast_cocci.metavar) option)
 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)
@@ -185,4 +201,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