X-Git-Url: http://git.hcoop.net/bpt/coccinelle.git/blobdiff_plain/5636bb2c2537506718da74f85a2b81a5ff3df16f..17ba07880e1838028b4516ba7a2db2147b3aa1c9:/parsing_cocci/type_cocci.ml

diff --git a/parsing_cocci/type_cocci.ml b/parsing_cocci/type_cocci.ml
index 1e9663d..b628e71 100644
--- a/parsing_cocci/type_cocci.ml
+++ b/parsing_cocci/type_cocci.ml
@@ -1,27 +1,9 @@
 (*
- * Copyright 2005-2010, 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 2005-2010, Ecole des Mines de Nantes, University of Copenhagen
+ * Copyright 2012, INRIA
+ * Julia Lawall, Gilles Muller
+ * Copyright 2010-2011, 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.
  *
@@ -47,6 +29,8 @@ type inherited = bool (* true if inherited *)
 type keep_binding = Unitary (* need no info *)
   | Nonunitary (* need an env entry *) | Saved (* need a witness *)
 
+type meta_name = string * string (*Ast_cocci.meta_name*)
+
 type typeC =
     ConstVol        of const_vol * typeC
   | BaseType        of baseType
@@ -54,16 +38,23 @@ type typeC =
   | Pointer         of typeC
   | FunctionPointer of typeC (* only return type *)
   | Array           of typeC (* drop size info *)
-  | EnumName        of bool (* true if a metaId *) * string
-  | StructUnionName of structUnion * bool (* true if a metaId *) * string
+  | EnumName        of name
+  | StructUnionName of structUnion * name
   | TypeName        of string
-  | MetaType        of (string * string) * keep_binding * inherited
+  | MetaType        of meta_name * keep_binding * inherited
   | Unknown (* for metavariables of type expression *^* *)
 
+and name =
+    NoName
+  | Name of string
+  | MV of meta_name * keep_binding * inherited
+
 and tagged_string = string
 
-and baseType = VoidType | CharType | ShortType | IntType | DoubleType
-| FloatType | LongType | LongLongType | BoolType
+and baseType = VoidType | CharType | ShortType | ShortIntType | IntType
+| DoubleType | LongDoubleType | FloatType
+| LongType | LongIntType | LongLongType | LongLongIntType
+| SizeType | SSizeType | PtrDiffType | BoolType
 
 and structUnion = Struct | Union
 
@@ -83,8 +74,8 @@ let rec type2c = function
   | Pointer(ty) -> (type2c ty) ^ "*"
   | FunctionPointer(ty) -> (type2c ty) ^ "(*)(...)"
   | Array(ty) -> (type2c ty) ^ "[] "
-  | EnumName(mv,name) -> "enum " ^ name ^ " "
-  | StructUnionName(kind,mv,name) -> (structUnion kind) ^ name ^ " "
+  | EnumName(name) -> "enum " ^ (print_name name)
+  | StructUnionName(kind,name) -> (structUnion kind) ^ (print_name name)
   | TypeName(name) -> name ^ " "
   | MetaType((rule,name),keep,inherited) -> name ^ " "
       (*
@@ -99,16 +90,29 @@ let rec type2c = function
       *)
   | Unknown -> "unknown "
 
+and print_name = function
+    NoName -> ""
+  | MV ((_,name),_,_) -> name ^ " "
+  | Name name -> name ^ " "
+
 and baseType = function
     VoidType -> "void "
   | CharType -> "char "
   | ShortType -> "short "
+  | ShortIntType -> "short int "
   | IntType -> "int "
   | DoubleType -> "double "
+  | LongDoubleType -> "long double "
   | FloatType -> "float "
   | LongType -> "long "
+  | LongIntType -> "long int "
   | LongLongType -> "long long "
+  | LongLongIntType -> "long long int "
   | BoolType -> "bool "
+  | SizeType -> "size_t "
+  | SSizeType -> "ssize_t "
+  | PtrDiffType -> "ptrdiff_t "
+
 
 and structUnion = function
     Struct -> "struct "