emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed merge conflict

Browse source
This commit is contained in:
Meredith L. Patterson 2012-05-12 21:27:10 +01:00
commit 0e69b8e2dd
6 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/hammer.h
View file

@ -19,7 +19,7 @@
#define HAMMER_HAMMER__H
#include <glib.h>
#include <stdint.h>
#include "allocator.h"
/* The state of the parser.
*
* Members:
@ -48,6 +48,7 @@ typedef struct input_stream {
typedef struct parse_state {
GHashTable *cache;
input_stream_t input_stream;
arena_t arena;
} parse_state_t;
typedef enum token_type {