/*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2013
* Dale Weiler
* Wolfgang Bumiller
*
#endif
#define GMQCC_VERSION_MAJOR 0
-#define GMQCC_VERSION_MINOR 2
+#define GMQCC_VERSION_MINOR 3
#define GMQCC_VERSION_PATCH 0
#define GMQCC_VERSION_BUILD(J,N,P) (((J)<<16)|((N)<<8)|(P))
#define GMQCC_VERSION \
GMQCC_VERSION_BUILD(GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH)
+#ifndef GMQCC_GITINFO
+# define GMQCC_GITINFO "(no git info)"
+#endif
+
/*
- * We cannoy rely on C99 at all, since compilers like MSVC
+ * We cannot rely on C99 at all, since compilers like MSVC
* simply don't support it. We define our own boolean type
* as a result (since we cannot include <stdbool.h>). For
* compilers that are in 1999 mode (C99 compliant) we can use
# endif /* !__STDC_VERSION__ */
#endif /* !__cplusplus */
-
-
/*
* Of some functions which are generated we want to make sure
* that the result isn't ignored. To find such function calls,
* just plain textual subsitution.
*/
#ifdef _MSC_VER
-# define snprintf(X, Y, Z, ...) _snprintf(X, Y, Z, __VA_ARGS__)
+# define snprintf(X, Y, Z, ...) _snprintf(X, Y, Z, __VA_ARGS__)
/* strtof doesn't exist -> strtod does though :) */
-# define strtof(X, Y) (float)(strtod(X, Y))
+# define strtof(X, Y) (float)(strtod(X, Y))
#endif
/*
# if defined (__FreeBSD__) || defined (__OpenBSD__)
# include <sys/endian.h>
# elif defined (BSD) && (BSD >= 199103) || defined (__DJGPP__) || defined (__CYGWIN32__)
-# include <machine/endiane.h>
+# include <machine/endian.h>
# elif defined (__APPLE__)
# if defined (__BIG_ENDIAN__) && !defined(BIG_ENDIAN)
# define BIG_ENDIAN
/*===================================================================*/
/*=========================== util.c ================================*/
/*===================================================================*/
-void *util_memory_a (size_t, unsigned int, const char *);
-void util_memory_d (void *, unsigned int, const char *);
-void *util_memory_r (void *, size_t, unsigned int, const char *);
+void *util_memory_a (size_t, /*****/ unsigned int, const char *);
+void *util_memory_r (void *, size_t, unsigned int, const char *);
+void util_memory_d (void *);
void util_meminfo ();
bool util_filexists (const char *);
uint16_t util_crc16(uint16_t crc, const char *data, size_t len);
+void util_seed(uint32_t);
+uint32_t util_rand();
+
+int util_vasprintf(char **ret, const char *fmt, va_list);
+int util_asprintf (char **ret, const char *fmt, ...);
+
+
#ifdef NOTRACK
# define mem_a(x) malloc (x)
# define mem_d(x) free ((void*)x)
# define mem_r(x, n) realloc((void*)x, n)
#else
# define mem_a(x) util_memory_a((x), __LINE__, __FILE__)
-# define mem_d(x) util_memory_d((void*)(x), __LINE__, __FILE__)
+# define mem_d(x) util_memory_d((void*)(x))
# define mem_r(x, n) util_memory_r((void*)(x), (n), __LINE__, __FILE__)
#endif
/* exposed interface */
#define vec_meta(A) (((vector_t*)(A)) - 1)
#define vec_free(A) ((A) ? (mem_d((void*)vec_meta(A)), (A) = NULL) : 0)
-#define vec_push(A,V) (GMQCC_VEC_WILLGROW(A,1), (A)[vec_meta(A)->used++] = V)
+#define vec_push(A,V) (GMQCC_VEC_WILLGROW((A),1), (A)[vec_meta(A)->used++] = (V))
#define vec_size(A) ((A) ? vec_meta(A)->used : 0)
-#define vec_add(A,N) (GMQCC_VEC_WILLGROW(A,N), vec_meta(A)->used += (N), &(A)[vec_meta(A)->used-(N)])
+#define vec_add(A,N) (GMQCC_VEC_WILLGROW((A),(N)), vec_meta(A)->used += (N), &(A)[vec_meta(A)->used-(N)])
#define vec_last(A) ((A)[vec_meta(A)->used - 1])
#define vec_pop(A) (vec_meta(A)->used -= 1)
#define vec_shrinkto(A,N) (vec_meta(A)->used = (N))
#define vec_shrinkby(A,N) (vec_meta(A)->used -= (N))
-#define vec_append(A,N,S) memcpy(vec_add(A, N), S, N * sizeof(*S))
-#define vec_upload(X,Y,S) memcpy(vec_add(X, S * sizeof(*Y)), Y, S * sizeof(*Y))
-#define vec_remove(A,I,N) memmove((char*)A+I*sizeof(*A),(char*)A+(I+N)*sizeof(*A),sizeof(*A)*(vec_meta(A)->used-I-N)),vec_meta(A)->used-=(N)
+#define vec_append(A,N,S) memcpy(vec_add((A), (N)), (S), (N) * sizeof(*(S)))
+#define vec_upload(X,Y,S) memcpy(vec_add((X), (S) * sizeof(*(Y))), (Y), (S) * sizeof(*(Y)))
+#define vec_remove(A,I,N) memmove((A)+(I),(A)+((I)+(N)),sizeof(*(A))*(vec_meta(A)->used-(I)-(N))),vec_meta(A)->used-=(N)
typedef struct hash_table_t {
size_t size;
struct hash_node_t **table;
} hash_table_t, *ht;
+typedef struct hash_set_t {
+ size_t bits;
+ size_t mask;
+ size_t capacity;
+ size_t *items;
+ size_t total;
+} hash_set_t, *hs;
+
/*
* hashtable implementation:
*
void *util_htget (hash_table_t *ht, const char *key);
void *util_htgeth(hash_table_t *ht, const char *key, size_t hash);
+
+/*
+ * hashset implementation:
+ * This was designed for pointers: you manage the life of the object yourself
+ * if you do use this for non-pointers please be warned that the object may not
+ * be valid if the duration of it exceeds (i.e on stack). So you need to allocate
+ * yourself, or put those in global scope to ensure duration is for the whole
+ * runtime.
+ *
+ * util_hsnew() -- to make a new hashset
+ * util_hsadd(set, key) -- to add something in the set
+ * util_hshas(set, key) -- to check if something is in the set
+ * util_hsrem(set, key) -- to remove something in the set
+ * util_hsdel(set) -- to delete the set
+ *
+ * example of use:
+ *
+ * hs foo = util_hsnew();
+ * char *bar = "hello blub\n";
+ * char *baz = "hello dale\n";
+ *
+ * util_hsadd(foo, bar);
+ * util_hsadd(foo, baz);
+ * util_hsrem(foo, baz);
+ *
+ * printf("bar %d | baz %d\n",
+ * util_hshas(foo, bar),
+ * util_hshad(foo, baz)
+ * );
+ *
+ * util_hsdel(foo);
+ */
+
+hash_set_t *util_hsnew(void);
+int util_hsadd(hash_set_t *, void *);
+int util_hshas(hash_set_t *, void *);
+int util_hsrem(hash_set_t *, void *);
+void util_hsdel(hash_set_t *);
+
/*===================================================================*/
/*============================ file.c ===============================*/
/*===================================================================*/
GMQCC_INLINE int file_getc (FILE *);
GMQCC_INLINE int file_printf (FILE *, const char *, ...);
GMQCC_INLINE int file_puts (FILE *, const char *);
+GMQCC_INLINE int file_putc (FILE *, int);
GMQCC_INLINE int file_seek (FILE *, long int, int);
GMQCC_INLINE size_t file_read (void *, size_t, size_t, FILE *);
/*NOINLINE*/ int file_getline(char **, size_t *, FILE *);
+/*===================================================================*/
+/*=========================== correct.c =============================*/
+/*===================================================================*/
+void correct_del(ht, size_t **);
+void correct_add(ht, size_t ***, const char *);
+char *correct_str(ht, /********/ const char *);
+
/*===================================================================*/
/*=========================== code.c ================================*/
/*===================================================================*/
TYPE_UNION ,
TYPE_ARRAY ,
+ TYPE_NIL , /* it's its own type / untyped */
+ TYPE_NOEXPR , /* simply invalid in expressions */
+
TYPE_COUNT
};
bool code_write (const char *filename, const char *lno);
void code_init ();
uint32_t code_genstring (const char *string);
-uint32_t code_cachedstring(const char *string);
qcint code_alloc_field (size_t qcsize);
/* this function is used to keep statements and linenumbers together */
/* error/warning interface */
extern size_t compile_errors;
+extern size_t compile_Werrors;
extern size_t compile_warnings;
void /********/ compile_error (lex_ctx ctx, /*LVL_ERROR*/ const char *msg, ...);
void /********/ vcompile_error (lex_ctx ctx, /*LVL_ERROR*/ const char *msg, va_list ap);
bool GMQCC_WARN compile_warning (lex_ctx ctx, int warntype, const char *fmt, ...);
bool GMQCC_WARN vcompile_warning(lex_ctx ctx, int warntype, const char *fmt, va_list ap);
+void compile_show_werrors();
/*===================================================================*/
/*========================= assembler.c =============================*/
/*===================================================================*/
/*====================== ftepp.c commandline ========================*/
/*===================================================================*/
+struct lex_file_s;
+typedef struct {
+ const char *name;
+ char *(*func)(struct lex_file_s *);
+} ftepp_predef_t;
+
+/*
+ * line, file, counter, counter_last, random, random_last, date, time
+ * increment when items are added
+ */
+#define FTEPP_PREDEF_COUNT 8
+
bool ftepp_init ();
bool ftepp_preprocess_file (const char *filename);
bool ftepp_preprocess_string(const char *name, const char *str);
void ftepp_add_define (const char *source, const char *name);
void ftepp_add_macro (const char *name, const char *value);
+extern const ftepp_predef_t ftepp_predefs[FTEPP_PREDEF_COUNT];
+
/*===================================================================*/
/*======================= main.c commandline ========================*/
/*===================================================================*/
-#if 0
+#if 1
/* Helpers to allow for a whole lot of flags. Otherwise we'd limit
* to 32 or 64 -f options...
*/
typedef struct {
size_t idx; /* index into an array of 32 bit words */
- uint8_t bit; /* index _into_ the 32 bit word, thus just uint8 */
+ uint8_t bit; /* bit index for the 8 bit group idx points to */
} longbit;
#define LONGBIT(bit) { ((bit)/32), ((bit)%32) }
+#define LONGBIT_SET(B, I) ((B).idx = (I)/32, (B).bit = ((I)%32))
#else
typedef uint32_t longbit;
#define LONGBIT(bit) (bit)
+#define LONGBIT_SET(B, I) ((B) = (I))
#endif
+/*===================================================================*/
+/*=========================== utf8lib.c =============================*/
+/*===================================================================*/
+typedef uint32_t uchar_t;
+
+bool u8_analyze (const char *_s, size_t *_start, size_t *_len, uchar_t *_ch, size_t _maxlen);
+size_t u8_strlen (const char*);
+size_t u8_strnlen (const char*, size_t);
+uchar_t u8_getchar (const char*, const char**);
+uchar_t u8_getnchar(const char*, const char**, size_t);
+int u8_fromchar(uchar_t w, char *to, size_t maxlen);
+
/*===================================================================*/
/*============================= opts.c ==============================*/
/*===================================================================*/
typedef struct {
uint32_t O; /* -Ox */
const char *output; /* -o file */
+ bool quiet; /* -q --quiet */
bool g; /* -g */
opts_std_t standard; /* -std= */
bool debug; /* -debug */