X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=gmqcc.h;h=27d32f77acd2341ff23d3613a298b03f46a232b0;hb=47baca22d95271822a4c5f305a85565222716c68;hp=9fe1b6544786214520c61fac5b01b612250bad0b;hpb=a707440e52762f0b66573ff4017a08652097a0e7;p=xonotic%2Fgmqcc.git

diff --git a/gmqcc.h b/gmqcc.h
index 9fe1b65..27d32f7 100644
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -74,8 +74,6 @@
 #   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,
@@ -260,6 +258,13 @@ size_t util_strtononcmd (const char *, char *, size_t);
 
 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)
@@ -295,16 +300,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;
@@ -387,6 +392,8 @@ enum {
     TYPE_UNION    ,
     TYPE_ARRAY    ,
 
+    TYPE_NIL      , /* it's its own type / untyped */
+
     TYPE_COUNT
 };
 
@@ -626,7 +633,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 */
@@ -683,12 +689,14 @@ int  con_out   (const char *, ...);
 
 /* 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 =============================*/
@@ -915,31 +923,33 @@ 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;
+typedef uint32_t uchar_t;
 
-bool   u8_analyze (const char *_s, size_t *_start, size_t *_len, Uchar *_ch, size_t _maxlen);
-size_t u8_strlen  (const char*);
-size_t u8_strnlen (const char*, size_t);
-Uchar  u8_getchar (const char*, const char**);
-Uchar  u8_getnchar(const char*, const char**, size_t);
-int    u8_fromchar(Uchar w,     char *to,     size_t maxlen);
+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 ==============================*/
@@ -1017,6 +1027,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        */