Version 1.0.0-rc17 has been released. Some changes are:

[bpt/coccinelle.git] / parsing_cocci / lexer_script.mll

diff --git a/parsing_cocci/lexer_script.mll b/parsing_cocci/lexer_script.mll
index b319ac6..aacfa8f 100644 (file)
--- a/parsing_cocci/lexer_script.mll
+++ b/parsing_cocci/lexer_script.mll
@@ -31,6 +31,8 @@ module D = Data
 module Ast = Ast_cocci
 exception Lexical of string
 let tok = Lexing.lexeme
+let file = ref ""
+let language = ref ""
 let inc_line _ = Lexer_cocci.line := !Lexer_cocci.line + 1
 }
 (* ---------------------------------------------------------------------- *)
@@ -39,11 +41,22 @@ let inc_line _ = Lexer_cocci.line := !Lexer_cocci.line + 1
 let oct = ['0'-'7']
 let hex = ['0'-'9' 'a'-'f' 'A'-'F']
 
-let myrule = [^'\'''"''@''/''\n''\r''\011''\012']+
+let myrule = [^'\'''"''@''/''\n''\r''\011''\012''('')']+
 
 rule token = parse
   | myrule { TScriptData (tok lexbuf) }
-  | ['\n' '\r' '\011' '\012'] { inc_line(); TScriptData (tok lexbuf) }
+  | '(' { TScriptData (tok lexbuf) }
+  | ')' { TScriptData (tok lexbuf) }
+  | ['\n' '\r' '\011' '\012']
+      { inc_line();
+       let text = tok lexbuf in
+       let text =
+         if !language = "ocaml"
+         then
+           Printf.sprintf "%s# %d \"%s\"%s"
+             text !Lexer_cocci.line !file text
+         else text in
+       TScriptData text }
   | "@@" { TArobArob }
   | "@"  { TArob }
   | "/"  { TScriptData (tok lexbuf) }