projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ooops, streq is the right function here.
[cparser]
/
token_t.h
diff --git
a/token_t.h
b/token_t.h
index
87077e8
..
5b40ee3
100644
(file)
--- a/
token_t.h
+++ b/
token_t.h
@@
-1,6
+1,6
@@
/*
* This file is part of cparser.
/*
* This file is part of cparser.
- * Copyright (C) 2007-200
8
Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-200
9
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
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-27,9
+27,9
@@
#include "type.h"
typedef enum token_type_t {
#include "type.h"
typedef enum token_type_t {
+ T_ERROR = -1,
T_NULL = 0,
T_NULL = 0,
- T_EOF = -1,
- T_ERROR = -2,
+ T_EOF = '\x04', // EOT
#define T(mode,x,str,val) T_##x val,
#define TS(x,str,val) T_##x val,
#include "tokens.inc"
#define T(mode,x,str,val) T_##x val,
#define TS(x,str,val) T_##x val,
#include "tokens.inc"
@@
-53,22
+53,17
@@
typedef enum preprocessor_token_type_t {
typedef struct source_position_t source_position_t;
struct source_position_t {
const char *input_name;
typedef struct source_position_t source_position_t;
struct source_position_t {
const char *input_name;
- unsigned linenr;
+ unsigned lineno;
+ unsigned colno;
};
/* position used for "builtin" declarations/types */
extern const source_position_t builtin_source_position;
typedef struct {
};
/* position used for "builtin" declarations/types */
extern const source_position_t builtin_source_position;
typedef struct {
- int type;
- union {
- symbol_t *symbol;
- long long intvalue;
- long double floatvalue;
- string_t string;
- wide_string_t wide_string;
- } v;
- type_t *datatype;
+ int type;
+ symbol_t *symbol; /**< contains identifier. Contains number suffix for numbers */
+ string_t literal; /**< string value/literal value */
source_position_t source_position;
} token_t;
source_position_t source_position;
} token_t;
@@
-77,7
+72,9
@@
void exit_tokens(void);
void print_token_type(FILE *out, token_type_t token_type);
void print_token(FILE *out, const token_t *token);
void print_token_type(FILE *out, token_type_t token_type);
void print_token(FILE *out, const token_t *token);
-void print_pp_token_type(FILE *out, preprocessor_token_type_t type);
+symbol_t *get_token_symbol(const token_t *token);
+
+void print_pp_token_type(FILE *out, int type);
void print_pp_token(FILE *out, const token_t *token);
#endif
void print_pp_token(FILE *out, const token_t *token);
#endif