]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
Extract knowledge about languages and extensions into a separate file
authorJoel Rosdahl <joel@rosdahl.net>
Sun, 29 Aug 2010 08:50:38 +0000 (10:50 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Sun, 29 Aug 2010 08:50:44 +0000 (10:50 +0200)
Makefile.in
ccache.c
ccache.h
dev.mk.in
language.c [new file with mode: 0644]
language.h [new file with mode: 0644]

index 640f8e319a23b1901fa6120b7cd35c21d4124774..9f4a910869d41679c95fa3424d59beb80bf42e41 100644 (file)
@@ -22,7 +22,7 @@ base_sources = \
     ccache.c mdfour.c hash.c execute.c util.c args.c stats.c version.c \
     cleanup.c snprintf.c unify.c manifest.c hashtable.c hashtable_itr.c \
     murmurhashneutral2.c hashutil.c getopt_long.c exitfn.c lockfile.c \
-    counters.c
+    counters.c language.c
 base_objs = $(base_sources:.c=.o)
 
 ccache_sources = main.c $(base_sources)
index d1f687b1a760d39e0011b69e3931bef094929f9d..3bc717b207b27ee936e1a940b88f7eb28ab01a12 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -28,6 +28,7 @@
 #include "hashtable.h"
 #include "hashtable_itr.h"
 #include "hashutil.h"
+#include "language.h"
 #include "manifest.h"
 
 #include <sys/types.h>
@@ -195,72 +196,6 @@ static int output_is_precompiled_header = 0;
 /* How long (in microseconds) to wait before breaking a stale lock. */
 unsigned lock_staleness_limit = 2000000;
 
-/*
- * Supported file extensions and corresponding languages (as in parameter to
- * the -x option).
- */
-static const struct {
-       const char *extension;
-       const char *language;
-} extensions[] = {
-       {".c",   "c"},
-       {".C",   "c++"},
-       {".cc",  "c++"},
-       {".CC",  "c++"},
-       {".cp",  "c++"},
-       {".CP",  "c++"},
-       {".cpp", "c++"},
-       {".CPP", "c++"},
-       {".cxx", "c++"},
-       {".CXX", "c++"},
-       {".c++", "c++"},
-       {".C++", "c++"},
-       {".m",   "objective-c"},
-       {".M",   "objective-c++"},
-       {".mm",  "objective-c++"},
-       /* Preprocessed: */
-       {".i",   "cpp-output"},
-       {".ii",  "c++-cpp-output"},
-       {".mi",  "objc-cpp-output"},
-       {".mii", "objc++-cpp-output"},
-       /* Header file (for precompilation): */
-       {".h",   "c-header"},
-       {".H",   "c++-header"},
-       {".h++", "c++-header"},
-       {".H++", "c++-header"},
-       {".hh",  "c++-header"},
-       {".HH",  "c++-header"},
-       {".hp",  "c++-header"},
-       {".HP",  "c++-header"},
-       {".hpp", "c++-header"},
-       {".HPP", "c++-header"},
-       {".hxx", "c++-header"},
-       {".HXX", "c++-header"},
-       {".tcc", "c++-header"},
-       {".TCC", "c++-header"},
-       {NULL,  NULL}};
-
-/*
- * Supported languages and corresponding preprocessed languages.
- */
-static const struct {
-       const char *language;
-       const char *p_language;
-} languages[] = {
-       {"c",                    "cpp-output"},
-       {"cpp-output",           "cpp-output"},
-       {"c-header",             "cpp-output"},
-       {"c++",                  "c++-cpp-output"},
-       {"c++-cpp-output",       "c++-cpp-output"},
-       {"c++-header",           "c++-cpp-output"},
-       {"objective-c",          "objc-cpp-output"},
-       {"objective-c-header",   "objc-cpp-output"},
-       {"objc-cpp-output",      "objc-cpp-output"},
-       {"objective-c++",        "objc++-cpp-output"},
-       {"objc++-cpp-output",    "objc++-cpp-output"},
-       {"objective-c++-header", "objc++-cpp-output"},
-       {NULL,  NULL}};
-
 enum fromcache_call_mode {
        FROMCACHE_DIRECT_MODE,
        FROMCACHE_CPP_MODE,
@@ -543,76 +478,6 @@ process_preprocessed_file(struct mdfour *hash, const char *path)
        return 1;
 }
 
-/*
- * Guess the language of a file based on its extension. Returns NULL if the
- * extension is unknown.
- */
-static const char *
-language_for_file(const char *fname)
-{
-       int i;
-       const char *p;
-
-       p = get_extension(fname);
-       for (i = 0; extensions[i].extension; i++) {
-               if (str_eq(p, extensions[i].extension)) {
-                       return extensions[i].language;
-               }
-       }
-       return NULL;
-}
-
-/*
- * Return the preprocessed language for a given language, or NULL if unknown.
- */
-static const char *
-p_language_for_language(const char *language)
-{
-       int i;
-
-       if (!language) {
-               return NULL;
-       }
-       for (i = 0; languages[i].language; ++i) {
-               if (str_eq(language, languages[i].language)) {
-                       return languages[i].p_language;
-               }
-       }
-       return NULL;
-}
-
-/*
- * Return the default file extension (including dot) for a language, or NULL if
- * unknown.
- */
-static const char *
-extension_for_language(const char *language)
-{
-       int i;
-
-       if (!language) {
-               return NULL;
-       }
-       for (i = 0; extensions[i].extension; i++) {
-               if (str_eq(language, extensions[i].language)) {
-                       return extensions[i].extension;
-               }
-       }
-       return NULL;
-}
-
-static int
-language_is_supported(const char *language)
-{
-       return p_language_for_language(language) != NULL;
-}
-
-static int
-language_is_preprocessed(const char *language)
-{
-       return str_eq(language, p_language_for_language(language));
-}
-
 /* run the real compiler and put the result in cache */
 static void
 to_cache(struct args *args)
index 4455b27c23ecfee31484724e1e29415343fe020a..0272a52adcb2ed872b80d9e4eaaa4526d559873e 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -11,6 +11,7 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 
 #ifdef __GNUC__
 #define ATTR_FORMAT(x, y, z) __attribute__((format (x, y, z)))
index b634e512e7b7ea2e173ee0c65f2643ff45f59e35..4f0af54d437adb50fd7b7eac241cbcc1299560a9 100644 (file)
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -23,6 +23,7 @@ built_dist_files = $(generated_docs)
 headers = \
     ccache.h hashtable.h hashtable_itr.h hashtable_private.h hashutil.h \
     manifest.h mdfour.h counters.h murmurhashneutral2.h getopt_long.h \
+    language.h \
     test/framework.h test/suites.h test/util.h
 
 files_to_clean += *.tar.bz2 *.tar.gz *.xml .deps/*
diff --git a/language.c b/language.c
new file mode 100644 (file)
index 0000000..fd3bb01
--- /dev/null
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2010 Joel Rosdahl
+ *
+ * This program 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; either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * This program 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
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "ccache.h"
+
+/*
+ * Supported file extensions and corresponding languages (as in parameter to
+ * the -x option).
+ */
+static const struct {
+       const char *extension;
+       const char *language;
+} extensions[] = {
+       {".c",   "c"},
+       {".C",   "c++"},
+       {".cc",  "c++"},
+       {".CC",  "c++"},
+       {".cp",  "c++"},
+       {".CP",  "c++"},
+       {".cpp", "c++"},
+       {".CPP", "c++"},
+       {".cxx", "c++"},
+       {".CXX", "c++"},
+       {".c++", "c++"},
+       {".C++", "c++"},
+       {".m",   "objective-c"},
+       {".M",   "objective-c++"},
+       {".mm",  "objective-c++"},
+       /* Preprocessed: */
+       {".i",   "cpp-output"},
+       {".ii",  "c++-cpp-output"},
+       {".mi",  "objc-cpp-output"},
+       {".mii", "objc++-cpp-output"},
+       /* Header file (for precompilation): */
+       {".h",   "c-header"},
+       {".H",   "c++-header"},
+       {".h++", "c++-header"},
+       {".H++", "c++-header"},
+       {".hh",  "c++-header"},
+       {".HH",  "c++-header"},
+       {".hp",  "c++-header"},
+       {".HP",  "c++-header"},
+       {".hpp", "c++-header"},
+       {".HPP", "c++-header"},
+       {".hxx", "c++-header"},
+       {".HXX", "c++-header"},
+       {".tcc", "c++-header"},
+       {".TCC", "c++-header"},
+       {NULL,  NULL}};
+
+/*
+ * Supported languages and corresponding preprocessed languages.
+ */
+static const struct {
+       const char *language;
+       const char *p_language;
+} languages[] = {
+       {"c",                    "cpp-output"},
+       {"cpp-output",           "cpp-output"},
+       {"c-header",             "cpp-output"},
+       {"c++",                  "c++-cpp-output"},
+       {"c++-cpp-output",       "c++-cpp-output"},
+       {"c++-header",           "c++-cpp-output"},
+       {"objective-c",          "objc-cpp-output"},
+       {"objective-c-header",   "objc-cpp-output"},
+       {"objc-cpp-output",      "objc-cpp-output"},
+       {"objective-c++",        "objc++-cpp-output"},
+       {"objc++-cpp-output",    "objc++-cpp-output"},
+       {"objective-c++-header", "objc++-cpp-output"},
+       {NULL,  NULL}};
+
+/*
+ * Guess the language of a file based on its extension. Returns NULL if the
+ * extension is unknown.
+ */
+const char *
+language_for_file(const char *fname)
+{
+       int i;
+       const char *p;
+
+       p = get_extension(fname);
+       for (i = 0; extensions[i].extension; i++) {
+               if (str_eq(p, extensions[i].extension)) {
+                       return extensions[i].language;
+               }
+       }
+       return NULL;
+}
+
+/*
+ * Return the preprocessed language for a given language, or NULL if unknown.
+ */
+const char *
+p_language_for_language(const char *language)
+{
+       int i;
+
+       if (!language) {
+               return NULL;
+       }
+       for (i = 0; languages[i].language; ++i) {
+               if (str_eq(language, languages[i].language)) {
+                       return languages[i].p_language;
+               }
+       }
+       return NULL;
+}
+
+/*
+ * Return the default file extension (including dot) for a language, or NULL if
+ * unknown.
+ */
+const char *
+extension_for_language(const char *language)
+{
+       int i;
+
+       if (!language) {
+               return NULL;
+       }
+       for (i = 0; extensions[i].extension; i++) {
+               if (str_eq(language, extensions[i].language)) {
+                       return extensions[i].extension;
+               }
+       }
+       return NULL;
+}
+
+int
+language_is_supported(const char *language)
+{
+       return p_language_for_language(language) != NULL;
+}
+
+int
+language_is_preprocessed(const char *language)
+{
+       return str_eq(language, p_language_for_language(language));
+}
diff --git a/language.h b/language.h
new file mode 100644 (file)
index 0000000..8d6c6ba
--- /dev/null
@@ -0,0 +1,10 @@
+#ifndef CCACHE_LANGUAGE_H
+#define CCACHE_LANGUAGE_H
+
+const char *language_for_file(const char *fname);
+const char *p_language_for_language(const char *language);
+const char *extension_for_language(const char *language);
+int language_is_supported(const char *language);
+int language_is_preprocessed(const char *language);
+
+#endif /* CCACHE_LANGUAGE_H */