X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=lexer.h;h=bc9d297cb4f6879080de01b754620cdaedae7e47;hb=599f3e2bf39b65bebc51971f5b01a50fc41410b3;hp=6ef6568d3c41ca6eae0c359f8f01b034fa7caa3e;hpb=f972547895d0931b7d80a5e5f78d16b79230833b;p=cparser

diff --git a/lexer.h b/lexer.h
index 6ef6568..bc9d297 100644
--- a/lexer.h
+++ b/lexer.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
@@ -22,6 +22,7 @@
 
 #include "symbol_table_t.h"
 #include "token_t.h"
+#include "input.h"
 
 extern token_t lexer_token;
 extern bool    allow_dollar_in_symbol;
@@ -34,14 +35,9 @@ void lexer_next_preprocessing_token(void);
 void init_lexer(void);
 void exit_lexer(void);
 
-void select_input_encoding(char const* encoding);
+void lexer_switch_input(input_t *input, const char *input_name);
 
-void lexer_open_stream(FILE *stream, const char *input_name);
-void lexer_open_buffer(const char *buffer, size_t len, const char *input_name);
-
-string_t      concat_strings(           const string_t      *s1, const string_t      *s2);
-wide_string_t concat_string_wide_string(const string_t      *s1, const wide_string_t *s2);
-wide_string_t concat_wide_strings(      const wide_string_t *s1, const wide_string_t *s2);
-wide_string_t concat_wide_string_string(const wide_string_t *s1, const string_t      *s2);
+string_t concat_strings(const string_t *s1, const string_t *s2);
+string_t make_string(const char *str);
 
 #endif