X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=gmqcc.h;h=3a47e74b8e87b532ddced13d6aedd7efbc1264dc;hp=358b03c8fb243d8515f42e0fdd50ea83102de66d;hb=3f8f2b3f48cc02cb542b256f26da53220a28e78b;hpb=6951f3dfcc4981745a5024d7914fb6b8bdc1cef3 diff --git a/gmqcc.h b/gmqcc.h index 358b03c..3a47e74 100644 --- a/gmqcc.h +++ b/gmqcc.h @@ -40,7 +40,7 @@ #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 \ @@ -153,9 +153,9 @@ * 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 /* @@ -260,40 +260,15 @@ size_t util_strtononcmd (const char *, char *, size_t); uint16_t util_crc16(uint16_t crc, const char *data, size_t len); -/* - * If we're compiling as C++ code we need to fix some subtle issues regarding casts between mem_a/mem_d - * since C++ doesn't allow implicit conversions between void* - */ -#ifdef __cplusplus - /* - * void * will be implicitally converted to gmqcc_voidptr using gmqcc_voidptr(void*). This is what - * essentially allows us to allow implicit conversion to whatever pointer type we're trying to assign - * to because it acks as a default assignment constructor. - */ - class gmqcc_voidptr { - void *m_pointer; - public: - gmqcc_voidptr(void *pointer) : - m_pointer(pointer) - { }; - - template - GMQCC_INLINE operator T *() { - return m_pointer; - } - }; - -# define GMQCC_IMPLICIT_POINTER(X) (gmqcc_voidptr(X)) -#else -# define GMQCC_IMPLICIT_POINTER(X) (X) -#endif +void util_seed(uint32_t); +uint32_t util_rand(); #ifdef NOTRACK -# define mem_a(x) GMQCC_IMPLICIT_POINTER(malloc (x)) +# 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) GMQCC_IMPLICIT_POINTER(util_memory_a((x), __LINE__, __FILE__)) +# define mem_a(x) util_memory_a((x), __LINE__, __FILE__) # define mem_d(x) util_memory_d((void*)(x), __LINE__, __FILE__) # define mem_r(x, n) util_memory_r((void*)(x), (n), __LINE__, __FILE__) #endif @@ -323,16 +298,16 @@ void _util_vec_grow(void **a, size_t i, size_t s); /* 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; @@ -371,12 +346,12 @@ typedef struct hash_table_t { */ hash_table_t *util_htnew (size_t size); void util_htset (hash_table_t *ht, const char *key, void *value); -void *util_htget (hash_table_t *ht, const char *key); void util_htdel (hash_table_t *ht); size_t util_hthash(hash_table_t *ht, const char *key); -void *util_htgeth(hash_table_t *ht, const char *key, size_t hash); void util_htseth(hash_table_t *ht, const char *key, size_t hash, void *value); +void *util_htget (hash_table_t *ht, const char *key); +void *util_htgeth(hash_table_t *ht, const char *key, size_t hash); /*===================================================================*/ /*============================ file.c ===============================*/ /*===================================================================*/ @@ -654,7 +629,6 @@ typedef int32_t qcint; 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 */ @@ -691,6 +665,9 @@ enum { LVL_ERROR }; +FILE *con_default_out(); +FILE *con_default_err(); + void con_vprintmsg (int level, const char *name, size_t line, const char *msgtype, const char *msg, va_list ap); void con_printmsg (int level, const char *name, size_t line, const char *msgtype, const char *msg, ...); void con_cvprintmsg(void *ctx, int lvl, const char *msgtype, const char *msg, va_list ap); @@ -919,15 +896,11 @@ qcint prog_tempstring(qc_program *prog, const char *_str); /*===================================================================*/ bool parser_init (); -bool parser_compile_file (const char *filename); -bool parser_compile_string(const char *name, const char *str); -bool parser_finish (const char *output); +bool parser_compile_file (const char *); +bool parser_compile_string(const char *, const char *, size_t); +bool parser_finish (const char *); void parser_cleanup (); -/* TODO: make compile_string accept len and remove this */ -/* There's really no need to strlen() preprocessed files */ -bool parser_compile_string_len(const char *name, const char *str, size_t len); - /*===================================================================*/ /*====================== ftepp.c commandline ========================*/ /*===================================================================*/ @@ -944,20 +917,34 @@ void ftepp_add_macro (const char *name, const char *value); /*======================= 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 ==============================*/ /*===================================================================*/ @@ -1034,6 +1021,7 @@ typedef enum { 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 */