#endif /*! _MSC_VER */
#define GMQCC_VERSION_MAJOR 0
-#define GMQCC_VERSION_MINOR 2
-#define GMQCC_VERSION_PATCH 9
+#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)
#define GMQCC_VERSION_TYPE_DEVEL
/* Full version string in case we need it */
-#ifdef GMQCC_GITINFO
-# define GMQCC_DEV_VERSION_STRING "git build: " GMQCC_GITINFO "\n"
-#elif defined(GMQCC_VERSION_TYPE_DEVEL)
-# define GMQCC_DEV_VERSION_STRING "development build\n"
+#ifdef GMQCC_VERSION_TYPE_DEVEL
+# ifdef GMQCC_GITINFO
+# define GMQCC_DEV_VERSION_STRING "git build: " GMQCC_GITINFO "\n"
+# elif defined(GMQCC_VERSION_TYPE_DEVEL)
+# define GMQCC_DEV_VERSION_STRING "development build\n"
+# else
+# define GMQCC_DEV_VERSION_STRING
+# endif /*! GMQCC_GITINGO */
#else
# define GMQCC_DEV_VERSION_STRING
-#endif /*! GMQCC_GITINGO */
+#endif
#define GMQCC_STRINGIFY(x) #x
#define GMQCC_IND_STRING(x) GMQCC_STRINGIFY(x)
)
/* exposed interface */
-#define vec_meta(A) (((vector_t*)(A)) - 1)
+#define vec_meta(A) (((vector_t*)((void*)A)) - 1)
#define vec_free(A) ((void)((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_size(A) ((A) ? vec_meta(A)->used : 0)
#define CV_VAR -1
#define CV_WRONG 0x8000 /* magic number to help parsing */
-extern const char *type_name [TYPE_COUNT];
-extern uint16_t type_store_instr [TYPE_COUNT];
-extern uint16_t field_store_instr[TYPE_COUNT];
+extern const char *type_name [TYPE_COUNT];
+extern const uint16_t type_store_instr [TYPE_COUNT];
+extern const uint16_t field_store_instr[TYPE_COUNT];
/*
* could use type_store_instr + INSTR_STOREP_F - INSTR_STORE_F
* instruction set, the old ones are left untouched, thus the _I instructions
* are at a seperate place.
*/
-extern uint16_t type_storep_instr[TYPE_COUNT];
-extern uint16_t type_eq_instr [TYPE_COUNT];
-extern uint16_t type_ne_instr [TYPE_COUNT];
-extern uint16_t type_not_instr [TYPE_COUNT];
+extern const uint16_t type_storep_instr[TYPE_COUNT];
+extern const uint16_t type_eq_instr [TYPE_COUNT];
+extern const uint16_t type_ne_instr [TYPE_COUNT];
+extern const uint16_t type_not_instr [TYPE_COUNT];
typedef struct {
uint32_t offset; /* Offset in file of where data begins */
VINSTR_NRCALL
};
-/* TODO: cleanup this mess */
-extern prog_section_statement *code_statements;
-extern int *code_linenums;
-extern prog_section_def *code_defs;
-extern prog_section_field *code_fields;
-extern prog_section_function *code_functions;
-extern int *code_globals;
-extern char *code_chars;
-extern uint16_t code_crc;
-
/* uhh? */
typedef float qcfloat;
typedef int32_t qcint;
+typedef struct {
+ prog_section_statement *statements;
+ int *linenums;
+ prog_section_def *defs;
+ prog_section_field *fields;
+ prog_section_function *functions;
+ int *globals;
+ char *chars;
+ uint16_t crc;
+ uint32_t entfields;
+ ht string_cache;
+ qcint string_cached_empty;
+} code_t;
+
/*
- * code_write -- writes out the compiled file
- * code_init -- prepares the code file
+ * code_write -- writes out the compiled file
+ * code_init -- prepares the code file
+ * code_genstrin -- generates string for code
+ * code_alloc_field -- allocated a field
+ * code_push_statement -- keeps statements and linenumbers together
+ * code_pop_statement -- keeps statements and linenumbers together
*/
-bool code_write (const char *filename, const char *lno);
-void code_init ();
-uint32_t code_genstring (const char *string);
-qcint code_alloc_field (size_t qcsize);
-
-/* this function is used to keep statements and linenumbers together */
-void code_push_statement(prog_section_statement *stmt, int linenum);
-void code_pop_statement();
+bool code_write (code_t *, const char *filename, const char *lno);
+code_t *code_init (void);
+uint32_t code_genstring (code_t *, const char *string);
+qcint code_alloc_field (code_t *, size_t qcsize);
+void code_push_statement(code_t *, prog_section_statement *stmt, int linenum);
+void code_pop_statement (code_t *);
/*
* A shallow copy of a lex_file to remember where which ast node
/*===================================================================*/
/*====================== ftepp.c commandline ========================*/
/*===================================================================*/
-struct lex_file_s;
struct ftepp_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
- * time_stamp.
- *
- * increment when items are added
- */
-#define FTEPP_PREDEF_COUNT 9
-
struct ftepp_s *ftepp_create ();
bool ftepp_preprocess_file (struct ftepp_s *ftepp, const char *filename);
bool ftepp_preprocess_string(struct ftepp_s *ftepp, const char *name, const char *str);
void ftepp_add_define (struct ftepp_s *ftepp, const char *source, const char *name);
void ftepp_add_macro (struct ftepp_s *ftepp, const char *name, const char *value);
-extern const ftepp_predef_t ftepp_predefs[FTEPP_PREDEF_COUNT];
-
/*===================================================================*/
/*======================= main.c commandline ========================*/
/*===================================================================*/
projects / xonotic / gmqcc.git / blobdiff