fix cases where compoundlits are constant/get an entity

[cparser] / string_rep.h

diff --git a/string_rep.h b/string_rep.h
index 4b64fe1..ce4ca3e 100644 (file)
--- a/string_rep.h
+++ b/string_rep.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,18 +20,24 @@
 #ifndef STRING_REP_H
 #define STRING_REP_H
 
-#include <wchar.h>
+#include <stdlib.h>
+#include "unicode.h"
 
-typedef wchar_t wchar_rep_t;
+enum string_encoding_t {
+       STRING_ENCODING_CHAR,
+       STRING_ENCODING_CHAR16,
+       STRING_ENCODING_CHAR32,
+       STRING_ENCODING_UTF8,
+       STRING_ENCODING_WIDE
+};
+typedef enum string_encoding_t string_encoding_t;
 
 typedef struct string_t {
-       const char *begin;
-       size_t      size;
+       char const       *begin; /**< UTF-8 encoded string, the last character is guaranteed to be \0. */
+       size_t            size;  /**< size of string in bytes (not characters), without terminating \0. */
+       string_encoding_t encoding;
 } string_t;
 
-typedef struct wide_string_t {
-       const wchar_rep_t *begin;
-       size_t             size;
-} wide_string_t;
+size_t get_string_len(string_t const *str);
 
 #endif